Changeset df6ded8 in mainline for uspace/drv/hid/usbhid/main.c

Timestamp:

2018-02-28T16:37:50Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (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.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

File:

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

uspace/drv/hid/usbhid/main.c

@@ -2 +2 @@
  * Copyright (c) 2010 Vojtech Horky
  * Copyright (c) 2011 Lubos Slovak
+ * Copyright (c) 2018 Petr Manek, Ondrej Hlavaty
  * All rights reserved.
  *
@@ -58 +59 @@
 static errno_t usb_hid_device_add(usb_device_t *dev)
 {
-        usb_log_debug("%s\n", __FUNCTION__);
+        usb_log_debug("%s", __FUNCTION__);
 
         if (dev == NULL) {
-                usb_log_error("Wrong parameter given for add_device().\n");
+                usb_log_error("Wrong parameter given for add_device().");
                 return EINVAL;
         }
@@ -73 +74 @@
             usb_device_data_alloc(dev, sizeof(usb_hid_dev_t));
         if (hid_dev == NULL) {
-                usb_log_error("Failed to create USB/HID device structure.\n");
+                usb_log_error("Failed to create USB/HID device structure.");
                 return ENOMEM;
         }
@@ -79 +80 @@
         errno_t rc = usb_hid_init(hid_dev, dev);
         if (rc != EOK) {
-                usb_log_error("Failed to initialize USB/HID device.\n");
+                usb_log_error("Failed to initialize USB/HID device.");
                 usb_hid_deinit(hid_dev);
                 return rc;
         }
 
-        usb_log_debug("USB/HID device structure initialized.\n");
+        usb_log_debug("USB/HID device structure initialized.");
 
         /* Start automated polling function.
          * This will create a separate fibril that will query the device
          * for the data continuously. */
-        rc = usb_device_auto_poll_desc(dev,
-           /* Index of the polling pipe. */
-           hid_dev->poll_pipe_mapping->description,
-           /* Callback when data arrives. */
-           usb_hid_polling_callback,
-           /* How much data to request. */
-           hid_dev->poll_pipe_mapping->pipe.max_packet_size,
-           /* Delay */
-           -1,
-           /* Callback when the polling ends. */
-           usb_hid_polling_ended_callback,
-           /* Custom argument. */
-           hid_dev);
+        rc = usb_polling_start(&hid_dev->polling);
 
         if (rc != EOK) {
-                usb_log_error("Failed to start polling fibril for `%s'.\n",
+                usb_log_error("Failed to start polling fibril for `%s'.",
                     usb_device_get_name(dev));
                 usb_hid_deinit(hid_dev);
@@ -111 +100 @@
         hid_dev->running = true;
 
-        usb_log_info("HID device `%s' ready.\n", usb_device_get_name(dev));
+        usb_log_info("HID device `%s' ready.", usb_device_get_name(dev));
+
+        return EOK;
+}
+
+static errno_t join_and_clean(usb_device_t *dev)
+{
+        assert(dev);
+        usb_hid_dev_t *hid_dev = usb_device_data_get(dev);
+        assert(hid_dev);
+
+        /* Join polling fibril (ignoring error code). */
+        usb_polling_join(&hid_dev->polling);
+
+        /* Clean up. */
+        usb_hid_deinit(hid_dev);
+        usb_log_info("%s destruction complete.", usb_device_get_name(dev));
 
         return EOK;
@@ -122 +127 @@
  * @return Error code.
  */
-static errno_t usb_hid_device_rem(usb_device_t *dev)
+static errno_t usb_hid_device_remove(usb_device_t *dev)
 {
-        // TODO: Stop device polling
-        // TODO: Call deinit (stops autorepeat too)
-        return ENOTSUP;
+        assert(dev);
+        usb_hid_dev_t *hid_dev = usb_device_data_get(dev);
+        assert(hid_dev);
+
+        usb_log_info("Device %s removed.", usb_device_get_name(dev));
+        return join_and_clean(dev);
 }
 
@@ -140 +148 @@
         usb_hid_dev_t *hid_dev = usb_device_data_get(dev);
         assert(hid_dev);
-        unsigned tries = 100;
-        /* Wait for fail. */
-        while (hid_dev->running && tries--) {
-                async_usleep(100000);
-        }
-        if (hid_dev->running) {
-                usb_log_error("Can't remove hid, still running.\n");
-                return EBUSY;
-        }
 
-        usb_hid_deinit(hid_dev);
-        usb_log_debug2("%s destruction complete.\n", usb_device_get_name(dev));
-        return EOK;
+        usb_log_info("Device %s gone.", usb_device_get_name(dev));
+        return join_and_clean(dev);
 }
 
@@ -158 +156 @@
 static const usb_driver_ops_t usb_hid_driver_ops = {
         .device_add = usb_hid_device_add,
-        .device_rem = usb_hid_device_rem,
+        .device_remove = usb_hid_device_remove,
         .device_gone = usb_hid_device_gone,
 };