Changeset 0a5a950 in mainline

Timestamp:

2010-12-09T00:25:14Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

040068c, 11feca8

Parents:

fe2333d

Message:

Virtual USB HC under devman:/virt

Files:

• .bzrignore (modified) (1 diff)
• uspace/drv/root/root.c (modified) (2 diffs)
• uspace/drv/rootvirt/devices.def (modified) (1 diff)
• uspace/lib/usb/src/usbdrv.c (modified) (1 diff)
• uspace/lib/usbvirt/main.c (modified) (3 diffs)

.bzrignore

@@ -68 +68 @@
 ./uspace/dist/cfg/net/lo
 ./uspace/dist/cfg/net/ne2k
-./uspace/dist/drv/isa/
-./uspace/dist/drv/ns8250/
-./uspace/dist/drv/pciintel/
-./uspace/dist/drv/root/
-./uspace/dist/drv/rootia32/
-./uspace/dist/drv/uhci/
-./uspace/dist/drv/usbhub/
-./uspace/dist/drv/usbkbd/
-./uspace/dist/drv/vhc/
-./uspace/dist/srv/arp
-./uspace/dist/srv/ata_bd
-./uspace/dist/srv/char_ms
-./uspace/dist/srv/clip
-./uspace/dist/srv/console
-./uspace/dist/srv/devfs
-./uspace/dist/srv/devman
-./uspace/dist/srv/dp8390
-./uspace/dist/srv/eth
-./uspace/dist/srv/fat
-./uspace/dist/srv/fb
-./uspace/dist/srv/file_bd
-./uspace/dist/srv/g_part
-./uspace/dist/srv/i8042
-./uspace/dist/srv/icmp
-./uspace/dist/srv/ip
-./uspace/dist/srv/kbd
-./uspace/dist/srv/lo
-./uspace/dist/srv/mbr_part
-./uspace/dist/srv/net
-./uspace/dist/srv/netstart
-./uspace/dist/srv/nildummy
-./uspace/dist/srv/pci
-./uspace/dist/srv/taskmon
-./uspace/dist/srv/tcp
-./uspace/dist/srv/tmpfs
-./uspace/dist/srv/udp
-./uspace/dist/srv/vhcd
+./uspace/dist/drv/*
+./uspace/dist/srv/*
 ./uspace/drv/root/root
 ./uspace/drv/isa/isa
 ./uspace/drv/ns8250/ns8250
 ./uspace/drv/pciintel/pciintel
-./uspace/drv/rootia32/rootia32
+./uspace/drv/rootpc/rootpc
+./uspace/drv/rootvirt/rootvirt
+./uspace/drv/test1/test1
+./uspace/drv/test2/test2
 ./uspace/drv/uhci/uhci
 ./uspace/drv/usbhub/usbhub

uspace/drv/root/root.c

@@ -109 +109 @@
 }
 
-/** Create virtual USB host controller device.
- * Note that the virtual HC is actually device and driver in one
- * task.
- *
- * @param parent Parent device.
- * @return Error code.
- */
-static int add_virtual_usb_host_controller(device_t *parent)
-{
-        printf(NAME ": adding virtual host contoller.\n");
-
-        int rc;
-        device_t *vhc = NULL;
-        match_id_t *match_id = NULL;
-
-        vhc = create_device();
-        if (vhc == NULL) {
-                rc = ENOMEM;
-                goto failure;
-        }
-
-        vhc->name = "vhc";
-        printf(NAME ": the new device's name is %s.\n", vhc->name);
-
-        /* Initialize match id list. */
-        match_id = create_match_id();
-        if (match_id == NULL) {
-                rc = ENOMEM;
-                goto failure;
-        }
-
-        match_id->id = "usb&hc=vhc";
-        match_id->score = 100;
-        add_match_id(&vhc->match_ids, match_id);
-
-        /* Register child device. */
-        rc = child_device_register(vhc, parent);
-        if (rc != EOK)
-                goto failure;
-
-        return EOK;
-
-failure:
-        if (match_id != NULL)
-                match_id->id = NULL;
-
-        if (vhc != NULL) {
-                vhc->name = NULL;
-                delete_device(vhc);
-        }
-
-        return rc;
-}
-
 /** Get the root device.
  *
@@ -185 +131 @@
                 printf(NAME ": failed to add child device for platform.\n");
         
-        /* Register virtual USB host controller. */
-        int rc = add_virtual_usb_host_controller(dev);
-        if (EOK != rc) {
-                printf(NAME ": failed to add child device - virtual USB HC.\n");
-        }
-
         return res;
 }

uspace/drv/rootvirt/devices.def

@@ -18 +18 @@
 },
 #endif
+/* Virtual USB host controller. */
+{
+        .name = "usbhc",
+        .match_id = "usb&hc=vhc"
+},

uspace/lib/usb/src/usbdrv.c

@@ -71 +71 @@
         devman_handle_t handle;
 
-        rc = devman_device_get_handle("/vhc", &handle, 0);
+        rc = devman_device_get_handle("/virt/usbhc", &handle, 0);
         if (rc != EOK) {
                 return rc;

uspace/lib/usbvirt/main.c

@@ -183 +183 @@
 }
 
-/** Create necessary phones for comunication with virtual HCD.
+/** Create necessary phones for communication with virtual HCD.
  * This function wraps following calls:
- * -# open <code>/dev/devices/\\vhc for reading
+ * -# open <code>/dev/devices/\\virt\\usbhc for reading
  * -# access phone of file opened in previous step
  * -# create callback through just opened phone
@@ -193 +193 @@
  * @warning This function is wrapper for several actions and therefore
  * it is not possible - in case of error - to determine at which point
- * error occured.
- *
- * @param hcd_path HCD identification under devfs
- *     (without <code>/dev/usb/</code>).
+ * error occurred.
+ *
  * @param dev Device to connect.
  * @return EOK on success or error code from errno.h.
@@ -207 +205 @@
         }
         
-        const char *vhc_path = "/vhc";
+        const char *vhc_path = "/virt/usbhc";
         int rc;
         devman_handle_t handle;