Changeset 520acaf in mainline for uspace/srv/bd/ata_bd/ata_bd.c

Timestamp:

2012-06-06T21:13:29Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

5f679702

Parents:

11b9ad7 (diff), 3123d2a (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/srv/bd/ata_bd/ata_bd.c (modified) (2 diffs)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -191 +191 @@
         }
 
-        printf(NAME ": Accepting connections\n");
+        printf("%s: Accepting connections\n", NAME);
         task_retval(0);
         async_manager();
@@ -243 +243 @@
 static int ata_bd_init(void)
 {
+        async_set_client_connection(ata_bd_connection);
+        int rc = loc_server_register(NAME);
+        if (rc != EOK) {
+                printf("%s: Unable to register driver.\n", NAME);
+                return rc;
+        }
+        
         void *vaddr;
-        int rc;
-        
-        async_set_client_connection(ata_bd_connection);
-        rc = loc_server_register(NAME);
-        if (rc < 0) {
-                printf(NAME ": Unable to register driver.\n");
-                return rc;
-        }
-
         rc = pio_enable((void *) cmd_physical, sizeof(ata_cmd_t), &vaddr);
         if (rc != EOK) {
-                printf(NAME ": Could not initialize device I/O space.\n");
+                printf("%s: Could not initialize device I/O space.\n", NAME);
                 return rc;
         }
-
+        
         cmd = vaddr;
-
+        
         rc = pio_enable((void *) ctl_physical, sizeof(ata_ctl_t), &vaddr);
         if (rc != EOK) {
-                printf(NAME ": Could not initialize device I/O space.\n");
+                printf("%s: Could not initialize device I/O space.\n", NAME);
                 return rc;
         }
-
+        
         ctl = vaddr;
-
-
+        
         return EOK;
 }