1 Index: linux-2.6.13/drivers/input/keyboard/corgikbd.c
2 ===================================================================
3 --- linux-2.6.13.orig/drivers/input/keyboard/corgikbd.c 2006-02-02 16:19:13.924205040 +0100
4 +++ linux-2.6.13/drivers/input/keyboard/corgikbd.c 2006-02-02 16:22:48.533579456 +0100
7 #define KB_ROWMASK(r) (1 << (r))
8 #define SCANCODE(r,c) ( ((r)<<4) + (c) + 1 )
9 -/* zero code, 124 scancodes + 3 hinge combinations */
10 -#define NR_SCANCODES ( SCANCODE(KB_ROWS-1,KB_COLS-1) +1 +1 +3 )
11 -#define SCAN_INTERVAL (HZ/10)
12 +/* zero code, 124 scancodes */
13 +#define NR_SCANCODES ( SCANCODE(KB_ROWS-1,KB_COLS-1) +1 +1 )
15 -#define HINGE_SCAN_INTERVAL (HZ/4)
16 +#define SCAN_INTERVAL (50) /* ms */
17 +#define HINGE_SCAN_INTERVAL (250) /* ms */
19 #define CORGI_KEY_CALENDER KEY_F1
20 #define CORGI_KEY_ADDRESS KEY_F2
22 #define CORGI_KEY_MAIL KEY_F10
23 #define CORGI_KEY_OK KEY_F11
24 #define CORGI_KEY_MENU KEY_F12
25 -#define CORGI_HINGE_0 KEY_KP0
26 -#define CORGI_HINGE_1 KEY_KP1
27 -#define CORGI_HINGE_2 KEY_KP2
29 static unsigned char corgikbd_keycode[NR_SCANCODES] = {
32 CORGI_KEY_MAIL, KEY_Z, KEY_X, KEY_MINUS, KEY_SPACE, KEY_COMMA, 0, KEY_UP, 0, 0, 0, CORGI_KEY_FN, 0, 0, 0, 0, /* 81-96 */
33 KEY_SYSRQ, CORGI_KEY_JAP1, CORGI_KEY_JAP2, CORGI_KEY_CANCEL, CORGI_KEY_OK, CORGI_KEY_MENU, KEY_LEFT, KEY_DOWN, KEY_RIGHT, 0, 0, 0, 0, 0, 0, 0, /* 97-112 */
34 CORGI_KEY_OFF, CORGI_KEY_EXOK, CORGI_KEY_EXCANCEL, CORGI_KEY_EXJOGDOWN, CORGI_KEY_EXJOGUP, 0, 0, 0, 0, 0, 0, 0, /* 113-124 */
35 - CORGI_HINGE_0, CORGI_HINGE_1, CORGI_HINGE_2 /* 125-127 */
41 /* if any keys are pressed, enable the timer */
43 - mod_timer(&corgikbd_data->timer, jiffies + SCAN_INTERVAL);
44 + mod_timer(&corgikbd_data->timer, jiffies + msecs_to_jiffies(SCAN_INTERVAL));
46 spin_unlock_irqrestore(&corgikbd_data->lock, flags);
49 spin_unlock_irqrestore(&corgikbd_data->lock, flags);
52 - mod_timer(&corgikbd_data->htimer, jiffies + HINGE_SCAN_INTERVAL);
53 + mod_timer(&corgikbd_data->htimer, jiffies + msecs_to_jiffies(HINGE_SCAN_INTERVAL));
58 set_bit(SW_1, corgikbd->input.swbit);
60 input_register_device(&corgikbd->input);
61 - mod_timer(&corgikbd->htimer, jiffies + HINGE_SCAN_INTERVAL);
62 + mod_timer(&corgikbd->htimer, jiffies + msecs_to_jiffies(HINGE_SCAN_INTERVAL));
64 /* Setup sense interrupts - RisingEdge Detect, sense lines as inputs */
65 for (i = 0; i < CORGI_KEY_SENSE_NUM; i++) {
66 Index: linux-2.6.13/drivers/input/keyboard/spitzkbd.c
67 ===================================================================
68 --- linux-2.6.13.orig/drivers/input/keyboard/spitzkbd.c 2006-02-02 16:19:51.905431016 +0100
69 +++ linux-2.6.13/drivers/input/keyboard/spitzkbd.c 2006-02-02 16:21:43.856411880 +0100
71 #define SCANCODE(r,c) (((r)<<4) + (c) + 1)
72 #define NR_SCANCODES ((KB_ROWS<<4) + 1)
74 +#define SCAN_INTERVAL (50) /* ms */
75 #define HINGE_SCAN_INTERVAL (150) /* ms */
77 #define SPITZ_KEY_CALENDER KEY_F1
80 /* if any keys are pressed, enable the timer */
82 - mod_timer(&spitzkbd_data->timer, jiffies + msecs_to_jiffies(100));
83 + mod_timer(&spitzkbd_data->timer, jiffies + msecs_to_jiffies(SCAN_INTERVAL));
85 spin_unlock_irqrestore(&spitzkbd_data->lock, flags);