Changeset 4939490 in mainline

Timestamp:

2011-05-20T10:23:26Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

d1fb591

Parents:

d09f3720

Message:

Removed generic subdriver from mappings + some debug output

Location:

uspace/drv/usbhid

Files:

• generic/hiddev.c (modified) (5 diffs)
• kbd/kbddev.c (modified) (1 diff)
• multimedia/multimedia.c (modified) (1 diff)
• subdrivers.c (modified) (2 diffs)

uspace/drv/usbhid/generic/hiddev.c

@@ -83 +83 @@
 static size_t usb_generic_hid_get_event_length(ddf_fun_t *fun)
 {
+        usb_log_debug("Generic HID: Get event length.\n");
+        
         if (fun == NULL || fun->driver_data) {
                 return 0;
@@ -97 +99 @@
     size_t size, size_t *act_size, unsigned int flags)
 {
+        usb_log_debug("Generic HID: Get event.\n");
+        
         if (fun == NULL || fun->driver_data) {
                 return EINVAL;
@@ -128 +132 @@
 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 +150 @@
                 return ENOMEM;
         }
+        
+        fun->ops = &usb_generic_hid_ops;
+        fun->driver_data = hid_dev;
 
         int rc = ddf_fun_bind(fun);
@@ -154 +162 @@
         }
         
-        fun->ops = &usb_generic_hid_ops;
-        fun->driver_data = hid_dev;
+        usb_log_debug("HID function created. Handle: %d\n", fun->handle);
         
         return EOK;

uspace/drv/usbhid/kbd/kbddev.c

@@ -798 +798 @@
         }
         
+        usb_log_debug("%s function created. Handle: %d\n", HID_KBD_FUN_NAME,
+            fun->handle);
+        
         usb_log_debug("Adding DDF function to class %s...\n", 
             HID_KBD_CLASS_NAME);

uspace/drv/usbhid/multimedia/multimedia.c

@@ -209 +209 @@
                 return rc;
         }
+        
+        usb_log_debug("%s function created. Handle: %d\n", NAME, fun->handle);
         
         rc = ddf_fun_add_to_class(fun, "keyboard");

uspace/drv/usbhid/subdrivers.c

@@ -58 +58 @@
 };
 
-static usb_hid_subdriver_usage_t generic_hid_key_path[] = {
-        {0, 0}
-};
+//static usb_hid_subdriver_usage_t generic_hid_key_path[] = {
+//      {0, 0}
+//};
 
 const usb_hid_subdriver_mapping_t usb_hid_subdrivers[] = {
@@ -103 +103 @@
                 }
         },
-        {
-                generic_hid_key_path,
-                0,
-                USB_HID_PATH_COMPARE_ANYWHERE,
-                -1,
-                -1,
-                {
-                        .init = usb_generic_hid_init,
-                        .deinit = NULL,
-                        .poll = usb_generic_hid_polling_callback,
-                        .poll_end = NULL
-                }
-        },
+//      {
+//              generic_hid_key_path,
+//              0,
+//              USB_HID_PATH_COMPARE_ANYWHERE,
+//              -1,
+//              -1,
+//              {
+//                      .init = usb_generic_hid_init,
+//                      .deinit = NULL,
+//                      .poll = usb_generic_hid_polling_callback,
+//                      .poll_end = NULL
+//              }
+//      },
         {NULL, -1, 0, -1, -1, {NULL, NULL, NULL, NULL, NULL}}
 };