Changeset 4317827 in mainline for uspace/lib

Timestamp:

2010-12-04T14:00:41Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

36c410e

Parents:

62c9661

Message:

USB hub driver in separate task

The commit only includes changes necessary to get working (i.e. appearing
under /dev/devices) hub and VHC.

Clean-up will come later.

Location:

uspace/lib/usb

Files:

• Makefile (modified) (1 diff)
• include/usb/hcdhubd.h (modified) (1 diff)
• src/hcdhubd.c (modified) (2 diffs)
• src/hcdhubd_private.h (modified) (1 diff)
• src/hcdrv.c (modified) (2 diffs)

uspace/lib/usb/Makefile

@@ -35 +35 @@
         src/hcdhubd.c \
         src/hcdrv.c \
-        src/hubdrv.c \
         src/localdrv.c \
         src/remotedrv.c \

uspace/lib/usb/include/usb/hcdhubd.h

@@ -146 +146 @@
 
 int usb_hcd_main(usb_hc_driver_t *);
-int usb_hcd_add_root_hub(usb_hc_device_t *dev);
+int usb_hcd_add_root_hub(device_t *dev);
 
 

uspace/lib/usb/src/hcdhubd.c

@@ -51 +51 @@
  */
 static int add_device(device_t *dev) {
-        bool is_hc = str_cmp(dev->name, USB_HUB_DEVICE_NAME) != 0;
-        printf("%s: add_device(name=\"%s\")\n", hc_driver->name, dev->name);
-
-        if (is_hc) {
-                /*
-                 * We are the HC itself.
-                 */
-                return usb_add_hc_device(dev);
-        } else {
-                /*
-                 * We are some (maybe deeply nested) hub.
-                 * Thus, assign our own operations and explore already
-                 * connected devices.
-                 */
-                return usb_add_hub_device(dev);
-        }
+        return ENOTSUP;
 }
 
@@ -105 +90 @@
  * @return Error code.
  */
-int usb_hcd_add_root_hub(usb_hc_device_t *dev)
+int usb_hcd_add_root_hub(device_t *dev)
 {
         char *id;
-        int rc = asprintf(&id, "usb&hc=%s&hub", hc_driver->name);
+        int rc = asprintf(&id, "usb&hub");
         if (rc <= 0) {
                 return rc;
         }
 
-        rc = usb_hc_add_child_device(dev->generic, USB_HUB_DEVICE_NAME, id, true);
+        rc = usb_hc_add_child_device(dev, USB_HUB_DEVICE_NAME, id, true);
         if (rc != EOK) {
                 free(id);

uspace/lib/usb/src/hcdhubd_private.h

@@ -46 +46 @@
 usb_address_t usb_get_address_by_handle(devman_handle_t);
 int usb_add_hc_device(device_t *);
-int usb_add_hub_device(device_t *);
 
 #endif

uspace/lib/usb/src/hcdrv.c

@@ -47 +47 @@
 LIST_INITIALIZE(hc_list);
 
+/* Fake driver to have the name item initialized. */
+static usb_hc_driver_t hc_driver_fake = {
+        .name = "HCD",
+};
+
 /** Our HC driver. */
-usb_hc_driver_t *hc_driver = NULL;
+usb_hc_driver_t *hc_driver = &hc_driver_fake;
 
 static device_ops_t usb_device_ops = {
@@ -71 +76 @@
 int usb_add_hc_device(device_t *dev)
 {
+        return ENOTSUP;
         usb_hc_device_t *hc_dev = usb_hc_device_create(dev);