Changeset 19a1800 in mainline for uspace/lib/usbvirt/src/main.c

Timestamp:

2011-03-01T22:20:56Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

e24e7b1

Parents:

976f546 (diff), ac8285d (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 with the current development

File:

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

uspace/lib/usbvirt/src/main.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusbvirt usb
+/** @addtogroup libusbvirt
  * @{
  */
@@ -159 +159 @@
 {
         if (dev->vhcd_phone > 0) {
-                ipc_hangup(dev->vhcd_phone);
+                async_hangup(dev->vhcd_phone);
         }
         
@@ -173 +173 @@
         virtual_device_t *dev = find_device_by_id(0);
         if (dev == NULL) {
-                ipc_answer_0(iid, EINVAL);
+                async_answer_0(iid, EINVAL);
                 printf("Ooops\n");
                 return;
@@ -183 +183 @@
 /** Create necessary phones for communication with virtual HCD.
  * This function wraps following calls:
- * -# open <code>/dev/devices/\\virt\\usbhc for reading
+ * -# open <code>/dev/devices/\\virt\\usbhc</code> for reading
  * -# access phone of file opened in previous step
  * -# create callback through just opened phone
@@ -203 +203 @@
         }
         
-        const char *vhc_path = "/virt/usbhc";
+        const char *vhc_path = "/virt/usbhc/hc";
         int rc;
         devman_handle_t handle;
@@ -220 +220 @@
         }
         
-        sysarg_t phonehash;
-        rc = ipc_connect_to_me(hcd_phone, 0, 0, 0, &phonehash);
+        rc = async_connect_to_me(hcd_phone, 0, 0, 0, callback_connection);
         if (rc != EOK) {
                 printf("ipc_connect_to_me() failed\n");
@@ -232 +231 @@
         virtual_device->vhcd_phone = hcd_phone;
         virtual_device->id = 0;
-        
-        async_new_connection(phonehash, 0, NULL, callback_connection);
         
         return EOK;