Changeset 71ed4849 in mainline for uspace/drv

Timestamp:

2010-12-28T14:00:36Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8f8a0cd6

Parents:

de2c901

Message:

Connecting to "parent" host controller

USB drivers can now connect to host controller drivers they physically
belong to (so far, everything connected to VHC).

Each USB device must implement the USB interface of libdrv to allow
this (it is absolutely neccesary for hubs).

USB drivers can use usb_drv_hc_connect() to connect to "their" host
controller.

Child devices created with usb_drv_register_child_in_devman()are set
to handle this connection automatically.

UHCI and VHC drivers were updated.

Location:

uspace/drv

Files:

• uhci/main.c (modified) (2 diffs)
• usbhub/usbhub.c (modified) (4 diffs)
• usbkbd/main.c (modified) (2 diffs)
• vhc/hcd.c (modified) (2 diffs)
• vhc/hub.c (modified) (1 diff)

uspace/drv/uhci/main.c

@@ -27 +27 @@
  */
 #include <usb/hcdhubd.h>
+#include <usb_iface.h>
 #include <usb/debug.h>
 #include <errno.h>
@@ -32 +33 @@
 #include "uhci.h"
 
+static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
+{
+        /* This shall be called only for the UHCI itself. */
+        assert(dev->parent == NULL);
+
+        *handle = dev->handle;
+        return EOK;
+}
+
+static usb_iface_t hc_usb_iface = {
+        .get_hc_handle = usb_iface_get_hc_handle
+};
+
 static device_ops_t uhci_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &uhci_iface,
+        .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
+        .interfaces[USBHC_DEV_IFACE] = &uhci_iface
 };
 

uspace/drv/usbhub/usbhub.c

@@ -37 +37 @@
 #include <errno.h>
 
-#include <usbhc_iface.h>
+#include <usb_iface.h>
 #include <usb/usbdrv.h>
 #include <usb/descriptor.h>
@@ -46 +46 @@
 #include "usbhub_private.h"
 #include "port_status.h"
+
+static usb_iface_t hub_usb_iface = {
+        .get_hc_handle = usb_drv_find_hc
+};
+
+static device_ops_t hub_device_ops = {
+        .interfaces[USB_DEV_IFACE] = &hub_usb_iface
+};
 
 //*********************************************
@@ -135 +143 @@
          * connected devices.
          */
+        dev->ops = &hub_device_ops;
 
         //create the hub structure
         //get hc connection
-        int hc = usb_drv_hc_connect(dev, 0);
+        int hc = usb_drv_hc_connect_auto(dev, 0);
+        if (hc < 0) {
+                return hc;
+        }
 
         usb_hub_info_t * hub_info = usb_create_hub_info(dev, hc);
@@ -464 +476 @@
                  * Connect to respective HC.
                  */
-                int hc = usb_drv_hc_connect(hub_info->device, 0);
+                int hc = usb_drv_hc_connect_auto(hub_info->device, 0);
                 if (hc < 0) {
                         continue;

uspace/drv/usbkbd/main.c

@@ -190 +190 @@
         // get phone to my HC and save it as my parent's phone
         // TODO: maybe not a good idea if DDF will use parent_phone
-        kbd_dev->device->parent_phone = usb_drv_hc_connect(dev, 0);
+        kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0);
 
         kbd_dev->address = usb_drv_get_my_address(dev->parent_phone,
@@ -325 +325 @@
          * Not supported yet, skip..
          */
-//      int phone = usb_drv_hc_connect(dev, 0);
+//      int phone = usb_drv_hc_connect_auto(dev, 0);
 //      if (phone < 0) {
 //              /*

uspace/drv/vhc/hcd.c

@@ -46 +46 @@
 
 #include <usb/usb.h>
+#include <usb_iface.h>
 #include "vhcd.h"
 #include "hc.h"
@@ -52 +53 @@
 #include "conn.h"
 
+static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
+{
+        /* This shall be called only for VHC device. */
+        assert(dev->parent == NULL);
+
+        *handle = dev->handle;
+        return EOK;
+}
+
+static usb_iface_t hc_usb_iface = {
+        .get_hc_handle = usb_iface_get_hc_handle
+};
+
 static device_ops_t vhc_ops = {
         .interfaces[USBHC_DEV_IFACE] = &vhc_iface,
+        .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
         .default_handler = default_connection_handler
 };

uspace/drv/vhc/hub.c

@@ -79 +79 @@
         device_t *hc_dev = (device_t *) arg;
 
-        int hc = usb_drv_hc_connect(hc_dev, IPC_FLAG_BLOCKING);
+        int hc = usb_drv_hc_connect(hc_dev, hc_dev->handle, IPC_FLAG_BLOCKING);
         if (hc < 0) {
                 printf(NAME ": failed to register root hub\n");