Changeset b5e68c8 in mainline for uspace/srv/bd/file_bd/file_bd.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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/file_bd/file_bd.c (modified) (10 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -41 +41 @@
 #include <stdio.h>
 #include <unistd.h>
-#include <ipc/ipc.h>
 #include <ipc/bd.h>
 #include <async.h>
@@ -56 +55 @@
 #define NAME "file_bd"
 
-static const size_t block_size = 512;
+#define DEFAULT_BLOCK_SIZE 512
+
+static size_t block_size;
 static aoff64_t num_blocks;
 static FILE *img;
 
-static dev_handle_t dev_handle;
+static devmap_handle_t devmap_handle;
 static fibril_mutex_t dev_lock;
 
+static void print_usage(void);
 static int file_bd_init(const char *fname);
 static void file_bd_connection(ipc_callid_t iid, ipc_call_t *icall);
@@ -71 +73 @@
 {
         int rc;
+        char *image_name;
+        char *device_name;
 
         printf(NAME ": File-backed block device driver\n");
 
-        if (argc != 3) {
-                printf("Expected two arguments (image name, device name).\n");
+        block_size = DEFAULT_BLOCK_SIZE;
+
+        ++argv; --argc;
+        while (*argv != NULL && (*argv)[0] == '-') {
+                /* Option */
+                if (str_cmp(*argv, "-b") == 0) {
+                        if (argc < 2) {
+                                printf("Argument missing.\n");
+                                print_usage();
+                                return -1;
+                        }
+
+                        rc = str_size_t(argv[1], NULL, 10, true, &block_size);
+                        if (rc != EOK || block_size == 0) {
+                                printf("Invalid block size '%s'.\n", argv[1]);
+                                print_usage();
+                                return -1;
+                        }
+                        ++argv; --argc;
+                } else {
+                        printf("Invalid option '%s'.\n", *argv);
+                        print_usage();
+                        return -1;
+                }
+                ++argv; --argc;
+        }
+
+        if (argc < 2) {
+                printf("Missing arguments.\n");
+                print_usage();
                 return -1;
         }
 
-        if (file_bd_init(argv[1]) != EOK)
+        image_name = argv[0];
+        device_name = argv[1];
+
+        if (file_bd_init(image_name) != EOK)
                 return -1;
 
-        rc = devmap_device_register(argv[2], &dev_handle);
+        rc = devmap_device_register(device_name, &devmap_handle);
         if (rc != EOK) {
-                devmap_hangup_phone(DEVMAP_DRIVER);
-                printf(NAME ": Unable to register device %s.\n",
-                        argv[2]);
+                printf(NAME ": Unable to register device '%s'.\n",
+                        device_name);
                 return rc;
         }
@@ -96 +130 @@
         /* Not reached */
         return 0;
+}
+
+static void print_usage(void)
+{
+        printf("Usage: " NAME " [-b <block_size>] <image_file> <device_name>\n");
 }
 
@@ -136 +175 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t method;
+        sysarg_t method;
         size_t comm_size;
-        int flags;
+        unsigned int flags;
         int retval;
         uint64_t ba;
@@ -144 +183 @@
 
         /* Answer the IPC_M_CONNECT_ME_TO call. */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         if (!async_share_out_receive(&callid, &comm_size, &flags)) {
-                ipc_answer_0(callid, EHANGUP);
+                async_answer_0(callid, EHANGUP);
                 return;
         }
@@ -153 +192 @@
         fs_va = as_get_mappable_page(comm_size);
         if (fs_va == NULL) {
-                ipc_answer_0(callid, EHANGUP);
+                async_answer_0(callid, EHANGUP);
                 return;
         }
@@ -161 +200 @@
         while (1) {
                 callid = async_get_call(&call);
-                method = IPC_GET_METHOD(call);
+                method = IPC_GET_IMETHOD(call);
                 switch (method) {
                 case IPC_M_PHONE_HUNGUP:
                         /* The other side has hung up. */
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         return;
                 case BD_READ_BLOCKS:
@@ -188 +227 @@
                         break;
                 case BD_GET_BLOCK_SIZE:
-                        ipc_answer_1(callid, EOK, block_size);
+                        async_answer_1(callid, EOK, block_size);
                         continue;
                 case BD_GET_NUM_BLOCKS:
-                        ipc_answer_2(callid, EOK, LOWER32(num_blocks),
+                        async_answer_2(callid, EOK, LOWER32(num_blocks),
                             UPPER32(num_blocks));
                         continue;
@@ -198 +237 @@
                         break;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }