Changeset b6c7da6 in mainline for uspace/lib/drv

Timestamp:

2011-02-18T19:49:57Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

374552ef, 867e6735

Parents:

0c00dac (diff), 026d6e2 (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 speed sending during new device discovery

Location:

uspace/lib/drv

Files:

• generic/remote_usbhc.c (modified) (2 diffs)
• include/usbhc_iface.h (modified) (1 diff)

uspace/lib/drv/generic/remote_usbhc.c

@@ -166 +166 @@
         }
         
-        bool full_speed = DEV_IPC_GET_ARG1(*call);
+        usb_speed_t speed = DEV_IPC_GET_ARG1(*call);
         
-        int rc = usb_iface->reserve_default_address(device, full_speed);
+        int rc = usb_iface->reserve_default_address(device, speed);
 
         async_answer_0(callid, rc);
@@ -198 +198 @@
         }
         
-        bool full_speed = DEV_IPC_GET_ARG1(*call);
+        usb_speed_t speed = DEV_IPC_GET_ARG1(*call);
 
         usb_address_t address;
-        int rc = usb_iface->request_address(device, full_speed, &address);
+        int rc = usb_iface->request_address(device, speed, &address);
         if (rc != EOK) {
                 async_answer_0(callid, rc);

uspace/lib/drv/include/usbhc_iface.h

@@ -232 +232 @@
         int (*tell_address)(device_t *, devman_handle_t, usb_address_t *);
 
-        int (*reserve_default_address)(device_t *, bool);
+        int (*reserve_default_address)(device_t *, usb_speed_t);
         int (*release_default_address)(device_t *);
-        int (*request_address)(device_t *, bool, usb_address_t *);
+        int (*request_address)(device_t *, usb_speed_t, usb_address_t *);
         int (*bind_address)(device_t *, usb_address_t, devman_handle_t);
         int (*release_address)(device_t *, usb_address_t);