Changeset 4317827 in mainline for uspace/drv/vhc/hcd.c

Timestamp:

2010-12-04T14:00:41Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

36c410e

Parents:

62c9661

Message:

USB hub driver in separate task

The commit only includes changes necessary to get working (i.e. appearing
under /dev/devices) hub and VHC.

Clean-up will come later.

File:

• uspace/drv/vhc/hcd.c (modified) (4 diffs)

uspace/drv/vhc/hcd.c

@@ -52 +52 @@
 #include "conn.h"
 
+static device_ops_t vhc_ops = {
+        .interfaces[USBHC_DEV_IFACE] = &vhc_iface,
+        .default_handler = default_connection_handler
+};
 
 static int vhc_count = 0;
-static int vhc_add_device(usb_hc_device_t *dev)
+static int vhc_add_device(device_t *dev)
 {
         /*
@@ -65 +69 @@
         vhc_count++;
 
-        dev->transfer_ops = &vhc_transfer_ops;
-        dev->generic->ops->default_handler = default_connection_handler;
+        dev->ops = &vhc_ops;
 
         /*
@@ -79 +82 @@
 }
 
-static usb_hc_driver_t vhc_driver = {
+static driver_ops_t vhc_driver_ops = {
+        .add_device = vhc_add_device,
+};
+
+static driver_t vhc_driver = {
         .name = NAME,
-        .add_hc = &vhc_add_device
+        .driver_ops = &vhc_driver_ops
 };
 
@@ -114 +121 @@
         sleep(4);
 
-        return usb_hcd_main(&vhc_driver);
+        return driver_main(&vhc_driver);
 }