Changeset a29529b in mainline for uspace/lib/usbdev/src

Timestamp:

2011-05-13T14:40:21Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

50cd285, 5e6e50b

Parents:

81db65b (diff), 8fcaeed (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/usbdev/src

Files:

• altiface.c (moved) (moved from uspace/lib/usb/src/altiface.c )
• devdrv.c (moved) (moved from uspace/lib/usb/src/devdrv.c )
• devpoll.c (moved) (moved from uspace/lib/usb/src/devpoll.c )
• dp.c (moved) (moved from uspace/lib/usb/src/dp.c )
• hub.c (moved) (moved from uspace/lib/usb/src/hub.c )
• pipepriv.c (moved) (moved from uspace/lib/usb/src/pipepriv.c )
• pipepriv.h (moved) (moved from uspace/lib/usb/src/pipepriv.h )
• pipes.c (moved) (moved from uspace/lib/usb/src/pipes.c ) (1 diff)
• pipesinit.c (moved) (moved from uspace/lib/usb/src/pipesinit.c )
• pipesio.c (moved) (moved from uspace/lib/usb/src/pipesio.c )
• recognise.c (moved) (moved from uspace/lib/usb/src/recognise.c )
• request.c (moved) (moved from uspace/lib/usb/src/request.c ) (1 diff)
• usbdevice.c (moved) (moved from uspace/lib/usb/src/usbdevice.c ) (1 diff)

uspace/lib/usbdev/src/pipes.c

@@ -36 +36 @@
 #include <usb/pipes.h>
 #include <usb/debug.h>
+#include <usb/driver.h>
 #include <usbhc_iface.h>
 #include <usb_iface.h>

uspace/lib/usbdev/src/request.c

@@ -885 +885 @@
 }
 
+/** Clear halt bit of an endpoint pipe (after pipe stall).
+ *
+ * @param ctrl_pipe Control pipe.
+ * @param target_pipe Which pipe is halted and shall be cleared.
+ * @return Error code.
+ */
+int usb_pipe_clear_halt(usb_pipe_t *ctrl_pipe, usb_pipe_t *target_pipe)
+{
+        if ((ctrl_pipe == NULL) || (target_pipe == NULL)) {
+                return EINVAL;
+        }
+        return usb_request_clear_endpoint_halt(ctrl_pipe,
+            target_pipe->endpoint_no);
+}
+
+/** Get endpoint status.
+ *
+ * @param[in] ctrl_pipe Control pipe.
+ * @param[in] pipe Of which pipe the status shall be received.
+ * @param[out] status Where to store pipe status (in native endianness).
+ * @return Error code.
+ */
+int usb_request_get_endpoint_status(usb_pipe_t *ctrl_pipe, usb_pipe_t *pipe,
+    uint16_t *status)
+{
+        uint16_t status_tmp;
+        uint16_t pipe_index = (uint16_t) pipe->endpoint_no;
+        int rc = usb_request_get_status(ctrl_pipe,
+            USB_REQUEST_RECIPIENT_ENDPOINT, uint16_host2usb(pipe_index),
+            &status_tmp);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        if (status != NULL) {
+                *status = uint16_usb2host(status_tmp);
+        }
+
+        return EOK;
+}
+
 /**
  * @}

uspace/lib/usbdev/src/usbdevice.c

@@ -37 +37 @@
 #include <usb_iface.h>
 #include <usb/usbdevice.h>
+#include <usb/driver.h>
 #include <usb/debug.h>
 #include <errno.h>
 #include <assert.h>
-
-/** Find host controller handle that is ancestor of given device.
- *
- * @param[in] device_handle Device devman handle.
- * @param[out] hc_handle Where to store handle of host controller
- *      controlling device with @p device_handle handle.
- * @return Error code.
- */
-int usb_hc_find(devman_handle_t device_handle, devman_handle_t *hc_handle)
-{
-        int parent_phone = devman_parent_device_connect(device_handle,
-            IPC_FLAG_BLOCKING);
-        if (parent_phone < 0) {
-                return parent_phone;
-        }
-
-        devman_handle_t h;
-        usb_log_debug("asking for HC handle (my handle is %zu).\n", device_handle);
-        int rc = async_req_1_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &h);
-
-        async_hangup(parent_phone);
-
-        if (rc != EOK) {
-                return rc;
-        }
-
-        if (hc_handle != NULL) {
-                *hc_handle = h;
-        }
-
-        return EOK;
-}
 
 /** Initialize connection to USB host controller.