Changeset 0c00dac in mainline

Timestamp:

2011-02-18T13:36:52Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

026d6e2, 50ba203, b6c7da6

Parents:

ec59693 (diff), 6427cf67 (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 low/high speed hack

Location:

uspace

Files:

• drv/uhci-hcd/iface.c (modified) (2 diffs)
• drv/uhci-rhd/port.c (modified) (2 diffs)
• drv/vhc/connhost.c (modified) (2 diffs)
• lib/drv/generic/remote_usbhc.c (modified) (2 diffs)
• lib/drv/include/usbhc_iface.h (modified) (2 diffs)
• lib/usb/include/usb/hub.h (modified) (1 diff)
• lib/usb/src/hub.c (modified) (2 diffs)

uspace/drv/uhci-hcd/iface.c

@@ -54 +54 @@
 }
 /*----------------------------------------------------------------------------*/
-static int reserve_default_address(device_t *dev)
+static int reserve_default_address(device_t *dev, bool full_speed)
 {
         assert(dev);
@@ -72 +72 @@
 }
 /*----------------------------------------------------------------------------*/
-static int request_address(device_t *dev, usb_address_t *address)
+static int request_address(device_t *dev, bool full_speed,
+    usb_address_t *address)
 {
         assert(dev);

uspace/drv/uhci-rhd/port.c

@@ -140 +140 @@
 
         /* get address of the future device */
-        const usb_address_t usb_address = usb_hc_request_address(&port->hc_connection);
+        const usb_address_t usb_address = usb_hc_request_address(
+            &port->hc_connection, true);
 
         if (usb_address <= 0) {
@@ -150 +151 @@
 
         /* get default address */
-        int ret = usb_hc_reserve_default_address(&port->hc_connection);
+        int ret = usb_hc_reserve_default_address(&port->hc_connection, true);
         if (ret != EOK) {
                 usb_log_error("Failed to reserve default address on port %d.\n",

uspace/drv/vhc/connhost.c

@@ -390 +390 @@
 
 
-static int reserve_default_address(device_t *dev)
+static int reserve_default_address(device_t *dev, bool ignored)
 {
         usb_address_keeping_reserve_default(&addresses);
@@ -402 +402 @@
 }
 
-static int request_address(device_t *dev, usb_address_t *address)
+static int request_address(device_t *dev, bool ignored, usb_address_t *address)
 {
         usb_address_t addr = usb_address_keeping_request(&addresses);

uspace/lib/drv/generic/remote_usbhc.c

@@ -165 +165 @@
                 return;
         }
-
-        int rc = usb_iface->reserve_default_address(device);
+        
+        bool full_speed = DEV_IPC_GET_ARG1(*call);
+        
+        int rc = usb_iface->reserve_default_address(device, full_speed);
 
         async_answer_0(callid, rc);
@@ -195 +197 @@
                 return;
         }
+        
+        bool full_speed = DEV_IPC_GET_ARG1(*call);
 
         usb_address_t address;
-        int rc = usb_iface->request_address(device, &address);
+        int rc = usb_iface->request_address(device, full_speed, &address);
         if (rc != EOK) {
                 async_answer_0(callid, rc);

uspace/lib/drv/include/usbhc_iface.h

@@ -40 +40 @@
 #include "driver.h"
 #include <usb/usb.h>
+#include <bool.h>
 
 
@@ -231 +232 @@
         int (*tell_address)(device_t *, devman_handle_t, usb_address_t *);
 
-        int (*reserve_default_address)(device_t *);
+        int (*reserve_default_address)(device_t *, bool);
         int (*release_default_address)(device_t *);
-        int (*request_address)(device_t *, usb_address_t *);
+        int (*request_address)(device_t *, bool, usb_address_t *);
         int (*bind_address)(device_t *, usb_address_t, devman_handle_t);
         int (*release_address)(device_t *, usb_address_t);

uspace/lib/usb/include/usb/hub.h

@@ -52 +52 @@
 } usb_hc_attached_device_t;
 
-int usb_hc_reserve_default_address(usb_hc_connection_t *);
+int usb_hc_reserve_default_address(usb_hc_connection_t *, bool);
 int usb_hc_release_default_address(usb_hc_connection_t *);
 
-usb_address_t usb_hc_request_address(usb_hc_connection_t *);
+usb_address_t usb_hc_request_address(usb_hc_connection_t *, bool);
 int usb_hc_register_device(usb_hc_connection_t *,
     const usb_hc_attached_device_t *);

uspace/lib/usb/src/hub.c

@@ -55 +55 @@
  * @return Error code.
  */
-int usb_hc_reserve_default_address(usb_hc_connection_t *connection)
+int usb_hc_reserve_default_address(usb_hc_connection_t *connection,
+    bool full_speed)
 {
         CHECK_CONNECTION(connection);
 
-        return async_req_1_0(connection->hc_phone,
+        return async_req_2_0(connection->hc_phone,
             DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS);
+            IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS, full_speed);
 }
 
@@ -83 +84 @@
  * @return Assigned USB address or negative error code.
  */
-usb_address_t usb_hc_request_address(usb_hc_connection_t *connection)
+usb_address_t usb_hc_request_address(usb_hc_connection_t *connection,
+    bool full_speed)
 {
         CHECK_CONNECTION(connection);
 
         sysarg_t address;
-        int rc = async_req_1_1(connection->hc_phone,
+        int rc = async_req_2_1(connection->hc_phone,
             DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_REQUEST_ADDRESS, &address);
+            IPC_M_USBHC_REQUEST_ADDRESS, full_speed,
+            &address);
         if (rc != EOK) {
                 return (usb_address_t) rc;