Changeset 0f191a2 in mainline for uspace/lib/drv

Timestamp:

2011-01-07T09:20:13Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

2b0db98, 2c98e78, 43c3937

Parents:

ae1f70e (diff), 8f8a0cd6 (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:

Merged vojtechhorky/ - connecting to HC

Fixed ticket #6:
Currently, all USB device drivers connect to the virtual host
controller. The usb_drv_hc_connect() function must connect
the caller to the host controller driver the device is
physically attached to.

Location:

uspace/lib/drv

Files:

• Makefile (modified) (1 diff)
• generic/dev_iface.c (modified) (2 diffs)
• generic/remote_usb.c (added)
• generic/remote_usbhc.c (modified) (2 diffs)
• include/remote_usb.h (added)
• include/usb_iface.h (added)
• include/usbhc_iface.h (modified) (2 diffs)

uspace/lib/drv/Makefile

@@ -36 +36 @@
         generic/dev_iface.c \
         generic/remote_res.c \
+        generic/remote_usb.c \
         generic/remote_usbhc.c \
         generic/remote_char.c

uspace/lib/drv/generic/dev_iface.c

@@ -39 +39 @@
 #include "remote_res.h"
 #include "remote_char.h"
+#include "remote_usb.h"
 #include "remote_usbhc.h"
 
@@ -45 +46 @@
                 &remote_res_iface,
                 &remote_char_iface,
+                &remote_usb_iface,
                 &remote_usbhc_iface
         }

uspace/lib/drv/generic/remote_usbhc.c

@@ -59 +59 @@
 //static void remote_usbhc(device_t *, void *, ipc_callid_t, ipc_call_t *);
 
-/** Remote USB interface operations. */
+/** Remote USB host controller interface operations. */
 static remote_iface_func_ptr_t remote_usbhc_iface_ops [] = {
         remote_usbhc_get_address,
@@ -84 +84 @@
 };
 
-/** Remote USB interface structure.
+/** Remote USB host controller interface structure.
  */
 remote_iface_t remote_usbhc_iface = {

uspace/lib/drv/include/usbhc_iface.h

@@ -31 +31 @@
  */
 /** @file
- * @brief USB interface definition.
+ * @brief USB host controller interface definition.
  */
 
@@ -226 +226 @@
     usbhc_iface_transfer_in_callback_t, void *);
 
-/** USB devices communication interface. */
+/** USB host controller communication interface. */
 typedef struct {
         int (*tell_address)(device_t *, devman_handle_t, usb_address_t *);