diff options
author | 2004-01-19 18:48:55 +0000 | |
---|---|---|
committer | 2004-01-19 18:48:55 +0000 | |
commit | 4bcb1937765d9665f4d0e68087761f2e3ea97d4e (patch) | |
tree | aaa6350c483118c5659784624458acd779bbec05 /sys-apps/kbd/files | |
parent | Mark stable, as latest stable baselayout depends on it, bug #38585. (diff) | |
download | historical-4bcb1937765d9665f4d0e68087761f2e3ea97d4e.tar.gz historical-4bcb1937765d9665f4d0e68087761f2e3ea97d4e.tar.bz2 historical-4bcb1937765d9665f4d0e68087761f2e3ea97d4e.zip |
Fix copyright date; cleanup
Diffstat (limited to 'sys-apps/kbd/files')
-rw-r--r-- | sys-apps/kbd/files/digest-kbd-1.08-r1 | 1 | ||||
-rw-r--r-- | sys-apps/kbd/files/digest-kbd-1.08-r2 | 1 | ||||
-rw-r--r-- | sys-apps/kbd/files/digest-kbd-1.08-r3 | 1 | ||||
-rw-r--r-- | sys-apps/kbd/files/kbd-1.08-sparc-fixes.patch | 93 | ||||
-rw-r--r-- | sys-apps/kbd/files/kbd-1.08-sparc.patch | 73 |
5 files changed, 0 insertions, 169 deletions
diff --git a/sys-apps/kbd/files/digest-kbd-1.08-r1 b/sys-apps/kbd/files/digest-kbd-1.08-r1 deleted file mode 100644 index 9b77d0dd0db3..000000000000 --- a/sys-apps/kbd/files/digest-kbd-1.08-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 924e6a05e52715dc0f96385b35f2f680 kbd-1.08.tar.gz 819924 diff --git a/sys-apps/kbd/files/digest-kbd-1.08-r2 b/sys-apps/kbd/files/digest-kbd-1.08-r2 deleted file mode 100644 index 9b77d0dd0db3..000000000000 --- a/sys-apps/kbd/files/digest-kbd-1.08-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 924e6a05e52715dc0f96385b35f2f680 kbd-1.08.tar.gz 819924 diff --git a/sys-apps/kbd/files/digest-kbd-1.08-r3 b/sys-apps/kbd/files/digest-kbd-1.08-r3 deleted file mode 100644 index 9b77d0dd0db3..000000000000 --- a/sys-apps/kbd/files/digest-kbd-1.08-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 924e6a05e52715dc0f96385b35f2f680 kbd-1.08.tar.gz 819924 diff --git a/sys-apps/kbd/files/kbd-1.08-sparc-fixes.patch b/sys-apps/kbd/files/kbd-1.08-sparc-fixes.patch deleted file mode 100644 index 85aa2da088b5..000000000000 --- a/sys-apps/kbd/files/kbd-1.08-sparc-fixes.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- kbd-1.08/src/kbdrate.c.orig 2003-07-30 23:05:29.000000000 +0200 -+++ kbd-1.08/src/kbdrate.c 2003-07-30 23:14:24.000000000 +0200 -@@ -109,7 +109,11 @@ - struct kbd_repeat kbdrep_s; - - /* don't change, just test */ -+#if defined (__sparc__) || defined (__sparc64__) -+ kbdrep_s.rate = -1; -+#else - kbdrep_s.period = -1; -+#endif - kbdrep_s.delay = -1; - if (ioctl( 0, KDKBDREP, &kbdrep_s )) { - if (errno == EINVAL) -@@ -125,11 +129,27 @@ - - /* do the change */ - if (rate == 0) /* switch repeat off */ -+#if defined (__sparc__) || defined (__sparc64__) -+ kbdrep_s.rate = 0; -+#else - kbdrep_s.period = 0; -+#endif - else -+#if defined (__sparc__) || defined (__sparc64__) -+ kbdrep_s.rate = 1000.0 / rate; /* convert cps to msec */ -+#else - kbdrep_s.period = 1000.0 / rate; /* convert cps to msec */ -+#endif -+#if defined (__sparc__) || defined (__sparc64__) -+ if (kbdrep_s.rate < 1) -+#else - if (kbdrep_s.period < 1) -+#endif -+#if defined (__sparc__) || defined (__sparc64__) -+ kbdrep_s.rate = 1; -+#else - kbdrep_s.period = 1; -+#endif - kbdrep_s.delay = delay; - if (kbdrep_s.delay < 1) - kbdrep_s.delay = 1; -@@ -140,10 +160,18 @@ - } - - /* report */ -+#if defined (__sparc__) || defined (__sparc64__) -+ if (kbdrep_s.rate == 0) -+#else - if (kbdrep_s.period == 0) -+#endif - rate = 0; - else -+#if defined (__sparc__) || defined (__sparc64__) -+ rate = 1000.0 / (double) kbdrep_s.rate; -+#else - rate = 1000.0 / (double) kbdrep_s.period; -+#endif - - if (!silent) - printf( _("Typematic Rate set to %.1f cps (delay = %d ms)\n"), -@@ -164,10 +192,19 @@ - exit( 1 ); - } - -+#if defined (__sparc__) || defined (__sparc64__) -+ kbdrate_s.rate = (int) (rate + 0.5); /* round up */ -+#else - kbdrate_s.period = (int) (rate + 0.5); /* round up */ -+#endif - kbdrate_s.delay = delay * HZ / 1000; /* convert ms to Hz */ -+#if defined (__sparc__) || defined (__sparc64__) -+ if (kbdrate_s.rate > 50) -+ kbdrate_s.rate = 50; -+#else - if (kbdrate_s.period > 50) - kbdrate_s.period = 50; -+#endif - - if (ioctl( fd, KIOCSRATE, &kbdrate_s )) { - perror( "ioctl(KIOCSRATE)" ); -@@ -177,7 +214,11 @@ - - if (!silent) - printf( "Typematic Rate set to %d cps (delay = %d ms)\n", -+#if defined (__sparc__) || defined (__sparc64__) -+ kbdrate_s.rate, kbdrate_s.delay * 1000 / HZ ); -+#else - kbdrate_s.period, kbdrate_s.delay * 1000 / HZ ); -+#endif - - return 1; - #else /* no KIOCSRATE */ diff --git a/sys-apps/kbd/files/kbd-1.08-sparc.patch b/sys-apps/kbd/files/kbd-1.08-sparc.patch deleted file mode 100644 index 72d84605ed7d..000000000000 --- a/sys-apps/kbd/files/kbd-1.08-sparc.patch +++ /dev/null @@ -1,73 +0,0 @@ -Don't try unimplemented ioctls on SPARC, even if they -are defined in headers -- that way lies madness. - ---- kbd-1.08/man/man8/kbdrate.8 2002-10-11 07:08:58.000000000 -0400 -+++ kbd-1.08/man/man8/kbdrate.8 2002-11-22 17:28:15.000000000 -0500 -@@ -22,7 +22,7 @@ - without any options will reset the repeat rate to 10.9 characters per second (cps) - and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems. - These are the IBM defaults. On SPARC-based systems it will reset the repeat rate --to 5 cps and the delay to 200 ms. -+to 20 cps and the delay to 200 ms. - - .SH OPTIONS - .TP -@@ -69,3 +69,5 @@ - .I /etc/rc.local - .br - .I /dev/port -+.br -+.I /dev/kbd ---- kbd-1.08/src/kbdrate.c 2002-10-11 07:09:01.000000000 -0400 -+++ kbd-1.08/src/kbdrate.c 2002-11-22 17:34:48.000000000 -0500 -@@ -104,8 +104,11 @@ - - static int - KDKBDREP_ioctl_ok(double rate, int delay, int silent) { -+#if defined(KDKBDREP) && !defined(__sparc__) - /* This ioctl is defined in <linux/kd.h> but is not -- implemented anywhere - must be in some m68k patches. */ -+ implemented anywhere - must be in some m68k patches. -+ We cannot blindly try unimplemented ioctls on sparc64 - -+ the 32<->64bit transition layer does not like it. */ - struct kbd_repeat kbdrep_s; - - /* don't change, just test */ -@@ -150,6 +153,9 @@ - rate, kbdrep_s.delay ); - - return 1; /* success! */ -+#else /* no KDKBDREP or __sparc__ */ -+ return 0; -+#endif /* KDKBDREP */ - } - - static int -@@ -188,7 +194,7 @@ - int - main( int argc, char **argv ) { - #ifdef __sparc__ -- double rate = 5.0; /* Default rate */ -+ double rate = 20.0; /* Default rate */ - int delay = 200; /* Default delay */ - #else - double rate = 10.9; /* Default rate */ -@@ -238,8 +244,9 @@ - return 0; - - -- /* The ioport way */ -+ /* The ioport way - will crash on sparc */ - -+#ifndef __sparc__ - for (i = 0; i < RATE_COUNT; i++) - if (rate * 10 >= valid_rates[i]) { - value &= 0x60; -@@ -285,5 +292,7 @@ - valid_rates[value & 0x1f] / 10.0, - valid_delays[ (value & 0x60) >> 5 ] ); - -+#endif -+ - return 0; - } |