Changeset a9d67aa in mainline for uspace/lib/usb/src/pipesinit.c

Timestamp:

2011-04-09T17:15:28Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

97e7e8a

Parents:

5410c04 (diff), 77223f8 (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:

Refactoring: libusb, USBHC interface protocol

Highlights:

• refactoring of libusb (not complete)
• max packet size is not send during each transfer
• reserving of default address is possible via endpoint registration
• endpoint registration can send speed as well

File:

• uspace/lib/usb/src/pipesinit.c (modified) (2 diffs)

uspace/lib/usb/src/pipesinit.c

@@ -459 +459 @@
     usb_hc_connection_t *hc_connection)
 {
+        return usb_pipe_register_with_speed(pipe, USB_SPEED_MAX + 1,
+            interval, hc_connection);
+}
+
+/** Register endpoint with a speed at the host controller.
+ *
+ * You will rarely need to use this function because it is needed only
+ * if the registered endpoint is of address 0 and there is no other way
+ * to tell speed of the device at address 0.
+ *
+ * @param pipe Pipe to be registered.
+ * @param speed Speed of the device
+ *      (invalid speed means use previously specified one).
+ * @param interval Polling interval.
+ * @param hc_connection Connection to the host controller (must be opened).
+ * @return Error code.
+ */
+int usb_pipe_register_with_speed(usb_pipe_t *pipe, usb_speed_t speed,
+    unsigned int interval,
+    usb_hc_connection_t *hc_connection)
+{
         assert(pipe);
         assert(hc_connection);
@@ -466 +487 @@
         }
 
-#define _PACK(high, low) ((high) * 256 + (low))
-
-        return async_req_5_0(hc_connection->hc_phone,
+#define _PACK2(high, low) (((high) << 16) + (low))
+#define _PACK3(high, middle, low) (((((high) << 8) + (middle)) << 8) + (low))
+
+        return async_req_4_0(hc_connection->hc_phone,
             DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USBHC_REGISTER_ENDPOINT,
-            _PACK(pipe->wire->address, pipe->endpoint_no),
-            _PACK(pipe->transfer_type, pipe->direction),
-            pipe->max_packet_size, interval);
-
-#undef _PACK
+            _PACK2(pipe->wire->address, pipe->endpoint_no),
+            _PACK3(speed, pipe->transfer_type, pipe->direction),
+            _PACK2(pipe->max_packet_size, interval));
+
+#undef _PACK2
+#undef _PACK3
 }