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

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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.

File:

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

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

@@ -48 +48 @@
 #include "../../tester.h"
 
-#define DEVICE_PATH_NORMAL "/dev/devices/\\virt\\null\\a"
-#define DEVICE_PATH_CLASSES "/dev/class/virt-null\\1"
+#define DEVICE_PATH_NORMAL "/loc/devices/\\virt\\null\\a"
 #define BUFFER_SIZE 64
 
@@ -105 +104 @@
         }
 
-        res = test_virtchar1_internal(DEVICE_PATH_CLASSES);
-        if (res != NULL) {
-                return res;
-        }
-
         return NULL;
 }