Changeset 7aaed09 in mainline for uspace/drv/bus/usb/usbhid/main.c

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/drv/bus/usb/usbhid/main.c

@@ -49 +49 @@
 
 /**
- * Function for adding a new device of type USB/HID/keyboard.
+ * Callback for passing a new device to the driver.
  *
- * This functions initializes required structures from the device's descriptors
- * and starts new fibril for polling the keyboard for events and another one for
- * handling auto-repeat of keys.
+ * @note Currently, only boot-protocol keyboards are supported by this driver.
  *
- * During initialization, the keyboard is switched into boot protocol, the idle
- * rate is set to 0 (infinity), resulting in the keyboard only reporting event
- * when a key is pressed or released. Finally, the LED lights are turned on 
- * according to the default setup of lock keys.
- *
- * @note By default, the keyboards is initialized with Num Lock turned on and 
- *       other locks turned off.
- * @note Currently supports only boot-protocol keyboards.
- *
- * @param dev Device to add.
+ * @param dev Structure representing the new device.
  * @return Error code.
  */
-static int usb_hid_try_add_device(usb_device_t *dev)
+static int usb_hid_device_add(usb_device_t *dev)
 {
-        assert(dev != NULL);
+        usb_log_debug("%s\n", __FUNCTION__);
 
-        /* Initialize device (get and process descriptors, get address, etc.) */
-        usb_log_debug("Initializing USB/HID device...\n");
+        if (dev == NULL) {
+                usb_log_error("Wrong parameter given for add_device().\n");
+                return EINVAL;
+        }
 
+        if (dev->interface_no < 0) {
+                usb_log_error("Failed to add HID device: endpoints not found."
+                    "\n");
+                return ENOTSUP;
+        }
         usb_hid_dev_t *hid_dev =
             usb_device_data_alloc(dev, sizeof(usb_hid_dev_t));
         if (hid_dev == NULL) {
-                usb_log_error("Error while creating USB/HID device "
-                    "structure.\n");
+                usb_log_error("Failed to create 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");
@@ -92 +86 @@
         usb_log_debug("USB/HID device structure initialized.\n");
 
-        /*
-         * 1) subdriver vytvori vlastnu ddf_fun, vlastne ddf_dev_ops, ktore da
-         *    do nej.
-         * 2) do tych ops do .interfaces[DEV_IFACE_USBHID (asi)] priradi 
-         *    vyplnenu strukturu usbhid_iface_t.
-         * 3) klientska aplikacia - musi si rucne vytvorit telefon
-         *    (devman_device_connect() - cesta k zariadeniu (/hw/pci0/...) az 
-         *    k tej fcii.
-         *    pouzit usb/classes/hid/iface.h - prvy int je telefon
-         */
-
         /* Start automated polling function.
          * This will create a separate fibril that will query the device
-         * for the data continuously 
-         */
+         * for the data continuously. */
        rc = usb_device_auto_poll(dev,
            /* Index of the polling pipe. */
@@ -113 +95 @@
            usb_hid_polling_callback,
            /* How much data to request. */
-           dev->pipes[hid_dev->poll_pipe_index].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,
@@ -126 +108 @@
         }
         hid_dev->running = true;
-
-        /*
-         * Hurrah, device is initialized.
-         */
-        return EOK;
-}
-/*----------------------------------------------------------------------------*/
-/**
- * Callback for passing a new device to the driver.
- *
- * @note Currently, only boot-protocol keyboards are supported by this driver.
- *
- * @param dev Structure representing the new device.
- * @return Error code.
- */
-static int usb_hid_device_add(usb_device_t *dev)
-{
-        usb_log_debug("usb_hid_device_add()\n");
-
-        if (dev == NULL) {
-                usb_log_warning("Wrong parameter given for add_device().\n");
-                return EINVAL;
-        }
-
-        if (dev->interface_no < 0) {
-                usb_log_warning("Device is not a supported HID device.\n");
-                usb_log_error("Failed to add HID device: endpoints not found."
-                    "\n");
-                return ENOTSUP;
-        }
-
-        int rc = usb_hid_try_add_device(dev);
-
-        if (rc != EOK) {
-                usb_log_warning("Device is not a supported HID device.\n");
-                usb_log_error("Failed to add HID device: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
 
         usb_log_info("HID device `%s' ready to use.\n", dev->ddf_dev->name);
@@ -179 +122 @@
 static int usb_hid_device_rem(usb_device_t *dev)
 {
-        return EOK;
+        // TODO: Stop device polling
+        // TODO: Call deinit (stops autorepeat too)
+        return ENOTSUP;
 }
 /*----------------------------------------------------------------------------*/
@@ -190 +135 @@
 static int usb_hid_device_gone(usb_device_t *dev)
 {
+        assert(dev);
+        assert(dev->driver_data);
         usb_hid_dev_t *hid_dev = dev->driver_data;
-        unsigned tries = 10;
-        while (hid_dev->running) {
+        unsigned tries = 100;
+        /* Wait for fail. */
+        while (hid_dev->running && tries--) {
                 async_usleep(100000);
-                if (!tries--) {
-                        usb_log_error("Can't remove hub, still running.\n");
-                        return EBUSY;
-                }
+        }
+        if (hid_dev->running) {
+                usb_log_error("Can't remove hid, still running.\n");
+                return EBUSY;
         }
 
-        assert(!hid_dev->running);
         usb_hid_deinit(hid_dev);
         usb_log_debug2("%s destruction complete.\n", dev->ddf_dev->name);