Changeset 36bcf84f in mainline for uspace/lib/usb/src

Timestamp:

2010-11-28T18:03:19Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

78f01ff9

Parents:

ef75332 (diff), 710f518 (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 with vojtechhorky/

Location:

uspace/lib/usb/src

Files:

• hcdhubd.c (modified) (1 diff)
• hcdhubd_private.h (modified) (1 diff)
• hcdrv.c (modified) (1 diff)
• remotedrv.c (added)
• usbdrv.c (modified) (1 diff)

uspace/lib/usb/src/hcdhubd.c

@@ -205 +205 @@
 }
 
+/** Tell USB address of given device.
+ *
+ * @param handle Devman handle of the device.
+ * @return USB device address or error code.
+ */
+usb_address_t usb_get_address_by_handle(devman_handle_t handle)
+{
+        /* TODO: search list of attached devices. */
+        return ENOENT;
+}
+
 /**
  * @}

uspace/lib/usb/src/hcdhubd_private.h

@@ -42 +42 @@
 extern usb_hc_driver_t *hc_driver;
 
+extern usbhc_iface_t usbhc_interface;
+
+usb_address_t usb_get_address_by_handle(devman_handle_t);
 int usb_add_hc_device(device_t *);
 int usb_add_hub_device(device_t *);

uspace/lib/usb/src/hcdrv.c

@@ -50 +50 @@
 usb_hc_driver_t *hc_driver = NULL;
 
-static usbhc_iface_t usb_interface = {
-        .interrupt_out = NULL,
-        .interrupt_in = NULL
-};
-
 static device_ops_t usb_device_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &usb_interface
+        .interfaces[USBHC_DEV_IFACE] = &usbhc_interface
 };
 

uspace/lib/usb/src/usbdrv.c

@@ -345 +345 @@
 }
 
+/** Start control write transfer. */
+int usb_drv_async_control_write_setup(int phone, usb_target_t target,
+    void *buffer, size_t size,
+    usb_handle_t *handle)
+{
+        return async_send_buffer(phone,
+            IPC_M_USBHC_CONTROL_WRITE_SETUP,
+            target,
+            buffer, size,
+            handle);
+}
+
+/** Send data during control write transfer. */
+int usb_drv_async_control_write_data(int phone, usb_target_t target,
+    void *buffer, size_t size,
+    usb_handle_t *handle)
+{
+        return async_send_buffer(phone,
+            IPC_M_USBHC_CONTROL_WRITE_DATA,
+            target,
+            buffer, size,
+            handle);
+}
+
+/** Finalize control write transfer. */
+int usb_drv_async_control_write_status(int phone, usb_target_t target,
+    usb_handle_t *handle)
+{
+        return async_recv_buffer(phone,
+            IPC_M_USBHC_CONTROL_WRITE_STATUS,
+            target,
+            NULL, 0, NULL,
+            handle);
+}
+
+/** Start control read transfer. */
+int usb_drv_async_control_read_setup(int phone, usb_target_t target,
+    void *buffer, size_t size,
+    usb_handle_t *handle)
+{
+        return async_send_buffer(phone,
+            IPC_M_USBHC_CONTROL_READ_SETUP,
+            target,
+            buffer, size,
+            handle);
+}
+
+/** Read data during control read transfer. */
+int usb_drv_async_control_read_data(int phone, usb_target_t target,
+    void *buffer, size_t size, size_t *actual_size,
+    usb_handle_t *handle)
+{
+        return async_recv_buffer(phone,
+            IPC_M_USBHC_CONTROL_READ_DATA,
+            target,
+            buffer, size, actual_size,
+            handle);
+}
+
+/** Finalize control read transfer. */
+int usb_drv_async_control_read_status(int phone, usb_target_t target,
+    usb_handle_t *handle)
+{
+        return async_send_buffer(phone,
+            IPC_M_USBHC_CONTROL_READ_STATUS,
+            target,
+            NULL, 0,
+            handle);
+}
+
 /**
  * @}