Changeset 6298d80 in mainline for uspace/lib/usb

Timestamp:

2011-03-14T02:01:54Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ff34e5a

Parents:

17ceb72 (diff), 189cd4e (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:

Development branch changes

Location:

uspace/lib/usb

Files:

• Makefile (modified) (1 diff)
• include/usb/devdrv.h (added)
• include/usb/pipes.h (modified) (2 diffs)
• src/devdrv.c (added)
• src/devpoll.c (added)
• src/pipesinit.c (modified) (2 diffs)
• src/recognise.c (modified) (1 diff)

uspace/lib/usb/Makefile

@@ -37 +37 @@
         src/ddfiface.c \
         src/debug.c \
+        src/devdrv.c \
+        src/devpoll.c \
         src/dp.c \
         src/dump.c \

uspace/lib/usb/include/usb/pipes.h

@@ -106 +106 @@
         const usb_endpoint_description_t *description;
         /** Interface number the endpoint must belong to (-1 for any). */
-        const int interface_no;
+        int interface_no;
         /** Found descriptor fitting the description. */
         usb_standard_endpoint_descriptor_t *descriptor;
@@ -131 +131 @@
 int usb_endpoint_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
     size_t, uint8_t *, size_t, usb_device_connection_t *);
-
+int usb_endpoint_pipe_register(usb_endpoint_pipe_t *, unsigned int,
+    usb_hc_connection_t *);
+int usb_endpoint_pipe_unregister(usb_endpoint_pipe_t *, usb_hc_connection_t *);
 
 int usb_endpoint_pipe_start_session(usb_endpoint_pipe_t *);

uspace/lib/usb/src/pipesinit.c

@@ -38 +38 @@
 #include <usb/dp.h>
 #include <usb/request.h>
+#include <usbhc_iface.h>
 #include <errno.h>
 #include <assert.h>
@@ -393 +394 @@
 }
 
+/** Register endpoint with the host controller.
+ *
+ * @param pipe Pipe to be registered.
+ * @param interval Polling interval.
+ * @param hc_connection Connection to the host controller (must be opened).
+ * @return Error code.
+ */
+int usb_endpoint_pipe_register(usb_endpoint_pipe_t *pipe,
+    unsigned int interval,
+    usb_hc_connection_t *hc_connection)
+{
+        assert(pipe);
+        assert(hc_connection);
+
+        if (!usb_hc_connection_is_opened(hc_connection)) {
+                return EBADF;
+        }
+
+#define _PACK(high, low) ((high) * 256 + (low))
+
+        return async_req_5_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
+}
+
+/** Revert endpoint registration with the host controller.
+ *
+ * @param pipe Pipe to be unregistered.
+ * @param hc_connection Connection to the host controller (must be opened).
+ * @return Error code.
+ */
+int usb_endpoint_pipe_unregister(usb_endpoint_pipe_t *pipe,
+    usb_hc_connection_t *hc_connection)
+{
+        assert(pipe);
+        assert(hc_connection);
+
+        if (!usb_hc_connection_is_opened(hc_connection)) {
+                return EBADF;
+        }
+
+        return async_req_4_0(hc_connection->hc_phone,
+            DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USBHC_UNREGISTER_ENDPOINT,
+            pipe->wire->address, pipe->endpoint_no, pipe->direction);
+}
+
 /**
  * @}

uspace/lib/usb/src/recognise.c

@@ -374 +374 @@
          * naming etc., something more descriptive could be created.
          */
-        rc = asprintf(&child_name, "usbdev%02zu", this_device_name_index);
+        rc = asprintf(&child_name, "usb%02zu_a%d",
+            this_device_name_index, address);
         if (rc < 0) {
                 goto failure;