Changeset d7c72db in mainline for uspace/drv/usbhid/generic/hiddev.c

Timestamp:

2011-05-24T21:01:02Z (13 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.

File:

• uspace/drv/usbhid/generic/hiddev.c (modified) (4 diffs)

uspace/drv/usbhid/generic/hiddev.c

@@ -62 +62 @@
 static size_t usb_generic_hid_get_event_length(ddf_fun_t *fun);
 
-static int usb_generic_hid_get_event(ddf_fun_t *fun, int32_t *buffer, 
+static int usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer, 
     size_t size, size_t *act_size, unsigned int flags);
 
 static int usb_generic_hid_client_connected(ddf_fun_t *fun);
+
+static size_t usb_generic_get_report_descriptor_length(ddf_fun_t *fun);
+
+static int usb_generic_get_report_descriptor(ddf_fun_t *fun, uint8_t *desc, 
+    size_t size, size_t *actual_size);
 
 /*----------------------------------------------------------------------------*/
@@ -71 +76 @@
 static usbhid_iface_t usb_generic_iface = {
         .get_event = usb_generic_hid_get_event,
-        .get_event_length = usb_generic_hid_get_event_length
+        .get_event_length = usb_generic_hid_get_event_length,
+        .get_report_descriptor_length = usb_generic_get_report_descriptor_length,
+        .get_report_descriptor = usb_generic_get_report_descriptor
 };
 
@@ -100 +107 @@
 /*----------------------------------------------------------------------------*/
 
-static int usb_generic_hid_get_event(ddf_fun_t *fun, int32_t *buffer, 
+static int usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer, 
     size_t size, size_t *act_size, unsigned int flags)
 {
@@ -129 +136 @@
         // note that we already received this report
 //      report_received = true;
+        
+        return EOK;
+}
+
+/*----------------------------------------------------------------------------*/
+
+static size_t usb_generic_get_report_descriptor_length(ddf_fun_t *fun)
+{
+        usb_log_debug("Generic HID: Get report descriptor length.\n");
+        
+        if (fun == NULL || fun->driver_data == NULL) {
+                usb_log_debug("No function");
+                return EINVAL;
+        }
+        
+        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
+        
+        return hid_dev->report_desc_size;
+}
+
+/*----------------------------------------------------------------------------*/
+
+static int usb_generic_get_report_descriptor(ddf_fun_t *fun, uint8_t *desc, 
+    size_t size, size_t *actual_size)
+{
+        usb_log_debug("Generic HID: Get report descriptor.\n");
+        
+        if (fun == NULL || fun->driver_data == NULL) {
+                usb_log_debug("No function");
+                return EINVAL;
+        }
+        
+        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
+        
+        if (hid_dev->report_desc_size > size) {
+                return EINVAL;  // TODO: other error code
+        }
+        
+        memcpy(desc, hid_dev->report_desc, hid_dev->report_desc_size);
+        *actual_size = hid_dev->report_desc_size;
         
         return EOK;