Christian Wiese
14 years ago
committed by
Christian Wiese
Christian Wiese
6 changed files with 13 additions and 156 deletions
Split View
Diff Options
-
+5 -4base/kbd/bg_keymaps.patch
-
+4 -3base/kbd/devfs.patch
-
+0 -53base/kbd/devpts.patch
-
+4 -5base/kbd/kbd.desc
-
+0 -36base/kbd/kbdrate-nonx86.patch
-
+0 -55base/kbd/kbdrate-sparc.patch
@ -1,53 +0,0 @@ |
|||
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# |
|||
# Filename: package/.../kbd/devpts.patch |
|||
# Copyright (C) 2004 - 2006 The T2 SDE Project |
|||
# Copyright (C) 1998 - 2004 Clifford Wolf |
|||
# |
|||
# More information can be found in the files COPYING and README. |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# --- SDE-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./openvt/openvt.c.orig 2003-08-16 16:44:04.000000000 +0300
|
|||
+++ ./openvt/openvt.c 2003-08-16 16:42:01.000000000 +0300
|
|||
@@ -100,18 +100,18 @@
|
|||
} |
|||
|
|||
consfd = getfd(); |
|||
- if (consfd < 0) {
|
|||
- fprintf(stderr,
|
|||
- _("Couldnt get a file descriptor referring to the console\n"));
|
|||
- return(2);
|
|||
- }
|
|||
|
|||
- if (ioctl(consfd, VT_GETSTATE, &vtstat) < 0) {
|
|||
+ if (consfd >= 0 && ioctl(consfd, VT_GETSTATE, &vtstat) < 0) {
|
|||
perror("openvt: VT_GETSTATE"); |
|||
return(4); |
|||
} |
|||
|
|||
if (vtno == -1) { |
|||
+ if (consfd < 0) {
|
|||
+ fprintf(stderr,
|
|||
+ _("Couldnt get a file descriptor referring to the console\n"));
|
|||
+ return(2);
|
|||
+ }
|
|||
if ((ioctl(consfd, VT_OPENQRY, &vtno) < 0) || (vtno == -1)) { |
|||
perror("openvt: VT_OPENQRY"); |
|||
fprintf(stderr, _("openvt: cannot find a free vt\n")); |
|||
@@ -267,7 +267,7 @@
|
|||
|
|||
if ( do_wait ) { |
|||
wait(NULL); |
|||
- if (show) { /* Switch back... */
|
|||
+ if (show && consfd >= 0) { /* Switch back... */
|
|||
if (ioctl(consfd, VT_ACTIVATE, vtstat.v_active)) { |
|||
perror("VT_ACTIVATE"); |
|||
return 8; |
|||
@ -1,36 +0,0 @@ |
|||
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# |
|||
# Filename: package/.../kbd/kbdrate-nonx86.patch |
|||
# Copyright (C) 2004 - 2006 The T2 SDE Project |
|||
# Copyright (C) 1998 - 2004 Clifford Wolf |
|||
# |
|||
# More information can be found in the files COPYING and README. |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# --- SDE-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- kbd-1.08/src/kbdrate.c 2002-10-11 13:09:01.000000000 +0200
|
|||
+++ kbd-1.08-fixed/src/kbdrate.c 2003-07-19 11:03:05.000000000 +0200
|
|||
@@ -237,6 +237,7 @@
|
|||
if(KIOCSRATE_ioctl_ok(rate, delay, silent)) /* sparc? */ |
|||
return 0; |
|||
|
|||
+#ifdef __i386__
|
|||
|
|||
/* The ioport way */ |
|||
|
|||
@@ -286,4 +287,8 @@
|
|||
valid_delays[ (value & 0x60) >> 5 ] ); |
|||
|
|||
return 0; |
|||
+#else
|
|||
+ perror( _("No alternative method for this platform") );
|
|||
+ exit( 1 );
|
|||
+#endif
|
|||
} |
|||
@ -1,55 +0,0 @@ |
|||
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# |
|||
# Filename: package/.../kbd/kbdrate-sparc.patch |
|||
# Copyright (C) 2004 - 2006 The T2 SDE Project |
|||
# Copyright (C) 1998 - 2004 Clifford Wolf |
|||
# |
|||
# More information can be found in the files COPYING and README. |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# --- SDE-COPYRIGHT-NOTE-END --- |
|||
|
|||
The field is named differently on SPARC (?) ... |
|||
|
|||
- Rene Rebe <rene@exactcode.de> |
|||
|
|||
--- kbd-1.12/src/kbdrate.c 2004-06-10 08:24:48.450000000 +0200
|
|||
+++ kbd-1.12-fixed/src/kbdrate.c 2004-06-10 08:21:57.000000000 +0200
|
|||
@@ -164,10 +164,19 @@
|
|||
exit( 1 ); |
|||
} |
|||
|
|||
+#ifdef __sparc__
|
|||
+ 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 */ |
|||
+#ifdef __sparc__
|
|||
+ 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 +186,11 @@
|
|||
|
|||
if (!silent) |
|||
printf( "Typematic Rate set to %d cps (delay = %d ms)\n", |
|||
+#ifdef __sparc__
|
|||
+ kbdrate_s.rate, kbdrate_s.delay * 1000 / HZ );
|
|||
+#else
|
|||
kbdrate_s.period, kbdrate_s.delay * 1000 / HZ ); |
|||
+#endif
|
|||
|
|||
return 1; |
|||
#else /* no KIOCSRATE */ |
|||