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

Timestamp:

2010-12-09T00:28:58Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

cdc1aa1

Parents:

818dc00 (diff), 0a5a950 (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:

Merge mainline + minor changes

The marge with mainline includes the hands-off configure and merge with
our DDF fixes.

The virtual USB host controller is now under the virtual devices hierarchy
(the path is /virt/usbhc now).

File:

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

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;