ppx4xx: Fix sdram init on PMC440 boards

[oweals/u-boot.git] / common / usb_kbd.c

diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index ad7e6100e2c9d0bcd0c379ff3650ae6a13bb0092..1703b2339b86038eb22ff6fe553f1abc78b181ff 100644 (file)
--- 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
@@ -129,7 +133,11 @@ static int usb_kbd_testc(void)
 static int usb_kbd_getc(void)
 {
        char c;
-       while(usb_in_pointer==usb_out_pointer);
+       while(usb_in_pointer==usb_out_pointer) {
+#ifdef CFG_USB_EVENT_POLL
+               usb_event_poll();
+#endif
+       }
        if((usb_out_pointer+1)==USB_KBD_BUFFER_LEN)
                usb_out_pointer=0;
        else
@@ -253,7 +261,7 @@ static int usb_kbd_translate(unsigned char scancode,unsigned char modifier,int p
                repeat_delay=REPEAT_DELAY;
        }
        keycode=0;
-       if((scancode>3) && (scancode<0x1d)) { /* alpha numeric values */
+       if((scancode>3) && (scancode<=0x1d)) { /* alpha numeric values */
                keycode=scancode-4 + 0x61;
                if(caps_lock)
                        keycode&=~CAPITAL_MASK; /* switch to capital Letters */
@@ -270,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;
@@ -302,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);
@@ -402,7 +425,6 @@ struct hid_item {
 #define HID_ITEM_TAG_LONG      15
 
 
-
 static struct usb_hid_descriptor usb_kbd_hid_desc;
 
 void usb_kbd_display_hid(struct usb_hid_descriptor *hid)
@@ -541,7 +563,6 @@ static int fetch_item(unsigned char *start,unsigned char *end, struct hid_item *
 #define HID_LOCAL_ITEM_TAG_DELIMITER           10
 
 
-
 static void usb_kbd_show_item(struct hid_item *item)
 {
        switch(item->type) {
@@ -666,7 +687,6 @@ static void usb_kbd_show_item(struct hid_item *item)
 }
 
 
-
 static int usb_kbd_get_hid_desc(struct usb_device *dev)
 {
        unsigned char buffer[256];
@@ -729,6 +749,3 @@ static int usb_kbd_get_hid_desc(struct usb_device *dev)
 #endif
 
 #endif /* CONFIG_USB_KEYBOARD */
-
-/* eof */
-