Changeset 61257f4 in mainline for uspace/drv/usbhid/main.c

Timestamp:

2011-04-07T20:19:24Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

f8e8738

Parents:

fd9ba204

Message:

Initial implementation of general HID driver.

• Should handle:
  • keyboard (most of functions from usbkbd driver), more-or-less works
  • mouse (not implemented yet)
  • generic HID device (just dummy polling callback now)

File:

• uspace/drv/usbhid/main.c (modified) (6 diffs)

uspace/drv/usbhid/main.c

@@ -71 +71 @@
  * @return Other error code inherited from one of functions usb_kbd_init(),
  *         ddf_fun_bind() and ddf_fun_add_to_class().
- *
- * @sa usb_kbd_fibril(), usb_kbd_repeat_fibril()
  */
 static int usb_hid_try_add_device(usb_device_t *dev)
 {
+        /* 
+         * Initialize device (get and process descriptors, get address, etc.)
+         */
+        usb_log_debug("Initializing USB/HID device...\n");
+        
+        usb_hid_dev_t *hid_dev = usb_hid_new();
+        if (hid_dev == NULL) {
+                usb_log_error("Error while creating USB/HID device "
+                    "structure.\n");
+                return ENOMEM;
+        }
+        
+        int rc = usb_hid_init(hid_dev, dev);
+        
+        if (rc != EOK) {
+                usb_log_error("Failed to initialize USB/HID device.\n");
+                usb_hid_free(&hid_dev);
+                return rc;
+        }       
+        
+        usb_log_debug("USB/HID device structure initialized.\n");
+        
         /* Create the function exposed under /dev/devices. */
         ddf_fun_t *hid_fun = ddf_fun_create(dev->ddf_dev, fun_exposed, 
-            "hid");
+            usb_hid_get_function_name(hid_dev->device_type));
         if (hid_fun == NULL) {
                 usb_log_error("Could not create DDF function node.\n");
+                usb_hid_free(&hid_dev);
                 return ENOMEM;
         }
         
-        /* 
-         * Initialize device (get and process descriptors, get address, etc.)
-         */
-        usb_log_debug("Initializing USB/HID device...\n");
-        
-//      usb_kbd_t *kbd_dev = usb_kbd_new();
-//      if (kbd_dev == NULL) {
-//              usb_log_error("Error while creating USB/HID KBD device "
-//                  "structure.\n");
-//              ddf_fun_destroy(hid_fun);
-//              return ENOMEM;  // TODO: some other code??
-//      }
-        
-//      int rc = usb_kbd_init(kbd_dev, dev);
-        
-//      if (rc != EOK) {
-//              usb_log_error("Failed to initialize USB/HID KBD device.\n");
-//              ddf_fun_destroy(hid_fun);
-//              usb_kbd_free(&kbd_dev);
-//              return rc;
-//      }       
-        
-//      usb_log_debug("USB/HID KBD device structure initialized.\n");
-        
         /*
-         * Store the initialized keyboard device and keyboard ops
+         * Store the initialized HID device and HID ops
          * to the DDF function.
          */
-        //kbd_fun->driver_data = kbd_dev;
-        hid_fun->ops = &hid_ops;
-
-        int rc = ddf_fun_bind(hid_fun);
+        hid_fun->ops = &hid_dev->ops;
+        hid_fun->driver_data = hid_dev;   // TODO: maybe change to hid_dev->data
+
+        rc = ddf_fun_bind(hid_fun);
         if (rc != EOK) {
                 usb_log_error("Could not bind DDF function: %s.\n",
@@ -121 +118 @@
                 // TODO: Can / should I destroy the DDF function?
                 ddf_fun_destroy(hid_fun);
-                return rc;
-        }
-        
-        rc = ddf_fun_add_to_class(hid_fun, "hid");
+                usb_hid_free(&hid_dev);
+                return rc;
+        }
+        
+        rc = ddf_fun_add_to_class(hid_fun, 
+            usb_hid_get_class_name(hid_dev->device_type));
         if (rc != EOK) {
                 usb_log_error(
@@ -131 +130 @@
                 // TODO: Can / should I destroy the DDF function?
                 ddf_fun_destroy(hid_fun);
-                return rc;
-        }
-        
-
+                usb_hid_free(&hid_dev);
+                return rc;
+        }
+        
         /* Start automated polling function.
          * This will create a separate fibril that will query the device
@@ -141 +140 @@
        rc = usb_device_auto_poll(dev,
            /* Index of the polling pipe. */
-           USB_HID_POLL_EP_NO,
+           hid_dev->poll_pipe_index,
            /* Callback when data arrives. */
-           usb_hid_polling_callback,
+           hid_dev->poll_callback,
            /* How much data to request. */
-           dev->pipes[USB_HID_POLL_EP_NO].pipe->max_packet_size,
+           dev->pipes[hid_dev->poll_pipe_index].pipe->max_packet_size,
            /* Callback when the polling ends. */
            usb_hid_polling_ended_callback,
            /* Custom argument. */
-           NULL);
+           hid_dev);
         
         
@@ -157 +156 @@
                 return rc;
         }
-
-        (void)hid_ops;
 
         /*
@@ -183 +180 @@
         if (dev->interface_no < 0) {
                 usb_log_warning("Device is not a supported HID device.\n");
-                usb_log_error("Failed to add HID device: endpoint not found."
+                usb_log_error("Failed to add HID device: endpoints not found."
                     "\n");
                 return ENOTSUP;