Changeset cb41a5e in mainline for uspace/srv/rd/rd.c

Timestamp:

2009-05-21T07:03:38Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a095d20

Parents:

2246de6

Message:

improve devmap interface
remove spared device

File:

• uspace/srv/rd/rd.c (modified) (3 diffs)

uspace/srv/rd/rd.c

@@ -113 +113 @@
         }
         
-        while (1) {
+        while (true) {
                 callid = async_get_call(&call);
                 switch (IPC_GET_METHOD(call)) {
@@ -205 +205 @@
         printf(NAME ": Found RAM disk at %p, %d bytes\n", rd_ph_addr, rd_size);
         
-        int driver_phone = devmap_driver_register(NAME, rd_connection);
-        if (driver_phone < 0) {
-                printf(NAME ": Unable to register driver\n");
+        int rc = devmap_driver_register(NAME, rd_connection);
+        if (rc < 0) {
+                printf(NAME ": Unable to register driver (%d)\n", rc);
                 return false;
         }
         
         dev_handle_t dev_handle;
-        if (devmap_device_register(driver_phone, "initrd", &dev_handle) != EOK) {
-                ipc_hangup(driver_phone);
-                printf(NAME ": Unable to register device\n");
-                return false;
-        }
-
-        /*
-         * Create the second device.
-         * We need at least two devices for the sake of testing of non-root
-         * mounts. Of course it would be better to allow the second device
-         * be created dynamically...
-         */
-        if (devmap_device_register(driver_phone, "spared", &dev_handle) != EOK) {
-                ipc_hangup(driver_phone);
+        if (devmap_device_register("initrd", &dev_handle) != EOK) {
+                devmap_hangup_phone(DEVMAP_DRIVER);
                 printf(NAME ": Unable to register device\n");
                 return false;
@@ -249 +237 @@
 /**
  * @}
- */ 
+ */