Changeset 45f04f8 in mainline for uspace/app

Timestamp:

2010-11-18T18:23:43Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3f0a7971, a7811f17, cb569e6

Parents:

51a268f (diff), c63e70c (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 changes that aim to do a better job in differentiating between
dev_handle_t and device_handle_t, respectively, by renaming these types to
devmap_handle_t and devman_handle_t, respectively.

Location:

uspace/app

Files:

• bdsh/cmds/modules/bdd/bdd.c (modified) (1 diff)
• init/init.c (modified) (2 diffs)
• mkfat/mkfat.c (modified) (3 diffs)
• test_serial/test_serial.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/bdd/bdd.c

@@ -68 +68 @@
         unsigned int argc;
         unsigned int i, j;
-        dev_handle_t handle;
+        devmap_handle_t handle;
         uint8_t *blk;
         size_t size, bytes, rows;

uspace/app/init/init.c

@@ -185 +185 @@
         
         /* Wait for the input device to be ready */
-        dev_handle_t handle;
+        devmap_handle_t handle;
         rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
@@ -210 +210 @@
         
         /* Wait for the terminal device to be ready */
-        dev_handle_t handle;
+        devmap_handle_t handle;
         rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
         if (rc != EOK) {

uspace/app/mkfat/mkfat.c

@@ -85 +85 @@
     struct fat_params *par);
 static int fat_blocks_write(struct fat_params const *par,
-    dev_handle_t handle);
+    devmap_handle_t handle);
 static void fat_bootsec_create(struct fat_params const *par, struct fat_bs *bs);
 
@@ -95 +95 @@
         int rc;
         char *dev_path;
-        dev_handle_t handle;
+        devmap_handle_t handle;
         size_t block_size;
         char *endptr;
@@ -234 +234 @@
 
 /** Create file system with the given parameters. */
-static int fat_blocks_write(struct fat_params const *par, dev_handle_t handle)
+static int fat_blocks_write(struct fat_params const *par, devmap_handle_t handle)
 {
         aoff64_t addr;

uspace/app/test_serial/test_serial.c

@@ -69 +69 @@
         int res;
         res = devman_get_phone(DEVMAN_CLIENT, IPC_FLAG_BLOCKING);
-        device_handle_t handle;
+        devman_handle_t handle;
         
         res = devman_device_get_handle("/hw/pci0/00:01.0/com1", &handle,