Changeset b16e77d in mainline

Timestamp:

2012-06-01T19:14:43Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

50ad3f3

Parents:

1038a9c

Message:

trivial changes (error code reporting, messages)

Location:

uspace/srv/bd

Files:

• ata_bd/ata_bd.c (modified) (2 diffs)
• file_bd/file_bd.c (modified) (2 diffs)
• gxe_bd/gxe_bd.c (modified) (1 diff)
• part/guid_part/guid_part.c (modified) (1 diff)
• rd/rd.c (modified) (1 diff)

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;
 }

uspace/srv/bd/file_bd/file_bd.c

@@ -119 +119 @@
         rc = loc_service_register(device_name, &service_id);
         if (rc != EOK) {
-                printf(NAME ": Unable to register device '%s'.\n",
-                        device_name);
+                printf("%s: Unable to register device '%s'.\n",
+                    NAME, device_name);
                 return rc;
         }
-
-        printf(NAME ": Accepting connections\n");
+        
+        printf("%s: Accepting connections\n", NAME);
         task_retval(0);
         async_manager();
-
+        
         /* Not reached */
         return 0;
@@ -139 +139 @@
 static int file_bd_init(const char *fname)
 {
-        int rc;
-        long img_size;
-        
         async_set_client_connection(file_bd_connection);
-        rc = loc_server_register(NAME);
-        if (rc < 0) {
-                printf(NAME ": Unable to register driver.\n");
+        int rc = loc_server_register(NAME);
+        if (rc != EOK) {
+                printf("%s: Unable to register driver.\n", NAME);
                 return rc;
         }
-
+        
         img = fopen(fname, "rb+");
         if (img == NULL)
                 return EINVAL;
-
+        
         if (fseek(img, 0, SEEK_END) != 0) {
                 fclose(img);
                 return EIO;
         }
-
-        img_size = ftell(img);
+        
+        off64_t img_size = ftell(img);
         if (img_size < 0) {
                 fclose(img);
                 return EIO;
         }
-
+        
         num_blocks = img_size / block_size;
-
+        
         fibril_mutex_initialize(&dev_lock);
-
+        
         return EOK;
 }

uspace/srv/bd/gxe_bd/gxe_bd.c

@@ -122 +122 @@
 static int gxe_bd_init(void)
 {
+        async_set_client_connection(gxe_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, i;
-        char name[16];
-        
-        async_set_client_connection(gxe_bd_connection);
-        rc = loc_server_register(NAME);
-        if (rc < 0) {
-                printf(NAME ": Unable to register driver.\n");
-                return rc;
-        }
-
         rc = pio_enable((void *) dev_physical, sizeof(gxe_bd_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;
         }
-
+        
         dev = vaddr;
-
-        for (i = 0; i < MAX_DISKS; i++) {
-                snprintf(name, 16, "%s/disk%d", NAMESPACE, i);
+        
+        for (unsigned int i = 0; i < MAX_DISKS; i++) {
+                char name[16];
+                
+                snprintf(name, 16, "%s/disk%u", NAMESPACE, i);
                 rc = loc_service_register(name, &service_id[i]);
                 if (rc != EOK) {
-                        printf(NAME ": Unable to register device %s.\n", name);
+                        printf("%s: Unable to register device %s.\n", NAME,
+                            name);
                         return rc;
                 }
+                
                 fibril_mutex_initialize(&dev_lock[i]);
         }
-
+        
         return EOK;
 }

uspace/srv/bd/part/guid_part/guid_part.c

@@ -170 +170 @@
                 return rc;
         }
-
+        
         /*
          * Create partition devices.

uspace/srv/bd/rd/rd.c

@@ -237 +237 @@
         async_set_client_connection(rd_connection);
         ret = loc_server_register(NAME);
-        if (ret < 0) {
+        if (ret != EOK) {
                 printf("%s: Unable to register driver (%d)\n", NAME, ret);
                 return false;