Changeset 747ef72 in mainline for uspace/lib/drv

Timestamp:

2011-11-10T11:29:10Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

54464f6a, c2245a3, c6f189f7

Parents:

2e1b9dc (diff), 2d1ba51 (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 USB changes.

Interface changes:

• GET_ADDRESS has been renamed to GET_MY_ADDRESS and the handle parameter was dropped. Tis call no longer cascades up to the root hub, but it is answered in the first place the information is available (nearest hub)
• Reintroduced address reservation for USB_DEFAULT_ADDRESS. The interface now enables device drivers to request specific address on initialization and either insists on that address or accept any other if the address is not available. Note that it is not possible to get the default address if the driver does not insist.
• Any endpoint registered is removed when address is released and a warning is produced if there were any such endpoints.
• It is no longer necessary or possible to pass device speed information when registering endpoints.

Driver fixes: memory leaks and crashes (not only) in error paths.
Fixes or removes flaky device_remove implementation in device drivers.

Location:

uspace/lib/drv

Files:

• generic/remote_usb.c (modified) (3 diffs)
• generic/remote_usbhc.c (modified) (4 diffs)
• include/usb_iface.h (modified) (2 diffs)
• include/usbhc_iface.h (modified) (2 diffs)

uspace/lib/drv/generic/remote_usb.c

@@ -40 +40 @@
 
 
-static void remote_usb_get_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usb_get_my_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usb_get_interface(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usb_get_hc_handle(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -47 +47 @@
 /** Remote USB interface operations. */
 static remote_iface_func_ptr_t remote_usb_iface_ops [] = {
-        remote_usb_get_address,
-        remote_usb_get_interface,
-        remote_usb_get_hc_handle
+        [IPC_M_USB_GET_MY_ADDRESS] = remote_usb_get_my_address,
+        [IPC_M_USB_GET_INTERFACE] = remote_usb_get_interface,
+        [IPC_M_USB_GET_HOST_CONTROLLER_HANDLE] = remote_usb_get_hc_handle,
 };
 
@@ -61 +61 @@
 
 
-void remote_usb_get_address(ddf_fun_t *fun, void *iface,
+void remote_usb_get_my_address(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
 {
         usb_iface_t *usb_iface = (usb_iface_t *) iface;
 
-        if (usb_iface->get_address == NULL) {
+        if (usb_iface->get_my_address == NULL) {
                 async_answer_0(callid, ENOTSUP);
                 return;
         }
 
-        devman_handle_t handle = DEV_IPC_GET_ARG1(*call);
-
         usb_address_t address;
-        int rc = usb_iface->get_address(fun, handle, &address);
+        int rc = usb_iface->get_my_address(fun, &address);
         if (rc != EOK) {
                 async_answer_0(callid, rc);

uspace/lib/drv/generic/remote_usbhc.c

@@ -55 +55 @@
 static remote_iface_func_ptr_t remote_usbhc_iface_ops[] = {
         [IPC_M_USBHC_REQUEST_ADDRESS] = remote_usbhc_request_address,
+        [IPC_M_USBHC_RELEASE_ADDRESS] = remote_usbhc_release_address,
         [IPC_M_USBHC_BIND_ADDRESS] = remote_usbhc_bind_address,
         [IPC_M_USBHC_GET_HANDLE_BY_ADDRESS] = remote_usbhc_find_by_address,
-        [IPC_M_USBHC_RELEASE_ADDRESS] = remote_usbhc_release_address,
 
         [IPC_M_USBHC_REGISTER_ENDPOINT] = remote_usbhc_register_endpoint,
@@ -118 +118 @@
         }
 
-        usb_speed_t speed = DEV_IPC_GET_ARG1(*call);
-
-        usb_address_t address;
-        int rc = usb_iface->request_address(fun, speed, &address);
+        usb_address_t address = DEV_IPC_GET_ARG1(*call);
+        const bool strict = DEV_IPC_GET_ARG2(*call);
+        const usb_speed_t speed = DEV_IPC_GET_ARG3(*call);
+
+        const int rc = usb_iface->request_address(fun, &address, strict, speed);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -233 +234 @@
 
 #define _INIT_FROM_HIGH_DATA2(type, var, arg_no) \
-        type var = (type) DEV_IPC_GET_ARG##arg_no(*call) / (1 << 16)
+        type var = (type) (DEV_IPC_GET_ARG##arg_no(*call) >> 16)
 #define _INIT_FROM_LOW_DATA2(type, var, arg_no) \
-        type var = (type) DEV_IPC_GET_ARG##arg_no(*call) % (1 << 16)
-#define _INIT_FROM_HIGH_DATA3(type, var, arg_no) \
-        type var = (type) DEV_IPC_GET_ARG##arg_no(*call) / (1 << 16)
-#define _INIT_FROM_MIDDLE_DATA3(type, var, arg_no) \
-        type var = (type) (DEV_IPC_GET_ARG##arg_no(*call) / (1 << 8)) % (1 << 8)
-#define _INIT_FROM_LOW_DATA3(type, var, arg_no) \
-        type var = (type) DEV_IPC_GET_ARG##arg_no(*call) % (1 << 8)
+        type var = (type) (DEV_IPC_GET_ARG##arg_no(*call) & 0xffff)
 
         const usb_target_t target = { .packed = DEV_IPC_GET_ARG1(*call) };
 
-        _INIT_FROM_HIGH_DATA3(usb_speed_t, speed, 2);
-        _INIT_FROM_MIDDLE_DATA3(usb_transfer_type_t, transfer_type, 2);
-        _INIT_FROM_LOW_DATA3(usb_direction_t, direction, 2);
+        _INIT_FROM_HIGH_DATA2(usb_transfer_type_t, transfer_type, 2);
+        _INIT_FROM_LOW_DATA2(usb_direction_t, direction, 2);
 
         _INIT_FROM_HIGH_DATA2(size_t, max_packet_size, 3);
@@ -254 +248 @@
 #undef _INIT_FROM_HIGH_DATA2
 #undef _INIT_FROM_LOW_DATA2
-#undef _INIT_FROM_HIGH_DATA3
-#undef _INIT_FROM_MIDDLE_DATA3
-#undef _INIT_FROM_LOW_DATA3
-
-        int rc = usb_iface->register_endpoint(fun, target.address, speed,
+
+        int rc = usb_iface->register_endpoint(fun, target.address,
             target.endpoint, transfer_type, direction, max_packet_size, interval);
 

uspace/lib/drv/include/usb_iface.h

@@ -65 +65 @@
          * handle must be resolved by its parent.
          */
-        IPC_M_USB_GET_ADDRESS,
+        IPC_M_USB_GET_MY_ADDRESS,
 
         /** Tell interface number given device can use.
@@ -90 +90 @@
 /** USB device communication interface. */
 typedef struct {
-        int (*get_address)(ddf_fun_t *, devman_handle_t, usb_address_t *);
+        int (*get_my_address)(ddf_fun_t *, usb_address_t *);
         int (*get_interface)(ddf_fun_t *, devman_handle_t, int *);
         int (*get_hc_handle)(ddf_fun_t *, devman_handle_t *);

uspace/lib/drv/include/usbhc_iface.h

@@ -170 +170 @@
 /** USB host controller communication interface. */
 typedef struct {
-        int (*request_address)(ddf_fun_t *, usb_speed_t, usb_address_t *);
+        int (*request_address)(ddf_fun_t *, usb_address_t *, bool, usb_speed_t);
         int (*bind_address)(ddf_fun_t *, usb_address_t, devman_handle_t);
         int (*find_by_address)(ddf_fun_t *, usb_address_t, devman_handle_t *);
@@ -176 +176 @@
 
         int (*register_endpoint)(ddf_fun_t *,
-            usb_address_t, usb_speed_t, usb_endpoint_t,
+            usb_address_t, usb_endpoint_t,
             usb_transfer_type_t, usb_direction_t, size_t, unsigned int);
         int (*unregister_endpoint)(ddf_fun_t *, usb_address_t, usb_endpoint_t,