Changes in uspace/drv/usbhid/kbd/kbddev.c [65b458c4:faa44e58] in mainline

File:

• uspace/drv/usbhid/kbd/kbddev.c (modified) (16 diffs)

uspace/drv/usbhid/kbd/kbddev.c

@@ -46 +46 @@
 
 #include <usb/usb.h>
-#include <usb/dp.h>
-#include <usb/request.h>
-#include <usb/classes/hid.h>
-#include <usb/pipes.h>
+#include <usb/dev/dp.h>
+#include <usb/dev/request.h>
+#include <usb/hid/hid.h>
+#include <usb/dev/pipes.h>
 #include <usb/debug.h>
-#include <usb/classes/hidparser.h>
+#include <usb/hid/hidparser.h>
 #include <usb/classes/classes.h>
-#include <usb/classes/hidut.h>
-#include <usb/classes/hidreq.h>
-#include <usb/classes/hidreport.h>
-#include <usb/classes/hid/utled.h>
-
-#include <usb/devdrv.h>
+#include <usb/hid/usages/core.h>
+#include <usb/hid/request.h>
+#include <usb/hid/hidreport.h>
+#include <usb/hid/usages/led.h>
+
+#include <usb/dev/driver.h>
 
 #include "kbddev.h"
@@ -252 +252 @@
         sysarg_t method = IPC_GET_IMETHOD(*icall);
         
