r2304 - in trunk/src/host/qemu-neo1973: . hw openmoko

[andrew at sita.openmoko.org]

Author: andrew
Date: 2007-06-19 15:57:24 +0200 (Tue, 19 Jun 2007)
New Revision: 2304

Modified:
   trunk/src/host/qemu-neo1973/hw/usb-hid.c
   trunk/src/host/qemu-neo1973/openmoko/flash.sh
   trunk/src/host/qemu-neo1973/qemu-doc.texi
Log:
* fix right-arrow keycode and HID descriptor version
* only grab input on USB reset (after attaching)
* add qemu-docs snippet about the keyboard
* mention the keyboard in flash.sh


Modified: trunk/src/host/qemu-neo1973/hw/usb-hid.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/usb-hid.c	2007-06-19 13:16:05 UTC (rev 2303)
+++ trunk/src/host/qemu-neo1973/hw/usb-hid.c	2007-06-19 13:57:24 UTC (rev 2304)
@@ -232,7 +232,7 @@
         /* HID descriptor */
         0x09,        /*  u8  bLength; */
         0x21,        /*  u8  bDescriptorType; */
-        0x01, 0x11,  /*  u16 HID_class */
+        0x11, 0x01,  /*  u16 HID_class */
         0x00,        /*  u8  country_code */
         0x01,        /*  u8  num_descriptors */
         0x22,        /*  u8  type; Report */
@@ -365,7 +365,7 @@
     0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x00, 0x46,
     0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x4a,
-    0x52, 0x4b, 0x00, 0x50, 0x4f, 0x00, 0x00, 0x4d,
+    0x52, 0x4b, 0x00, 0x50, 0x00, 0x4f, 0x00, 0x4d,
     0x51, 0x4e, 0x49, 0x4c, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -570,6 +570,7 @@
 {
     USBHIDState *s = (USBHIDState *)dev;
 
+    qemu_add_kbd_event_handler(usb_keyboard_event, &s->kbd);	/* XXX: once */
     s->protocol = 1;
 }
 
@@ -839,7 +840,5 @@
 
     pstrcpy(s->dev.devname, sizeof(s->dev.devname), "QEMU USB Keyboard");
 
-    qemu_add_kbd_event_handler(usb_keyboard_event, &s->kbd);
-
     return (USBDevice *) s;
 }

Modified: trunk/src/host/qemu-neo1973/openmoko/flash.sh
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/flash.sh	2007-06-19 13:16:05 UTC (rev 2303)
+++ trunk/src/host/qemu-neo1973/openmoko/flash.sh	2007-06-19 13:57:24 UTC (rev 2304)
@@ -140,5 +140,6 @@
 echo
 echo "    "Append \'-snapshot\' to make the flash image read-only so that every
 echo "    "time emulation starts in the original unmodified state.
-echo "    "[Enter] for AUX button, [Space] for POWER.
+echo "    "Use [Enter] for AUX button, [Space] for POWER.
+echo "    "Append \'-usbdevice keyboard\' to attach a standard keyboard.
 echo

Modified: trunk/src/host/qemu-neo1973/qemu-doc.texi
===================================================================
--- trunk/src/host/qemu-neo1973/qemu-doc.texi	2007-06-19 13:16:05 UTC (rev 2303)
+++ trunk/src/host/qemu-neo1973/qemu-doc.texi	2007-06-19 13:57:24 UTC (rev 2304)
@@ -1362,6 +1362,9 @@
 Virtual Wacom PenPartner tablet.  This device is similar to the @code{tablet}
 above but it can be used with the tslib library because in addition to touch
 coordinates it reports touch pressure.
+ at item @code{keyboard}
+Standard USB keyboard.  Will override the PS/2 keyboard emulation (if
+present).
 @end table
 
 @node host_usb_devices