Changeset 03bc76a in mainline for uspace/app/mkminix/mkminix.c

Timestamp:

2011-09-04T12:33:10Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

c699b0c

Parents:

8ff0bd2

Message:

Get rid of VFS_OUT method switch and IPC unmarshalling

File:

• uspace/app/mkminix/mkminix.c (modified) (9 diffs)

uspace/app/mkminix/mkminix.c

@@ -97 +97 @@
 static inline int write_block(aoff64_t off, size_t size, const void *data);
 
-static devmap_handle_t handle;
+static service_id_t service_id;
 static int shift;
 
@@ -201 +201 @@
         }
 
-        rc = devmap_device_get_handle(device_name, &handle, 0);
+        rc = loc_service_get_id(device_name, &service_id, 0);
         if (rc != EOK) {
                 printf(NAME ": Error resolving device `%s'.\n", device_name);
@@ -207 +207 @@
         }
 
-        rc = block_init(EXCHANGE_SERIALIZE, handle, 2048);
+        rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
         if (rc != EOK)  {
                 printf(NAME ": Error initializing libblock.\n");
@@ -213 +213 @@
         }
 
-        rc = block_get_bsize(handle, &devblock_size);
+        rc = block_get_bsize(service_id, &devblock_size);
         if (rc != EOK) {
                 printf(NAME ": Error determining device block size.\n");
@@ -219 +219 @@
         }
 
-        rc = block_get_nblocks(handle, &sb.dev_nblocks);
+        rc = block_get_nblocks(service_id, &sb.dev_nblocks);
         if (rc != EOK) {
                 printf(NAME ": Warning, failed to obtain block device size.\n");
@@ -271 +271 @@
                 return 2;
         }
+
+        block_fini(service_id);
 
         return 0;
@@ -600 +602 @@
         sb->s_disk_version = 3;
 
-        rc = block_write_direct(handle, MFS_SUPERBLOCK << 1, 1 << 1, sb); 
+        rc = block_write_direct(service_id, MFS_SUPERBLOCK << 1, 1 << 1, sb);
         free(sb);
 
@@ -690 +692 @@
                 uint8_t *data_ptr = (uint8_t *) data;
 
-                rc = block_write_direct(handle, tmp_off << 2, size << 2, data_ptr);
+                rc = block_write_direct(service_id, tmp_off << 2, size << 2, data_ptr);
 
                 if (rc != EOK)
@@ -698 +700 @@
                 tmp_off++;
 
-                return block_write_direct(handle, tmp_off << 2, size << 2, data_ptr);
-        }
-        return block_write_direct(handle, off << shift, size << shift, data);   
+                return block_write_direct(service_id, tmp_off << 2, size << 2, data_ptr);
+        }
+        return block_write_direct(service_id, off << shift, size << shift, data);
 }