Changeset d7c72db in mainline for uspace/lib/usbhid

Timestamp:

2011-05-24T21:01:02Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a28b41d

Parents:

4e78236

Message:

A lot of changes to mkbd and HID interface.

• mkbd Report parser initialization (getting report descriptor, parsing).
• Getting report descriptor and its length from HID device added to HID interface (client and server stubs not implemented).
• Fixed event type to uint8_t *.
• Implemented these functions in generic HID driver.
• Moved mapping from Consumer page usages to string descriptions moved to libusbhid.
• Removed some temporary debug output.

Location:

uspace/lib/usbhid

Files:

• Makefile (modified) (1 diff)
• include/usb/hid/iface.h (modified) (1 diff)
• src/hidiface.c (modified) (3 diffs)

uspace/lib/usbhid/Makefile

@@ -41 +41 @@
         src/hidpath.c \
         src/hidreport.c \
+        src/consumer.c \
         src/hidreq.c
 

uspace/lib/usbhid/include/usb/hid/iface.h

@@ -39 +39 @@
 
 int usbhid_dev_get_event_length(int, size_t *);
-int usbhid_dev_get_event(int, int32_t *, size_t, size_t *,
+int usbhid_dev_get_event(int, uint8_t *, size_t, size_t *,
     unsigned int);
+int usbhid_dev_get_report_descriptor_length(int, size_t *);
+int usbhid_dev_get_report_descriptor(int, uint8_t *, size_t, size_t *);
 
 #endif

uspace/lib/usbhid/src/hidiface.c

@@ -74 +74 @@
  * @return Error code.
  */
-int usbhid_dev_get_event(int dev_phone, int32_t *buf, 
+int usbhid_dev_get_event(int dev_phone, uint8_t *buf, 
     size_t size, size_t *actual_size, unsigned int flags)
 {
@@ -92 +92 @@
 
         size_t buffer_size =  size;
-        uint16_t *buffer = malloc(buffer_size);
+        uint8_t *buffer = malloc(buffer_size);
         if (buffer == NULL) {
                 return ENOMEM;
@@ -145 +145 @@
 }
 
+
+int usbhid_dev_get_report_descriptor_length(int dev_phone, size_t *size)
+{
+        /** @todo Implement! */
+        return ENOTSUP;
+}
+
+int usbhid_dev_get_report_descriptor(int dev_phone, uint8_t *buf, size_t size, 
+    size_t *actual_size)
+{
+        /** @todo Implement! */
+        return ENOTSUP;
+}
+
 /**
  * @}