diff options
author | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-02-02 16:21:19 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-02 16:21:19 +0000 |
commit | 72e40c338591739d3b9326601e804e36a4606350 (patch) | |
tree | 0bfd289f675ab4ddba558371daa567b66bcb9558 /packages/linux | |
parent | d6c17e90509d7015b76ad4b3667aed07afd3775c (diff) | |
download | openembedded-72e40c338591739d3b9326601e804e36a4606350.tar.gz |
linux-openzaurus: fixed keyboard repeat
patch taken from .dev 2.6.15 and updated to apply on 2.6.14-rc1
Diffstat (limited to 'packages/linux')
-rw-r--r-- | packages/linux/linux-openzaurus-2.6.14-rc1/zaurus_keyboard_tweak-r0.patch | 86 | ||||
-rw-r--r-- | packages/linux/linux-openzaurus_2.6.14-rc1.bb | 3 |
2 files changed, 88 insertions, 1 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.14-rc1/zaurus_keyboard_tweak-r0.patch b/packages/linux/linux-openzaurus-2.6.14-rc1/zaurus_keyboard_tweak-r0.patch new file mode 100644 index 0000000000..3a059598cf --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.14-rc1/zaurus_keyboard_tweak-r0.patch @@ -0,0 +1,86 @@ +Index: linux-2.6.13/drivers/input/keyboard/corgikbd.c +=================================================================== +--- linux-2.6.13.orig/drivers/input/keyboard/corgikbd.c 2006-02-02 16:19:13.924205040 +0100 ++++ linux-2.6.13/drivers/input/keyboard/corgikbd.c 2006-02-02 16:22:48.533579456 +0100 +@@ -30,11 +30,11 @@ + #define KB_COLS 12 + #define KB_ROWMASK(r) (1 << (r)) + #define SCANCODE(r,c) ( ((r)<<4) + (c) + 1 ) +-/* zero code, 124 scancodes + 3 hinge combinations */ +-#define NR_SCANCODES ( SCANCODE(KB_ROWS-1,KB_COLS-1) +1 +1 +3 ) +-#define SCAN_INTERVAL (HZ/10) ++/* zero code, 124 scancodes */ ++#define NR_SCANCODES ( SCANCODE(KB_ROWS-1,KB_COLS-1) +1 +1 ) + +-#define HINGE_SCAN_INTERVAL (HZ/4) ++#define SCAN_INTERVAL (50) /* ms */ ++#define HINGE_SCAN_INTERVAL (250) /* ms */ + + #define CORGI_KEY_CALENDER KEY_F1 + #define CORGI_KEY_ADDRESS KEY_F2 +@@ -50,9 +50,6 @@ + #define CORGI_KEY_MAIL KEY_F10 + #define CORGI_KEY_OK KEY_F11 + #define CORGI_KEY_MENU KEY_F12 +-#define CORGI_HINGE_0 KEY_KP0 +-#define CORGI_HINGE_1 KEY_KP1 +-#define CORGI_HINGE_2 KEY_KP2 + + static unsigned char corgikbd_keycode[NR_SCANCODES] = { + 0, /* 0 */ +@@ -64,7 +61,6 @@ + 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 */ + 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 */ + CORGI_KEY_OFF, CORGI_KEY_EXOK, CORGI_KEY_EXCANCEL, CORGI_KEY_EXJOGDOWN, CORGI_KEY_EXJOGUP, 0, 0, 0, 0, 0, 0, 0, /* 113-124 */ +- CORGI_HINGE_0, CORGI_HINGE_1, CORGI_HINGE_2 /* 125-127 */ + }; + + +@@ -189,7 +185,7 @@ + + /* if any keys are pressed, enable the timer */ + if (num_pressed) +- mod_timer(&corgikbd_data->timer, jiffies + SCAN_INTERVAL); ++ mod_timer(&corgikbd_data->timer, jiffies + msecs_to_jiffies(SCAN_INTERVAL)); + + spin_unlock_irqrestore(&corgikbd_data->lock, flags); + } +@@ -256,7 +252,7 @@ + spin_unlock_irqrestore(&corgikbd_data->lock, flags); + } + } +- mod_timer(&corgikbd_data->htimer, jiffies + HINGE_SCAN_INTERVAL); ++ mod_timer(&corgikbd_data->htimer, jiffies + msecs_to_jiffies(HINGE_SCAN_INTERVAL)); + } + + #ifdef CONFIG_PM +@@ -333,7 +329,7 @@ + set_bit(SW_1, corgikbd->input.swbit); + + input_register_device(&corgikbd->input); +- mod_timer(&corgikbd->htimer, jiffies + HINGE_SCAN_INTERVAL); ++ mod_timer(&corgikbd->htimer, jiffies + msecs_to_jiffies(HINGE_SCAN_INTERVAL)); + + /* Setup sense interrupts - RisingEdge Detect, sense lines as inputs */ + for (i = 0; i < CORGI_KEY_SENSE_NUM; i++) { +Index: linux-2.6.13/drivers/input/keyboard/spitzkbd.c +=================================================================== +--- linux-2.6.13.orig/drivers/input/keyboard/spitzkbd.c 2006-02-02 16:19:51.905431016 +0100 ++++ linux-2.6.13/drivers/input/keyboard/spitzkbd.c 2006-02-02 16:21:43.856411880 +0100 +@@ -31,6 +31,7 @@ + #define SCANCODE(r,c) (((r)<<4) + (c) + 1) + #define NR_SCANCODES ((KB_ROWS<<4) + 1) + ++#define SCAN_INTERVAL (50) /* ms */ + #define HINGE_SCAN_INTERVAL (150) /* ms */ + + #define SPITZ_KEY_CALENDER KEY_F1 +@@ -232,7 +233,7 @@ + + /* if any keys are pressed, enable the timer */ + if (num_pressed) +- mod_timer(&spitzkbd_data->timer, jiffies + msecs_to_jiffies(100)); ++ mod_timer(&spitzkbd_data->timer, jiffies + msecs_to_jiffies(SCAN_INTERVAL)); + + spin_unlock_irqrestore(&spitzkbd_data->lock, flags); + } diff --git a/packages/linux/linux-openzaurus_2.6.14-rc1.bb b/packages/linux/linux-openzaurus_2.6.14-rc1.bb index 1ffb3098cc..607afa0885 100644 --- a/packages/linux/linux-openzaurus_2.6.14-rc1.bb +++ b/packages/linux/linux-openzaurus_2.6.14-rc1.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r4" +PR = "r5" # Handy URLs # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \ @@ -72,6 +72,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \ file://dtl1_cs-add-socket-revE.patch;patch=1 \ file://connectplus-remove-ide-HACK.patch;patch=1 \ + file://zaurus_keyboard_tweak-r0.patch;patch=1 \ file://quiet.patch;patch=1 \ file://defconfig-c7x0 \ file://defconfig-ipaq-pxa-2.6 \ |