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

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

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

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

@@ -48 +48 @@
 #include "../../tester.h"
 
-#define DEVICE_PATH_NORMAL "/loc/devices/\\virt\\null\\a"
-#define BUFFER_SIZE 64
+#define DEVICE_PATH_NORMAL  "/loc/devices/\\virt\\null\\a"
+
+#define BUFFER_SIZE  64
 
 static const char *test_virtchar1_internal(const char *path)
@@ -65 +66 @@
         
         TPRINTF("   ...file handle %d\n", fd);
-
+        
         TPRINTF(" Asking for session...\n");
         async_sess_t *sess = fd_session(EXCHANGE_SERIALIZE, fd);
@@ -96 +97 @@
 
 const char *test_virtchar1(void)
-{;
-        const char *res;
-
-        res = test_virtchar1_internal(DEVICE_PATH_NORMAL);
-        if (res != NULL) {
+{
+        const char *res = test_virtchar1_internal(DEVICE_PATH_NORMAL);
+        if (res != NULL)
                 return res;
-        }
-
+        
         return NULL;
 }