Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20011/drivers/char
Modified Files:
keyboard.c
Log Message:
Merge with 2.6.11
Index: keyboard.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/keyboard.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- keyboard.c 17 Nov 2004 00:18:31 -0000 1.3
+++ keyboard.c 28 Mar 2005 00:01:01 -0000 1.4
@@ -31,7 +31,6 @@
#include <linux/tty_flip.h>
#include <linux/mm.h>
#include <linux/string.h>
-#include <linux/random.h>
#include <linux/init.h>
#include <linux/slab.h>
@@ -199,6 +198,8 @@
if (scancode < 0 || scancode >= dev->keycodemax)
return -EINVAL;
+ if (keycode < 0 || keycode > KEY_MAX)
+ return -EINVAL;
oldkey = SET_INPUT_KEYCODE(dev, scancode, keycode);
@@ -330,7 +331,7 @@
* in utf-8 already. UTF-8 is defined for words of up to 31 bits,
* but we need only 16 bits here
*/
-void to_utf8(struct vc_data *vc, ushort c)
+static void to_utf8(struct vc_data *vc, ushort c)
{
if (c < 0x80)
/* 0******* */
@@ -392,7 +393,7 @@
* Otherwise, conclude that DIACR was not combining after all,
* queue it and return CH.
*/
-unsigned char handle_diacr(struct vc_data *vc, unsigned char ch)
+static unsigned char handle_diacr(struct vc_data *vc, unsigned char ch)
{
int d = diacr;
int i;
@@ -853,18 +854,6 @@
set_leds();
}
-void register_leds(struct kbd_struct *kbd, unsigned int led,
- unsigned int *addr, unsigned int mask)
-{
- if (led < 3) {
- ledptrs[led].addr = addr;
- ledptrs[led].mask = mask;
- ledptrs[led].valid = 1;
- kbd->ledmode = LED_SHOW_MEM;
- } else
- kbd->ledmode = LED_SHOW_FLAGS;
-}
-
static inline unsigned char getleds(void)
{
struct kbd_struct *kbd = kbd_table + fg_console;
@@ -925,7 +914,7 @@
/*
* This allows a newly plugged keyboard to pick the LED state.
*/
-void kbd_refresh_leds(struct input_handle *handle)
+static void kbd_refresh_leds(struct input_handle *handle)
{
unsigned char leds = ledstate;
@@ -939,7 +928,11 @@
tasklet_enable(&keyboard_tasklet);
}
-#if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64) || defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) || defined (CONFIG_VAX)
+#if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) ||\
+ defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC32) ||\
+ defined(CONFIG_SPARC64) || defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) ||\
+ defined(CONFIG_VAX) ||\
+ (defined(CONFIG_ARM) && defined(CONFIG_KEYBOARD_ATKBD) && !defined(CONFIG_RPC))
#define HW_RAW(dev) (test_bit(EV_MSC, dev->evbit) && test_bit(MSC_RAW, dev->mscbit) &&\
((dev)->id.bustype == BUS_I8042) && ((dev)->id.vendor == 0x0001) && ((dev)->id.product == 0x0001))
@@ -1024,7 +1017,7 @@
}
#endif
-void kbd_rawcode(unsigned char data)
+static void kbd_rawcode(unsigned char data)
{
struct vc_data *vc = vc_cons[fg_console].d;
kbd = kbd_table + fg_console;
@@ -1040,9 +1033,6 @@
struct tty_struct *tty;
int shift_final;
- if (down != 2)
- add_keyboard_randomness((keycode << 1) ^ down);
-
tty = vc->vc_tty;
if (tty && (!tty->driver_data)) {
|
