Changeset 17aca1c in mainline for uspace/drv/vhc

Timestamp:

2011-02-04T20:56:52Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0397e5a4, e29e09cf

Parents:

e778543 (diff), 0b37882 (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 changes

Location:

uspace/drv/vhc

Files:

• conndev.c (modified) (2 diffs)
• devices.c (modified) (1 diff)
• hc.c (modified) (1 diff)
• hcd.c (modified) (1 diff)

uspace/drv/vhc/conndev.c

@@ -90 +90 @@
                     = virtdev_add_device(callback, (sysarg_t)fibril_get_id());
                 if (!dev) {
-                        ipc_answer_0(icallid, EEXISTS);
-                        ipc_hangup(callback);
+                        async_answer_0(icallid, EEXISTS);
+                        async_hangup(callback);
                         return;
                 }
-                ipc_answer_0(icallid, EOK);
+                async_answer_0(icallid, EOK);
 
                 char devname[DEVICE_NAME_MAXLENGTH + 1];
@@ -105 +105 @@
         }
 
-        ipc_answer_0(icallid, EINVAL);
+        async_answer_0(icallid, EINVAL);
 }
 

uspace/drv/vhc/devices.c

@@ -34 +34 @@
  */
 
-#include <ipc/ipc.h>
 #include <adt/list.h>
 #include <bool.h>

uspace/drv/vhc/hc.c

@@ -34 +34 @@
  */
 
-#include <ipc/ipc.h>
 #include <adt/list.h>
 #include <bool.h>

uspace/drv/vhc/hcd.c

@@ -35 +35 @@
 
 #include <devmap.h>
-#include <ipc/ipc.h>
 #include <async.h>
 #include <unistd.h>