Changeset 1998bcd in mainline for uspace/lib/drv

Timestamp:

2011-04-08T22:25:00Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

98064795

Parents:

297341b

Message:

Endpoint registration sends address as well

This is the first step towards using endpoint registration instead
of reservation of default address.

Location:

uspace/lib/drv

Files:

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

uspace/lib/drv/generic/remote_usbhc.c

@@ -533 +533 @@
         }
 
-#define INIT_FROM_HIGH_DATA(type, var, arg_no) \
-        type var = (type) DEV_IPC_GET_ARG##arg_no(*call) / 256
-#define INIT_FROM_LOW_DATA(type, var, arg_no) \
-        type var = (type) DEV_IPC_GET_ARG##arg_no(*call) % 256
-
-        INIT_FROM_HIGH_DATA(usb_address_t, address, 1);
-        INIT_FROM_LOW_DATA(usb_endpoint_t, endpoint, 1);
-        INIT_FROM_HIGH_DATA(usb_transfer_type_t, transfer_type, 2);
-        INIT_FROM_LOW_DATA(usb_direction_t, direction, 2);
-
-#undef INIT_FROM_HIGH_DATA
-#undef INIT_FROM_LOW_DATA
-
-        size_t max_packet_size = (size_t) DEV_IPC_GET_ARG3(*call);
-        unsigned int interval  = (unsigned int) DEV_IPC_GET_ARG4(*call);
-
-        int rc = usb_iface->register_endpoint(fun, address, endpoint,
+#define _INIT_FROM_HIGH_DATA2(type, var, arg_no) \
+        type var = (type) DEV_IPC_GET_ARG##arg_no(*call) / (1 << 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)
+
+        _INIT_FROM_HIGH_DATA2(usb_address_t, address, 1);
+        _INIT_FROM_LOW_DATA2(usb_endpoint_t, endpoint, 1);
+
+        _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(size_t, max_packet_size, 3);
+        _INIT_FROM_LOW_DATA2(unsigned int, interval, 3);
+
+#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, address, speed, endpoint,
             transfer_type, direction, max_packet_size, interval);
 

uspace/lib/drv/include/usbhc_iface.h

@@ -168 +168 @@
         /** Register endpoint attributes at host controller.
          * This is used to reserve portion of USB bandwidth.
+         * When speed is invalid, speed of the device is used.
          * Parameters:
-         * - USB address + endpoint number (ADDR * 256 + EP)
-         * - transfer type + direction (TYPE * 256 + DIR)
-         * - maximum packet size
-         * - interval (in milliseconds)
+         * - USB address + endpoint number
+         *   - packed as ADDR << 16 + EP
+         * - speed + transfer type + direction
+         *   - packed as ( SPEED << 8 + TYPE ) << 8 + DIR
+         * - maximum packet size + interval (in milliseconds)
+         *   - packed as MPS << 16 + INT
          * Answer:
          * - EOK - reservation successful
@@ -221 +224 @@
         int (*release_address)(ddf_fun_t *, usb_address_t);
 
-        int (*register_endpoint)(ddf_fun_t *, usb_address_t, usb_endpoint_t,
+        int (*register_endpoint)(ddf_fun_t *,
+            usb_address_t, usb_speed_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,