Changeset fa48ebe in mainline for uspace/lib

Timestamp:

2011-02-18T16:08:12Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1dde2eb1

Parents:

735eac3

Message:

New device's speed uses enum

Location:

uspace/lib

Files:

• drv/generic/remote_usbhc.c (modified) (2 diffs)
• drv/include/usbhc_iface.h (modified) (1 diff)
• usb/include/usb/hub.h (modified) (1 diff)
• usb/src/hub.c (modified) (4 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -164 +164 @@
         }
         
-        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);
@@ -196 +196 @@
         }
         
-        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);

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

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

uspace/lib/usb/src/hub.c

@@ -56 +56 @@
  */
 int usb_hc_reserve_default_address(usb_hc_connection_t *connection,
-    bool full_speed)
+    usb_speed_t speed)
 {
         CHECK_CONNECTION(connection);
@@ -62 +62 @@
         return async_req_2_0(connection->hc_phone,
             DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS, full_speed);
+            IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS, speed);
 }
 
@@ -85 +85 @@
  */
 usb_address_t usb_hc_request_address(usb_hc_connection_t *connection,
-    bool full_speed)
+    usb_speed_t speed)
 {
         CHECK_CONNECTION(connection);
@@ -92 +92 @@
         int rc = async_req_2_1(connection->hc_phone,
             DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_REQUEST_ADDRESS, full_speed,
+            IPC_M_USBHC_REQUEST_ADDRESS, speed,
             &address);
         if (rc != EOK) {