-        usb_kbd_t *kbd_dev = (usb_kbd_t *)fun->driver_data;
-        if (kbd_dev == NULL) {
+        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
+        
+        if (hid_dev == NULL || hid_dev->data == NULL) {
                 usb_log_debug("default_connection_handler: "
                     "Missing parameter.\n");
@@ -259 +260 @@
                 return;
         }
+        
+        assert(hid_dev != NULL);
+        assert(hid_dev->data != NULL);
+        usb_kbd_t *kbd_dev = (usb_kbd_t *)hid_dev->data;
 
         if (method == IPC_M_CONNECT_TO_ME) {
@@ -308 +313 @@
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(
             hid_dev->report, NULL, kbd_dev->led_path, 
-            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+            USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY | USB_HID_PATH_COMPARE_END,
             USB_HID_REPORT_TYPE_OUTPUT);
         
-        while (field != NULL) {         
-                
+        while (field != NULL) {
+
                 if ((field->usage == USB_HID_LED_NUM_LOCK) 
                     && (kbd_dev->mods & KM_NUM_LOCK)){
@@ -329 +334 @@
                 
                 field = usb_hid_report_get_sibling(hid_dev->report, field,
-                    kbd_dev->led_path,  
-                USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
-                        USB_HID_REPORT_TYPE_OUTPUT);
+                    kbd_dev->led_path, USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY 
+                    | USB_HID_PATH_COMPARE_END, USB_HID_REPORT_TYPE_OUTPUT);
         }
         
@@ -658 +662 @@
  *     usb_hid_parse_report().
  */
-static void usb_kbd_process_data(usb_hid_dev_t *hid_dev, usb_kbd_t *kbd_dev,
+static void usb_kbd_process_data(usb_hid_dev_t *hid_dev,
                                  uint8_t *buffer, size_t actual_size)
 {
         assert(hid_dev->report != NULL);
         assert(hid_dev != NULL);
-        assert(kbd_dev != NULL);
+        assert(hid_dev->data != NULL);
+        
+        usb_kbd_t *kbd_dev = (usb_kbd_t *)hid_dev->data;
 
         usb_log_debug("Calling usb_hid_parse_report() with "
@@ -768 +774 @@
 /*----------------------------------------------------------------------------*/
 
-static int usb_kbd_create_function(usb_hid_dev_t *hid_dev, usb_kbd_t *kbd_dev)
+static int usb_kbd_create_function(usb_hid_dev_t *hid_dev)
 {
         assert(hid_dev != NULL);
         assert(hid_dev->usb_dev != NULL);
-        assert(kbd_dev != NULL);
         
         /* Create the function exposed under /dev/devices. */
@@ -787 +792 @@
          * to the DDF function.
          */
-        fun->ops = &kbd_dev->ops;
-        fun->driver_data = kbd_dev;
+        fun->ops = &hid_dev->ops;
+        fun->driver_data = hid_dev;   // TODO: maybe change to hid_dev->data
 
         int rc = ddf_fun_bind(fun);
@@ -835 +840 @@
  * @return Other value inherited from function usbhid_dev_init().
  */
-int usb_kbd_init(usb_hid_dev_t *hid_dev, void **data)
+int usb_kbd_init(usb_hid_dev_t *hid_dev)
 {
         usb_log_debug("Initializing HID/KBD structure...\n");
@@ -860 +865 @@
         usb_hid_report_path_set_report_id(path, 0);
         
-        kbd_dev->key_count = usb_hid_report_size(
-            hid_dev->report, 0, USB_HID_REPORT_TYPE_INPUT); 
+        kbd_dev->key_count = usb_hid_report_input_length(
+            hid_dev->report, path, 
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
         usb_hid_report_path_free(path);
         
@@ -902 +908 @@
             kbd_dev->led_path, USB_HIDUT_PAGE_LED, 0);
         
-        kbd_dev->led_output_size = usb_hid_report_size(hid_dev->report, 
-            0, USB_HID_REPORT_TYPE_OUTPUT);
+        kbd_dev->led_output_size = usb_hid_report_output_size(hid_dev->report, 
+            kbd_dev->led_path, 
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
         
         usb_log_debug("Output report size (in items): %zu\n", 
@@ -948 +955 @@
         
         // save the KBD device structure into the HID device structure
-        //hid_dev->data = kbd_dev;
-        *data = kbd_dev;
+        hid_dev->data = kbd_dev;
         
         // set handler for incoming calls
-        kbd_dev->ops.default_handler = default_connection_handler;
+        hid_dev->ops.default_handler = default_connection_handler;
         
         /*
@@ -977 +983 @@
         
         usb_log_debug("Creating KBD function...\n");
-        int rc = usb_kbd_create_function(hid_dev, kbd_dev);
+        int rc = usb_kbd_create_function(hid_dev);
         if (rc != EOK) {
                 usb_kbd_free(&kbd_dev);
@@ -988 +994 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_kbd_polling_callback(usb_hid_dev_t *hid_dev, void *data, 
-     uint8_t *buffer, size_t buffer_size)
-{
-        if (hid_dev == NULL || buffer == NULL || data == NULL) {
+bool usb_kbd_polling_callback(usb_hid_dev_t *hid_dev, uint8_t *buffer,
+     size_t buffer_size)
+{
+        if (hid_dev == NULL || buffer == NULL) {
                 // do not continue polling (???)
                 return false;
         }
         
-        usb_kbd_t *kbd_dev = (usb_kbd_t *)data;
-        assert(kbd_dev != NULL);
-        
         // TODO: add return value from this function
-        usb_kbd_process_data(hid_dev, kbd_dev, buffer, buffer_size);
+        usb_kbd_process_data(hid_dev, buffer, buffer_size);
         
         return true;
@@ -1063 +1066 @@
 /*----------------------------------------------------------------------------*/
 
-void usb_kbd_deinit(usb_hid_dev_t *hid_dev, void *data)
+void usb_kbd_deinit(usb_hid_dev_t *hid_dev)
 {
         if (hid_dev == NULL) {
@@ -1069 +1072 @@
         }
         
-        if (data != NULL) {
-                usb_kbd_t *kbd_dev = (usb_kbd_t *)data;
+        if (hid_dev->data != NULL) {
+                usb_kbd_t *kbd_dev = (usb_kbd_t *)hid_dev->data;
                 if (usb_kbd_is_initialized(kbd_dev)) {
                         usb_kbd_mark_unusable(kbd_dev);
                 } else {
                         usb_kbd_free(&kbd_dev);
+                        hid_dev->data = NULL;
                 }
         }