Changeset 54b141a in mainline for uspace/lib/usb/src

Timestamp:

2010-12-04T17:01:24Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e28d228

Parents:

2cb6571 (diff), ad104e0 (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 with vojtechhorky/

Location:

uspace/lib/usb/src

Files:

• hcdhubd.c (modified) (2 diffs)
• hcdhubd_private.h (modified) (1 diff)
• hcdrv.c (modified) (2 diffs)
• usbdrv.c (modified) (1 diff)

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 *);
 
 /** lowest allowed usb address */

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;
 
 int usb_lowest_address = 1;
@@ -86 +91 @@
 int usb_add_hc_device(device_t *dev)
 {
+        return ENOTSUP;
         usb_hc_device_t *hc_dev = usb_hc_device_create(dev);
 

uspace/lib/usb/src/usbdrv.c

@@ -100 +100 @@
 }
 
+/** Tell HC to reserve default address.
+ *
+ * @param phone Open phone to host controller driver.
+ * @return Error code.
+ */
+int usb_drv_reserve_default_address(int phone)
+{
+        return async_req_0_0(phone, IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS);
+}
+
+/** Tell HC to release default address.
+ *
+ * @param phone Open phone to host controller driver.
+ * @return Error code.
+ */
+int usb_drv_release_default_address(int phone)
+{
+        return async_req_0_0(phone, IPC_M_USBHC_RELEASE_DEFAULT_ADDRESS);
+}
+
+/** Ask HC for free address assignment.
+ *
+ * @param phone Open phone to host controller driver.
+ * @return Assigned USB address or negative error code.
+ */
+usb_address_t usb_drv_request_address(int phone)
+{
+        ipcarg_t address;
+        int rc = async_req_0_1(phone, IPC_M_USBHC_REQUEST_ADDRESS, &address);
+        if (rc != EOK) {
+                return rc;
+        } else {
+                return (usb_address_t) address;
+        }
+}
+
+/** Inform HC about address release.
+ *
+ * @param phone Open phone to host controller driver.
+ * @param address Address to be released.
+ * @return Error code.
+ */
+int usb_drv_release_address(int phone, usb_address_t address)
+{
+        return async_req_1_0(phone, IPC_M_USBHC_RELEASE_ADDRESS, address);
+}
+
 /** Send data to HCD.
  *