Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r2327 - in trunk/oe/packages/libftdi: . files
([EMAIL PROTECTED])
2. r2328 - in trunk/oe/packages/openocd: . files openocd
([EMAIL PROTECTED])
3. r2329 - in trunk/oe: conf packages packages/ttf-fonts
packages/uucp packages/xserver-kdrive-common
([EMAIL PROTECTED])
4. r2330 - trunk/oe/packages/libxosd/files ([EMAIL PROTECTED])
5. r2331 - in
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock: .
data ([EMAIL PROTECTED])
6. r2332 - in
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery: .
data ([EMAIL PROTECTED])
7. r2333 - in
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu: .
data src ([EMAIL PROTECTED])
8. r2334 - trunk/src/host/qemu-neo1973/hw ([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-06-22 12:25:45 +0200 (Fri, 22 Jun 2007)
New Revision: 2327
Modified:
trunk/oe/packages/libftdi/files/doxygen-configure.patch
trunk/oe/packages/libftdi/libftdi_0.9.bb
Log:
oe/libftdi: repair oe-sync breakage
Modified: trunk/oe/packages/libftdi/files/doxygen-configure.patch
===================================================================
--- trunk/oe/packages/libftdi/files/doxygen-configure.patch 2007-06-21
21:59:04 UTC (rev 2326)
+++ trunk/oe/packages/libftdi/files/doxygen-configure.patch 2007-06-22
10:25:45 UTC (rev 2327)
@@ -1,22 +1,22 @@
-Index: libftdi-0.8/configure.in
+Index: libftdi-0.9/configure.in
===================================================================
---- libftdi-0.8.orig/configure.in
-+++ libftdi-0.8/configure.in
+--- libftdi-0.9.orig/configure.in
++++ libftdi-0.9/configure.in
@@ -32,9 +32,5 @@ else
AC_MSG_RESULT(yes)
fi
-dnl check for doxygen
--AC_PATH_PROG(DOXYGEN, doxygen, $PATH)
+-AC_PATH_PROG(DOXYGEN, doxygen)
-AM_CONDITIONAL(HAVE_DOXYGEN, test -n $DOXYGEN);
-
AC_OUTPUT([libftdi-config],[chmod a+x libftdi-config])
-AC_OUTPUT(Makefile src/Makefile examples/Makefile doc/Doxyfile doc/Makefile
libftdi.pc)
+AC_OUTPUT(Makefile src/Makefile examples/Makefile libftdi.pc)
-Index: libftdi-0.8/Makefile.am
+Index: libftdi-0.9/Makefile.am
===================================================================
---- libftdi-0.8.orig/Makefile.am
-+++ libftdi-0.8/Makefile.am
+--- libftdi-0.9.orig/Makefile.am
++++ libftdi-0.9/Makefile.am
@@ -2,7 +2,7 @@
# have all needed files, that a GNU package needs
AUTOMAKE_OPTIONS = foreign 1.4
Modified: trunk/oe/packages/libftdi/libftdi_0.9.bb
===================================================================
--- trunk/oe/packages/libftdi/libftdi_0.9.bb 2007-06-21 21:59:04 UTC (rev
2326)
+++ trunk/oe/packages/libftdi/libftdi_0.9.bb 2007-06-22 10:25:45 UTC (rev
2327)
@@ -3,10 +3,10 @@
HOMEPAGE = "http://www.intra2net.com/de/produkte/opensource/ftdi";
LICENSE = "GPL"
DEPENDS = "libusb"
+PR = "r1"
SRC_URI =
"http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/libftdi-${PV}.tar.gz \
- file://doxygen-configure.patch;patch=1 \
- "
+ file://doxygen-configure.patch;patch=1 "
S = "${WORKDIR}/libftdi-${PV}"
inherit autotools
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-22 12:29:46 +0200 (Fri, 22 Jun 2007)
New Revision: 2328
Added:
trunk/oe/packages/openocd/files/
trunk/oe/packages/openocd/files/openocd-link-static.patch
Removed:
trunk/oe/packages/openocd/openocd/openocd-link-static.patch
Modified:
trunk/oe/packages/openocd/openocd_svn.bb
Log:
oe/openocd: repair oe-sync breakage
Copied: trunk/oe/packages/openocd/files/openocd-link-static.patch (from rev
2326, trunk/oe/packages/openocd/openocd/openocd-link-static.patch)
Deleted: trunk/oe/packages/openocd/openocd/openocd-link-static.patch
===================================================================
--- trunk/oe/packages/openocd/openocd/openocd-link-static.patch 2007-06-22
10:25:45 UTC (rev 2327)
+++ trunk/oe/packages/openocd/openocd/openocd-link-static.patch 2007-06-22
10:29:46 UTC (rev 2328)
@@ -1,20 +0,0 @@
---- openocd/src/Makefile.am.orig 2007-03-01 11:51:41.000000000 -0300
-+++ openocd/src/Makefile.am 2007-03-01 11:58:08.000000000 -0300
-@@ -7,7 +7,7 @@
- -I$(top_srcdir)/src/flash -I$(top_srcdir)/src/pld $(all_includes)
-
- # the library search path.
--openocd_LDFLAGS = $(all_libraries)
-+openocd_LDFLAGS = -static $(all_libraries)
- SUBDIRS = helper jtag xsvf target server flash pld
-
- if IS_MINGW
-@@ -17,7 +17,7 @@
- endif
-
- if FT2232_LIBFTDI
--FTDI2232LIB = -lftdi
-+FTDI2232LIB = -lftdi -lusb
- else
- FTDI2232LIB =
- endif
Modified: trunk/oe/packages/openocd/openocd_svn.bb
===================================================================
--- trunk/oe/packages/openocd/openocd_svn.bb 2007-06-22 10:25:45 UTC (rev
2327)
+++ trunk/oe/packages/openocd/openocd_svn.bb 2007-06-22 10:29:46 UTC (rev
2328)
@@ -2,10 +2,11 @@
HOMEPAGE = "http://openocd.berlios.de/";
LICENSE = "GPL"
PV = "0.0+svn${SRCDATE}"
+PR = "r1"
inherit autotools
-SRC_URI = "svn://svn.berlios.de/;module=openocd/trunk \
+SRC_URI = "svn://svn.berlios.de/openocd;module=trunk \
file://openocd-link-static.patch;patch=1"
S = "${WORKDIR}/trunk"
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-22 15:08:10 +0200 (Fri, 22 Jun 2007)
New Revision: 2329
Added:
trunk/oe/packages/ttf-fonts/oe-sync
trunk/oe/packages/uucp/oe-sync
trunk/oe/packages/xserver-kdrive-common/oe-sync
Modified:
trunk/oe/conf/site.conf
trunk/oe/packages/oe-to-verify
Log:
oe: update oe-sync stamps. OE-Merge-Status: 80%
Modified: trunk/oe/conf/site.conf
===================================================================
--- trunk/oe/conf/site.conf 2007-06-22 10:29:46 UTC (rev 2328)
+++ trunk/oe/conf/site.conf 2007-06-22 13:08:10 UTC (rev 2329)
@@ -14,5 +14,3 @@
#INHIBIT_PACKAGE_STRIP = "1"
SOURCEFORGE_MIRROR = "http://belnet.dl.sf.net";
#PARALLEL_MAKE = ""
-
-SRCDATE = "20060814"
Modified: trunk/oe/packages/oe-to-verify
===================================================================
--- trunk/oe/packages/oe-to-verify 2007-06-22 10:29:46 UTC (rev 2328)
+++ trunk/oe/packages/oe-to-verify 2007-06-22 13:08:10 UTC (rev 2329)
@@ -2,4 +2,7 @@
initscripts
linux
openmoko*
+task-openmoko
+u-boot
+x11-c-locale
Added: trunk/oe/packages/ttf-fonts/oe-sync
===================================================================
Added: trunk/oe/packages/uucp/oe-sync
===================================================================
Added: trunk/oe/packages/xserver-kdrive-common/oe-sync
===================================================================
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-06-22 23:28:35 +0200 (Fri, 22 Jun 2007)
New Revision: 2330
Modified:
trunk/oe/packages/libxosd/files/use-sane-default-font.patch
Log:
* Refresh patch to todays libxosd svn changes.
Modified: trunk/oe/packages/libxosd/files/use-sane-default-font.patch
===================================================================
--- trunk/oe/packages/libxosd/files/use-sane-default-font.patch 2007-06-22
13:08:10 UTC (rev 2329)
+++ trunk/oe/packages/libxosd/files/use-sane-default-font.patch 2007-06-22
21:28:35 UTC (rev 2330)
@@ -5,7 +5,7 @@
@@ -26,7 +26,7 @@
#define XOFFSET 10
- const char *osd_default_font =
+ const char * const osd_default_font =
- "-misc-fixed-medium-r-semicondensed--*-*-*-*-c-*-*-*";
+ "fixed";
#if 0
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-06-22 23:52:22 +0200 (Fri, 22 Jun 2007)
New Revision: 2331
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/ChangeLog
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/configure.ac
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/data/Makefile.am
Log:
2007-06-22 Stefan Schmidt <[EMAIL PROTECTED]>
* configure.ac:
* data/Makefile.am:
Fix make distcheck. Patch from Rodolphe Ortalo. Closes #540
Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/ChangeLog
2007-06-22 21:28:35 UTC (rev 2330)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/ChangeLog
2007-06-22 21:52:22 UTC (rev 2331)
@@ -0,0 +1,6 @@
+2007-06-22 Stefan Schmidt <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ * data/Makefile.am:
+
+ Fix make distcheck. Patch from Rodolphe Ortalo. Closes #540
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/configure.ac
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/configure.ac
2007-06-22 21:28:35 UTC (rev 2330)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/configure.ac
2007-06-22 21:52:22 UTC (rev 2331)
@@ -1,5 +1,5 @@
AC_PREREQ(2.53)
-AC_INIT(openmoko-panel-clock, %(1.0.0), http://www.openmoko.org/)
+AC_INIT(openmoko-panel-clock, 1.0.0, http://www.openmoko.org/)
AM_INIT_AUTOMAKE()
AC_CONFIG_SRCDIR(src/openmoko-panel-clock.c)
AM_CONFIG_HEADER(config.h)
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/data/Makefile.am
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/data/Makefile.am
2007-06-22 21:28:35 UTC (rev 2330)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/data/Makefile.am
2007-06-22 21:52:22 UTC (rev 2331)
@@ -1,7 +1,4 @@
-EXTRA_DIST = clock-bg.pn
-
#
# misc. data files
#
-resourcedir = $(pkgdatadir)
-resource_DATA = clock-bg.png
+dist_pkgdata_DATA = clock-bg.png
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-06-22 23:53:17 +0200 (Fri, 22 Jun 2007)
New Revision: 2332
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/ChangeLog
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/configure.ac
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/data/Makefile.am
Log:
2007-06-22 Stefan Schmidt <[EMAIL PROTECTED]>
* configure.ac:
* data/Makefile.am:
Fix make distcheck. Patch from Rodolphe Ortalo. Closes #541
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/ChangeLog
2007-06-22 21:52:22 UTC (rev 2331)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/ChangeLog
2007-06-22 21:53:17 UTC (rev 2332)
@@ -0,0 +1,6 @@
+2007-06-22 Stefan Schmidt <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ * data/Makefile.am:
+
+ Fix make distcheck. Patch from Rodolphe Ortalo. Closes #541
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/configure.ac
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/configure.ac
2007-06-22 21:52:22 UTC (rev 2331)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/configure.ac
2007-06-22 21:53:17 UTC (rev 2332)
@@ -1,5 +1,5 @@
AC_PREREQ(2.53)
-AC_INIT(openmoko-panel-battery, %(1.0.0), http://www.openmoko.org/)
+AC_INIT(openmoko-panel-battery, 1.0.0, http://www.openmoko.org/)
AM_INIT_AUTOMAKE()
AC_CONFIG_SRCDIR(src/openmoko-panel-battery.c)
AM_CONFIG_HEADER(config.h)
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/data/Makefile.am
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/data/Makefile.am
2007-06-22 21:52:22 UTC (rev 2331)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/data/Makefile.am
2007-06-22 21:53:17 UTC (rev 2332)
@@ -1,6 +1,5 @@
#
# misc. data files
#
-resourcedir = $(pkgdatadir)
-resource_DATA = Battery_00.png Battery_01.png Battery_02.png Battery_03.png
\
+dist_pkgdata_DATA = Battery_00.png Battery_01.png Battery_02.png
Battery_03.png \
Battery_04.png Battery_05.png Battery_Plug.png Battery.png
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-06-22 23:53:49 +0200 (Fri, 22 Jun 2007)
New Revision: 2333
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/ChangeLog
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/data/Makefile.am
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
Log:
2007-06-22 Stefan Schmidt <[EMAIL PROTECTED]>
* configure.ac:
* data/Makefile.am:
* src/Makefile.am:
Fix make distcheck. Patch from Rodolphe Ortalo. Closes #542
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/ChangeLog
2007-06-22 21:53:17 UTC (rev 2332)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/ChangeLog
2007-06-22 21:53:49 UTC (rev 2333)
@@ -1,3 +1,11 @@
+2007-06-22 Stefan Schmidt <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ * data/Makefile.am:
+ * src/Makefile.am:
+
+ Fix make distcheck. Patch from Rodolphe Ortalo. Closes #542
+
2007-06-06 Stefan Schmidt <[EMAIL PROTECTED]>
* configure.ac:
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac
2007-06-22 21:53:17 UTC (rev 2332)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac
2007-06-22 21:53:49 UTC (rev 2333)
@@ -1,5 +1,5 @@
AC_PREREQ(2.53)
-AC_INIT(openmoko-panel-mainmenu, %(1.0.0), http://www.openmoko.org/)
+AC_INIT(openmoko-panel-mainmenu, 1.0.0, http://www.openmoko.org/)
AM_INIT_AUTOMAKE()
AC_CONFIG_SRCDIR(src/openmoko-panel-mainmenu.c)
AM_CONFIG_HEADER(config.h)
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/data/Makefile.am
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/data/Makefile.am
2007-06-22 21:53:17 UTC (rev 2332)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/data/Makefile.am
2007-06-22 21:53:49 UTC (rev 2333)
@@ -1,7 +1,4 @@
-EXTRA_DIST =
-
#
# misc. data files
#
-resourcedir = $(pkgdatadir)
-resource_DATA = btn_menu.png
+dist_pkgdata_DATA = btn_menu.png
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
2007-06-22 21:53:17 UTC (rev 2332)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
2007-06-22 21:53:49 UTC (rev 2333)
@@ -7,9 +7,13 @@
libopenmoko_panel_mainmenu_la_SOURCES = \
openmoko-panel-mainmenu.c \
buttonactions.c \
+ buttonactions.h \
stylusmenu.c \
+ stylusmenu.h \
mokodesktop.c \
- mokodesktop_item.c
+ mokodesktop.h \
+ mokodesktop_item.c \
+ mokodesktop_item.h
libopenmoko_panel_mainmenu_la_LIBADD = @OPENMOKO_LIBS@ @LIBMB_LIBS@
@LIBSN_LIBS@
MAINTAINERCLEANFILES = Makefile.in
--- End Message ---
--- Begin Message ---
Author: andrew
Date: 2007-06-23 02:55:52 +0200 (Sat, 23 Jun 2007)
New Revision: 2334
Modified:
trunk/src/host/qemu-neo1973/hw/usb-hid.c
Log:
Clean up keyboard code enough for upstream.
Modified: trunk/src/host/qemu-neo1973/hw/usb-hid.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/usb-hid.c 2007-06-22 21:53:49 UTC (rev
2333)
+++ trunk/src/host/qemu-neo1973/hw/usb-hid.c 2007-06-23 00:55:52 UTC (rev
2334)
@@ -28,14 +28,19 @@
#define GET_REPORT 0xa101
#define GET_IDLE 0xa102
#define GET_PROTOCOL 0xa103
-#define SET_REPORT 0x2101
+#define SET_REPORT 0x2109
#define SET_IDLE 0x210a
#define SET_PROTOCOL 0x210b
-#define USB_MOUSE 1
-#define USB_TABLET 2
-#define USB_KEYBOARD 3
+/* HID descriptor types */
+#define USB_DT_HID 0x21
+#define USB_DT_REPORT 0x22
+#define USB_DT_PHY 0x23
+#define USB_MOUSE 1
+#define USB_TABLET 2
+#define USB_KEYBOARD 3
+
typedef struct USBMouseState {
int dx, dy, dz, buttons_state;
int x, y;
@@ -117,7 +122,7 @@
0x03, /* u8 if_bInterfaceClass; */
0x01, /* u8 if_bInterfaceSubClass; */
0x02, /* u8 if_bInterfaceProtocol; [usb1.1 or single tt] */
- 0x05, /* u8 if_iInterface; */
+ 0x07, /* u8 if_iInterface; */
/* HID descriptor */
0x09, /* u8 bLength; */
@@ -144,7 +149,7 @@
0x22, 0x00, /* u16 wTotalLength; */
0x01, /* u8 bNumInterfaces; (1) */
0x01, /* u8 bConfigurationValue; */
- 0x04, /* u8 iConfiguration; */
+ 0x05, /* u8 iConfiguration; */
0xa0, /* u8 bmAttributes;
Bit 7: must be set,
6: Self-powered,
@@ -172,7 +177,7 @@
0x03, /* u8 if_bInterfaceClass; */
0x01, /* u8 if_bInterfaceSubClass; */
0x02, /* u8 if_bInterfaceProtocol; [usb1.1 or single tt] */
- 0x05, /* u8 if_iInterface; */
+ 0x07, /* u8 if_iInterface; */
/* HID descriptor */
0x09, /* u8 bLength; */
@@ -193,58 +198,58 @@
};
static const uint8_t qemu_keyboard_config_descriptor[] = {
- /* one configuration */
- 0x09, /* u8 bLength; */
- 0x02, /* u8 bDescriptorType; Configuration */
- 0x22, 0x00, /* u16 wTotalLength; */
- 0x01, /* u8 bNumInterfaces; (1) */
- 0x01, /* u8 bConfigurationValue; */
- 0x04, /* u8 iConfiguration; */
- 0xa0, /* u8 bmAttributes;
- Bit 7: must be set,
- 6: Self-powered,
- 5: Remote wakeup,
- 4..0: resvd */
- 0x32, /* u8 MaxPower; */
+ /* one configuration */
+ 0x09, /* u8 bLength; */
+ USB_DT_CONFIG, /* u8 bDescriptorType; Configuration */
+ 0x22, 0x00, /* u16 wTotalLength; */
+ 0x01, /* u8 bNumInterfaces; (1) */
+ 0x01, /* u8 bConfigurationValue; */
+ 0x06, /* u8 iConfiguration; */
+ 0xa0, /* u8 bmAttributes;
+ Bit 7: must be set,
+ 6: Self-powered,
+ 5: Remote wakeup,
+ 4..0: resvd */
+ 0x32, /* u8 MaxPower; */
- /* USB 1.1:
- * USB 2.0, single TT organization (mandatory):
- * one interface, protocol 0
- *
- * USB 2.0, multiple TT organization (optional):
- * two interfaces, protocols 1 (like single TT)
- * and 2 (multiple TT mode) ... config is
- * sometimes settable
- * NOT IMPLEMENTED
- */
+ /* USB 1.1:
+ * USB 2.0, single TT organization (mandatory):
+ * one interface, protocol 0
+ *
+ * USB 2.0, multiple TT organization (optional):
+ * two interfaces, protocols 1 (like single TT)
+ * and 2 (multiple TT mode) ... config is
+ * sometimes settable
+ * NOT IMPLEMENTED
+ */
- /* one interface */
- 0x09, /* u8 if_bLength; */
- 0x04, /* u8 if_bDescriptorType; Interface */
- 0x00, /* u8 if_bInterfaceNumber; */
- 0x00, /* u8 if_bAlternateSetting; */
- 0x01, /* u8 if_bNumEndpoints; */
- 0x03, /* u8 if_bInterfaceClass; HID */
- 0x01, /* u8 if_bInterfaceSubClass; Boot */
- 0x01, /* u8 if_bInterfaceProtocol; Keyboard */
- 0x05, /* u8 if_iInterface; */
+ /* one interface */
+ 0x09, /* u8 if_bLength; */
+ USB_DT_INTERFACE, /* u8 if_bDescriptorType; Interface */
+ 0x00, /* u8 if_bInterfaceNumber; */
+ 0x00, /* u8 if_bAlternateSetting; */
+ 0x01, /* u8 if_bNumEndpoints; */
+ 0x03, /* u8 if_bInterfaceClass; HID */
+ 0x01, /* u8 if_bInterfaceSubClass; Boot */
+ 0x01, /* u8 if_bInterfaceProtocol; Keyboard */
+ 0x07, /* u8 if_iInterface; */
- /* HID descriptor */
- 0x09, /* u8 bLength; */
- 0x21, /* u8 bDescriptorType; */
- 0x11, 0x01, /* u16 HID_class */
- 0x00, /* u8 country_code */
- 0x01, /* u8 num_descriptors */
- 0x22, /* u8 type; Report */
- 0x3f, 0x00, /* u16 len */
+ /* HID descriptor */
+ 0x09, /* u8 bLength; */
+ USB_DT_HID, /* u8 bDescriptorType; */
+ 0x11, 0x01, /* u16 HID_class */
+ 0x00, /* u8 country_code */
+ 0x01, /* u8 num_descriptors */
+ USB_DT_REPORT, /* u8 type; Report */
+ 0x3f, 0x00, /* u16 len */
- /* one endpoint (status change endpoint) */
- 0x07, /* u8 ep_bLength; */
- 0x05, /* u8 ep_bDescriptorType; Endpoint */
- 0x81, /* u8 ep_bEndpointAddress; IN Endpoint 1 */
- 0x03, /* u8 ep_bmAttributes; Interrupt */
- 0x08, 0x00, /* u16 ep_wMaxPacketSize; */
- 0x0a, /* u8 ep_bInterval; (255ms -- usb 2.0 spec) */
+ /* one endpoint (status change endpoint) */
+ 0x07, /* u8 ep_bLength; */
+ USB_DT_ENDPOINT, /* u8 ep_bDescriptorType; Endpoint */
+ USB_DIR_IN | 0x01, /* u8 ep_bEndpointAddress; IN Endpoint 1 */
+ 0x03, /* u8 ep_bmAttributes; Interrupt */
+ 0x08, 0x00, /* u16 ep_wMaxPacketSize; */
+ 0x0a, /* u8 ep_bInterval; (255ms -- usb 2.0 spec) */
};
static const uint8_t qemu_mouse_hid_report_descriptor[] = {
@@ -423,24 +428,21 @@
case 0xe8 ... 0xef:
s->modifiers |= 1 << (hid_code & 0x0f);
return;
+ }
- default:
- if (keycode & (1 << 7)) {
- s->keys --;
- for (i = 0; i <= s->keys; i ++)
- if (s->key[i] == hid_code) {
- s->key[i] = s->key[s->keys];
- s->key[s->keys] = 0x00;
- return;
- }
- } else {
- for (i = 0; i < s->keys; i ++)
- if (s->key[i] == hid_code)
- return;
- if (s->keys < sizeof(s->key))
- s->key[s->keys] = hid_code;
- s->keys ++;
- }
+ if (keycode & (1 << 7)) {
+ for (i = s->keys - 1; i >= 0; i --)
+ if (s->key[i] == hid_code) {
+ s->key[i] = s->key[-- s->keys];
+ s->key[s->keys] = 0x00;
+ return;
+ }
+ } else {
+ for (i = s->keys - 1; i >= 0; i --)
+ if (s->key[i] == hid_code)
+ return;
+ if (s->keys < sizeof(s->key))
+ s->key[s->keys ++] = hid_code;
}
}
@@ -570,7 +572,7 @@
{
USBHIDState *s = (USBHIDState *)dev;
- qemu_add_kbd_event_handler(usb_keyboard_event, &s->kbd); /* XXX: once */
+ qemu_add_kbd_event_handler(usb_keyboard_event, &s->kbd);
s->protocol = 1;
}
@@ -627,7 +629,7 @@
memcpy(data, qemu_keyboard_config_descriptor,
sizeof(qemu_keyboard_config_descriptor));
ret = sizeof(qemu_keyboard_config_descriptor);
- }
+ }
break;
case USB_DT_STRING:
switch(value & 0xff) {
@@ -655,6 +657,12 @@
ret = set_usb_string(data, "HID Mouse");
break;
case 5:
+ ret = set_usb_string(data, "HID Tablet");
+ break;
+ case 6:
+ ret = set_usb_string(data, "HID Keyboard");
+ break;
+ case 7:
ret = set_usb_string(data, "Endpoint1 Interrupt Pipe");
break;
default:
@@ -774,7 +782,7 @@
{
USBHIDState *s = (USBHIDState *)dev;
- if (!s->kind == USB_KEYBOARD)
+ if (s->kind != USB_KEYBOARD)
qemu_remove_mouse_event_handler(s->ptr.eh_entry);
/* TODO: else */
qemu_free(s);
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
