Changeset 210e50a in mainline for uspace/app

Timestamp:

2010-02-03T13:36:46Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

28be7fa

Parents:

82474ef

Message:

understand an empty fqdn as the device argument to mount() as an implicit request to create a fresh null/%d device

Location:

uspace/app

Files:

• init/init.c (modified) (2 diffs)
• tester/vfs/vfs1.c (modified) (1 diff)

uspace/app/init/init.c

@@ -94 +94 @@
 static bool mount_devfs(void)
 {
-        char null[MAX_DEVICE_NAME];
-        int null_id = devmap_null_create();
-        
-        if (null_id == -1) {
-                printf(NAME ": Unable to create null device\n");
-                return false;
-        }
-        
-        snprintf(null, MAX_DEVICE_NAME, "null/%d", null_id);
-        int rc = mount("devfs", DEVFS_MOUNT_POINT, null, "", IPC_FLAG_BLOCKING);
+        int rc = mount("devfs", DEVFS_MOUNT_POINT, "", "", IPC_FLAG_BLOCKING);
         
         switch (rc) {
@@ -111 +102 @@
         case EBUSY:
                 printf(NAME ": Device filesystem already mounted\n");
-                devmap_null_destroy(null_id);
                 return false;
         case ELIMIT:
                 printf(NAME ": Unable to mount device filesystem\n");
-                devmap_null_destroy(null_id);
                 return false;
         case ENOENT:
                 printf(NAME ": Unknown filesystem type (devfs)\n");
-                devmap_null_destroy(null_id);
                 return false;
         default:
                 printf(NAME ": Error mounting device filesystem (%d)\n", rc);
-                devmap_null_destroy(null_id);
                 return false;
         }

uspace/app/tester/vfs/vfs1.c

@@ -79 +79 @@
         TPRINTF("Created directory %s\n", MOUNT_POINT);
         
-        char null[MAX_DEVICE_NAME];
-        int null_id = devmap_null_create();
-        
-        if (null_id == -1)
-                return "Unable to create null device";
-        
-        snprintf(null, MAX_DEVICE_NAME, "null/%d", null_id);
-        int rc = mount(FS_TYPE, MOUNT_POINT, null, OPTIONS, FLAGS);
+        int rc = mount(FS_TYPE, MOUNT_POINT, "", OPTIONS, FLAGS);
         switch (rc) {
         case EOK:
-                TPRINTF("Mounted /dev/%s as %s on %s\n", null, FS_TYPE, MOUNT_POINT);
+                TPRINTF("Mounted %s on %s\n", FS_TYPE, MOUNT_POINT);
                 break;
         case EBUSY: