Changeset 92574f4 in mainline for uspace/app/tester/hw/misc/virtchar1.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/app/tester/hw/misc/virtchar1.c (modified) (2 diffs)

uspace/app/tester/hw/misc/virtchar1.c

@@ -47 +47 @@
 #include "../../tester.h"
 
-#define DEVICE_PATH_NORMAL "/dev/devices/\\virt\\null"
+#define DEVICE_PATH_NORMAL "/dev/devices/\\virt\\null\\a"
 #define DEVICE_PATH_CLASSES "/dev/class/virt-null\\1"
 #define BUFFER_SIZE 64
@@ -89 +89 @@
         /* Clean-up. */
         TPRINTF(" Closing phones and file descriptors\n");
-        ipc_hangup(phone);
+        async_hangup(phone);
         close(fd);