Changeset e27595b in mainline for uspace/lib/usbvirt/main.c

Timestamp:

2010-11-20T13:04:15Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0e126be7

Parents:

7034be15

Message:

Virtual USB devices can connect to VHC

Fixed and bypassed problems introduced by using DDF.

File:

• uspace/lib/usbvirt/main.c (modified) (5 diffs)

uspace/lib/usbvirt/main.c

@@ -33 +33 @@
  * @brief Device registration with virtual USB framework.
  */
-#include <devmap.h>
-#include <fcntl.h>
-#include <vfs/vfs.h>
+#include <devman.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -181 +179 @@
                 return;
         }
-        
+
         device_callback_connection(dev->device, iid, icall);
 }
@@ -187 +185 @@
 /** Create necessary phones for comunication with virtual HCD.
  * This function wraps following calls:
- * -# open <code>/dev/usb/<i>hcd_path</i></code> for reading
+ * -# open <code>/dev/devices/\\vhc for reading
  * -# access phone of file opened in previous step
  * -# create callback through just opened phone
@@ -202 +200 @@
  * @return EOK on success or error code from errno.h.
  */
-int usbvirt_connect(usbvirt_device_t *dev, const char *hcd_path)
+int usbvirt_connect(usbvirt_device_t *dev)
 {
         virtual_device_t *virtual_device = find_device(dev);
@@ -209 +207 @@
         }
         
-        char dev_path[DEVMAP_NAME_MAXLEN + 1];
-        snprintf(dev_path, DEVMAP_NAME_MAXLEN,
-            "/dev/%s/%s", NAMESPACE, hcd_path);
-        
-        int fd = open(dev_path, O_RDONLY);
-        if (fd < 0) {
-                return fd;
-        }
-        
-        int hcd_phone = fd_phone(fd);
+        const char *vhc_path = "/vhc";
+        int rc;
+        devman_handle_t handle;
+
+        rc = devman_device_get_handle(vhc_path, &handle, 0);
+        if (rc != EOK) {
+                printf("devman_device_get_handle() failed\n");
+                return rc;
+        }
+        
+        int hcd_phone = devman_device_connect(handle, 0);
         
         if (hcd_phone < 0) {
+                printf("devman_device_connect() failed\n");
                 return hcd_phone;
         }
         
         ipcarg_t phonehash;
-        int rc = ipc_connect_to_me(hcd_phone, 0, 0, 0, &phonehash);
+        rc = ipc_connect_to_me(hcd_phone, 0, 0, 0, &phonehash);
         if (rc != EOK) {
+                printf("ipc_connect_to_me() failed\n");
                 return rc;
         }