Changes in uspace/drv/usbhid/generic/hiddev.c [65b458c4:fa8d346] in mainline

File:

• uspace/drv/usbhid/generic/hiddev.c (modified) (7 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
 };
 
@@ -83 +90 @@
 static size_t usb_generic_hid_get_event_length(ddf_fun_t *fun)
 {
-        if (fun == NULL || fun->driver_data) {
+        usb_log_debug("Generic HID: Get event length (fun: %p, "
+            "fun->driver_data: %p.\n", fun, fun->driver_data);
+        
+        if (fun == NULL || fun->driver_data == NULL) {
                 return 0;
         }
@@ -89 +99 @@
         usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
         
-        return hid_dev->input_report_size;
-}
-
-/*----------------------------------------------------------------------------*/
-
-static int usb_generic_hid_get_event(ddf_fun_t *fun, int32_t *buffer, 
+        usb_log_debug("hid_dev: %p, Max input report size (%d).\n",
+            hid_dev, hid_dev->max_input_report_size);
+        
+        return hid_dev->max_input_report_size;
+}
+
+/*----------------------------------------------------------------------------*/
+
+static int usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer, 
     size_t size, size_t *act_size, unsigned int flags)
 {
-        if (fun == NULL || fun->driver_data) {
+        usb_log_debug("Generic HID: Get event.\n");
+        
+        if (fun == NULL || fun->driver_data == NULL) {
+                usb_log_debug("No function");
                 return EINVAL;
         }
@@ -126 +142 @@
 /*----------------------------------------------------------------------------*/
 
+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;
+        
+        printf("hid_dev->report_desc_size = %zu\n", hid_dev->report_desc_size);
+        
+        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;
+}
+
+/*----------------------------------------------------------------------------*/
+
 static int usb_generic_hid_client_connected(ddf_fun_t *fun)
 {
+        usb_log_debug("Generic HID: Client connected.\n");
         usb_hid_report_received();
         return EOK;
@@ -145 +204 @@
                 return ENOMEM;
         }
+        
+        fun->ops = &usb_generic_hid_ops;
+        fun->driver_data = hid_dev;
 
         int rc = ddf_fun_bind(fun);
@@ -154 +216 @@
         }
         
-        fun->ops = &usb_generic_hid_ops;
-        fun->driver_data = hid_dev;
+        usb_log_debug("HID function created. Handle: %d\n", fun->handle);
         
         return EOK;