Changeset 991f645 in mainline for uspace/srv/bd

Timestamp:

2010-11-18T17:39:28Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0b5a4131

Parents:

51a268f

Message:

Rename dev_handle_t to devmap_handle_t and make it explicitly clear that
dev_handle_t is a handle understood by devmap.

Location:

uspace/srv/bd

Files:

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

uspace/srv/bd/ata_bd/ata_bd.c

@@ -139 +139 @@
                 
                 snprintf(name, 16, "%s/disk%d", NAMESPACE, i);
-                rc = devmap_device_register(name, &disk[i].dev_handle);
+                rc = devmap_device_register(name, &disk[i].devmap_handle);
                 if (rc != EOK) {
                         devmap_hangup_phone(DEVMAP_DRIVER);
@@ -229 +229 @@
         ipc_call_t call;
         ipcarg_t method;
-        dev_handle_t dh;
+        devmap_handle_t dh;
         int flags;
         int retval;
@@ -242 +242 @@
         disk_id = -1;
         for (i = 0; i < MAX_DISKS; i++)
-                if (disk[i].dev_handle == dh)
+                if (disk[i].devmap_handle == dh)
                         disk_id = i;
 

uspace/srv/bd/ata_bd/ata_bd.h

@@ -287 +287 @@
 
         fibril_mutex_t lock;
-        dev_handle_t dev_handle;
+        devmap_handle_t devmap_handle;
 } disk_t;
 

uspace/srv/bd/file_bd/file_bd.c

@@ -60 +60 @@
 static FILE *img;
 
-static dev_handle_t dev_handle;
+static devmap_handle_t devmap_handle;
 static fibril_mutex_t dev_lock;
 
@@ -82 +82 @@
                 return -1;
 
-        rc = devmap_device_register(argv[2], &dev_handle);
+        rc = devmap_device_register(argv[2], &devmap_handle);
         if (rc != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);

uspace/srv/bd/gxe_bd/gxe_bd.c

@@ -93 +93 @@
 static gxe_bd_t *dev;
 
-static dev_handle_t dev_handle[MAX_DISKS];
+static devmap_handle_t devmap_handle[MAX_DISKS];
 
 static fibril_mutex_t dev_lock[MAX_DISKS];
@@ -143 +143 @@
         for (i = 0; i < MAX_DISKS; i++) {
                 snprintf(name, 16, "%s/disk%d", NAMESPACE, i);
-                rc = devmap_device_register(name, &dev_handle[i]);
+                rc = devmap_device_register(name, &devmap_handle[i]);
                 if (rc != EOK) {
                         devmap_hangup_phone(DEVMAP_DRIVER);
@@ -161 +161 @@
         ipc_call_t call;
         ipcarg_t method;
-        dev_handle_t dh;
+        devmap_handle_t dh;
         int flags;
         int retval;
@@ -174 +174 @@
         disk_id = -1;
         for (i = 0; i < MAX_DISKS; i++)
-                if (dev_handle[i] == dh)
+                if (devmap_handle[i] == dh)
                         disk_id = i;
 

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

@@ -83 +83 @@
         aoff64_t length;
         /** Device representing the partition (outbound device) */
-        dev_handle_t dev;
+        devmap_handle_t dev;
         /** Points to next partition structure. */
         struct part *next;
@@ -91 +91 @@
 
 /** Partitioned device (inbound device) */
-static dev_handle_t indev_handle;
+static devmap_handle_t indev_handle;
 
 /** List of partitions. This structure is an empty head. */
@@ -130 +130 @@
         int i;
         char *name;
-        dev_handle_t dev;
+        devmap_handle_t dev;
         uint64_t size_mb;
         part_t *part;
@@ -316 +316 @@
         ipc_call_t call;
         ipcarg_t method;
-        dev_handle_t dh;
+        devmap_handle_t dh;
         int flags;
         int retval;

uspace/srv/bd/part/mbr_part/mbr_part.c

@@ -101 +101 @@
         aoff64_t length;
         /** Device representing the partition (outbound device) */
-        dev_handle_t dev;
+        devmap_handle_t dev;
         /** Points to next partition structure. */
         struct part *next;
@@ -142 +142 @@
 
 /** Partitioned device (inbound device) */
-static dev_handle_t indev_handle;
+static devmap_handle_t indev_handle;
 
 /** List of partitions. This structure is an empty head. */
@@ -181 +181 @@
         int i;
         char *name;
-        dev_handle_t dev;
+        devmap_handle_t dev;
         uint64_t size_mb;
         part_t *part;
@@ -394 +394 @@
         ipc_call_t call;
         ipcarg_t method;
-        dev_handle_t dh;
+        devmap_handle_t dh;
         int flags;
         int retval;

uspace/srv/bd/rd/rd.c

@@ -238 +238 @@
         }
         
-        dev_handle_t dev_handle;
-        if (devmap_device_register("bd/initrd", &dev_handle) != EOK) {
+        devmap_handle_t devmap_handle;
+        if (devmap_device_register("bd/initrd", &devmap_handle) != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);
                 printf("%s: Unable to register device\n", NAME);