Changeset 7551706b in mainline

Timestamp:

2010-12-17T23:26:53Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3ca3430

Parents:

47a7174f

Message:

Extended virtchar1 test with device classes

The test also tries to connect to the (same) device using its class
interface path (under /dev/class).

Location:

uspace

Files:

• app/tester/hw/misc/virtchar1.c (modified) (3 diffs)
• drv/test1/test1.c (modified) (1 diff)

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

@@ -48 +48 @@
 #include "../../tester.h"
 
-#define DEVICE_PATH "/dev/devices/\\virt\\null"
+#define DEVICE_PATH_NORMAL "/dev/devices/\\virt\\null"
+#define DEVICE_PATH_CLASSES "/dev/class/virt-null\\1"
 #define BUFFER_SIZE 64
 
-const char *test_virtchar1(void)
+static const char *test_virtchar1_internal(const char *path)
 {
-        TPRINTF("Opening %s...\n", DEVICE_PATH);
-        int fd = open(DEVICE_PATH, O_RDONLY);
+        TPRINTF("Opening `%s'...\n", path);
+        int fd = open(path, O_RDONLY);
         if (fd < 0) {
-                TPRINTF(" ...error: %s\n", str_error(fd));
+                TPRINTF("   ...error: %s\n", str_error(fd));
                 if (fd == ENOENT) {
-                        TPRINTF(" (error was ENOENT: " \
+                        TPRINTF("   (error was ENOENT: " \
                             "have you compiled test drivers?)\n");
                 }
-                return "Failed opening " DEVICE_PATH " for reading";
+                return "Failed opening devman driver device for reading";
         }
         
-        TPRINTF(" ...file handle %d\n", fd);
+        TPRINTF("   ...file handle %d\n", fd);
 
-        TPRINTF("Asking for phone...\n");
+        TPRINTF(" Asking for phone...\n");
         int phone = fd_phone(fd);
         if (phone < 0) {
                 close(fd);
-                TPRINTF(" ...error: %s\n", str_error(phone));
+                TPRINTF("   ...error: %s\n", str_error(phone));
                 return "Failed to get phone to device";
         }
-        TPRINTF(" ...phone is %d\n", phone);
+        TPRINTF("   ...phone is %d\n", phone);
         
-        TPRINTF("Will try to read...\n");
+        TPRINTF(" Will try to read...\n");
         size_t i;
         char buffer[BUFFER_SIZE];
@@ -85 +86 @@
                 }
         }
-        TPRINTF(" ...data read okay\n");
+        TPRINTF("   ...data read okay\n");
         
         /* Clean-up. */
-        TPRINTF("Closing phones and file descriptors");
+        TPRINTF(" Closing phones and file descriptors\n");
         ipc_hangup(phone);
         close(fd);
@@ -95 +96 @@
 }
 
+const char *test_virtchar1(void)
+{;
+        const char *res;
+
+        res = test_virtchar1_internal(DEVICE_PATH_NORMAL);
+        if (res != NULL) {
+                return res;
+        }
+
+        res = test_virtchar1_internal(DEVICE_PATH_CLASSES);
+        if (res != NULL) {
+                return res;
+        }
+
+        return NULL;
+}
+
 /** @}
  */

uspace/drv/test1/test1.c

@@ -98 +98 @@
         if (str_cmp(dev->name, "null") == 0) {
                 dev->ops = &char_device_ops;
+                add_device_to_class(dev, "virt-null");
         } else if (dev->parent == NULL) {
                 register_child_verbose(dev, "cloning myself ;-)", "clone",