diff options
| author | Zhang Wei <wei.zhang@freescale.com> | 2008-01-03 10:51:15 +0800 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-01-09 13:58:39 +0100 |
| commit | 58694f9709c0c3e3178e349ae748d98cfb0c639a (patch) | |
| tree | 1f230984397fcecdeab234b53a94b318f5ccfdbf /common | |
| parent | 6a40ef62c4300e9f606deef0a4618cbc4b514a51 (diff) | |
| download | u-boot-imx-58694f9709c0c3e3178e349ae748d98cfb0c639a.zip u-boot-imx-58694f9709c0c3e3178e349ae748d98cfb0c639a.tar.gz u-boot-imx-58694f9709c0c3e3178e349ae748d98cfb0c639a.tar.bz2 | |
Add Ctrl combo key support to usb keyboard driver.
Ctrl combo key support is added, which is very useful to input Ctrl-C
for interrupt current job.
Also add usb_event_poll() calling to usb_kbd_testc(), which can get
key input when tstc() is called.
Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
Signed-off-by: Markus Klotzbuecher <mk@denx.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/usb_kbd.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/common/usb_kbd.c b/common/usb_kbd.c index 7bdfcc0..1703b23 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -84,6 +84,7 @@ int repeat_delay; static unsigned char num_lock = 0; static unsigned char caps_lock = 0; static unsigned char scroll_lock = 0; +static unsigned char ctrl = 0; static unsigned char leds __attribute__ ((aligned (0x4))); @@ -120,6 +121,9 @@ static void usb_kbd_put_queue(char data) /* test if a character is in the queue */ static int usb_kbd_testc(void) { +#ifdef CFG_USB_EVENT_POLL + usb_event_poll(); +#endif if(usb_in_pointer==usb_out_pointer) return(0); /* no data */ else @@ -274,6 +278,10 @@ static int usb_kbd_translate(unsigned char scancode,unsigned char modifier,int p else /* non shifted */ keycode=usb_kbd_numkey[scancode-0x1e]; } + + if (ctrl) + keycode = scancode - 0x3; + if(pressed==1) { if(scancode==NUM_LOCK) { num_lock=~num_lock; @@ -306,6 +314,17 @@ static int usb_kbd_irq(struct usb_device *dev) return 1; } res=0; + + switch (new[0]) { + case 0x0: /* No combo key pressed */ + ctrl = 0; + break; + case 0x01: /* Left Ctrl pressed */ + case 0x10: /* Right Ctrl pressed */ + ctrl = 1; + break; + } + for (i = 2; i < 8; i++) { if (old[i] > 3 && memscan(&new[2], old[i], 6) == &new[8]) { res|=usb_kbd_translate(old[i],new[0],0); |