Changeset c48f6ab in mainline for uspace/lib/usbdev/src/hub.c

Timestamp:

2011-11-30T20:14:37Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1f5c9c96

Parents:

fb48a0e (diff), f9776ae5 (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:

USB branch

Mostly cleanups.

File:

• uspace/lib/usbdev/src/hub.c (modified) (5 diffs)

uspace/lib/usbdev/src/hub.c

@@ -76 +76 @@
 {
         CHECK_CONNECTION(connection);
-        
+
         async_exch_t *exch = async_exchange_begin(connection->hc_sess);
-        
-        sysarg_t address;
-        int rc = async_req_4_1(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_REQUEST_ADDRESS, preferred, strict, speed, &address);
-        
+        if (!exch)
+                return (usb_address_t)ENOMEM;
+
+        usb_address_t address = preferred;
+        const int ret = usbhc_request_address(exch, &address, strict, speed);
+
         async_exchange_end(exch);
-        
-        if (rc != EOK)
-                return (usb_address_t) rc;
-        
-        return (usb_address_t) address;
+        return ret == EOK ? address : ret;
 }
 
@@ -97 +94 @@
  * @return Error code.
  */
-int usb_hc_register_device(usb_hc_connection_t * connection,
+int usb_hc_register_device(usb_hc_connection_t *connection,
     const usb_hub_attached_device_t *attached_device)
 {
         CHECK_CONNECTION(connection);
-        
-        if (attached_device == NULL)
-                return EBADMEM;
-        
+        if (attached_device == NULL || attached_device->fun == NULL)
+                return EINVAL;
+
         async_exch_t *exch = async_exchange_begin(connection->hc_sess);
-        int rc = async_req_3_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_BIND_ADDRESS,
+        if (!exch)
+                return ENOMEM;
+        const int ret = usbhc_bind_address(exch,
             attached_device->address, attached_device->fun->handle);
         async_exchange_end(exch);
-        
-        return rc;
+
+        return ret;
 }
 
@@ -124 +121 @@
 {
         CHECK_CONNECTION(connection);
-        
+
         async_exch_t *exch = async_exchange_begin(connection->hc_sess);
-        int rc = async_req_2_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_RELEASE_ADDRESS, address);
+        if (!exch)
+                return ENOMEM;
+        const int ret = usbhc_release_address(exch, address);
         async_exchange_end(exch);
-        
-        return rc;
+
+        return ret;
 }
 
@@ -221 +219 @@
  *      request or requests for descriptors when creating match ids).
  */
-int usb_hc_new_device_wrapper(ddf_dev_t *parent, usb_hc_connection_t *connection,
-    usb_speed_t dev_speed,
+int usb_hc_new_device_wrapper(ddf_dev_t *parent,
+    usb_hc_connection_t *connection, usb_speed_t dev_speed,
     int (*enable_port)(void *arg), void *arg, usb_address_t *assigned_address,
     ddf_dev_ops_t *dev_ops, void *new_dev_data, ddf_fun_t **new_fun)
@@ -229 +227 @@
                 return EINVAL;
 
-        // FIXME: this is awful, we are accessing directly the structure.
         // TODO: Why not use provided connection?
-        usb_hc_connection_t hc_conn = {
-                .hc_handle = connection->hc_handle,
-                .hc_sess = NULL
-        };
+        usb_hc_connection_t hc_conn;
+        usb_hc_connection_initialize(&hc_conn, connection->hc_handle);
 
         int rc;