Changeset f6b5593 in mainline for uspace/app/bdsh/cmds/modules/bdd/bdd.c

Timestamp:

2009-09-21T11:53:03Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4098e38

Parents:

2f636b6 (diff), c1618ed (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/app/bdsh/cmds/modules/bdd/bdd.c (modified) (6 diffs)

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

@@ -42 +42 @@
 #include <assert.h>
 
-#define BLOCK_SIZE      512
-#define BPR              16
+enum {
+        /* Number of bytes per row */
+        BPR = 16
+};
 
 static const char *cmdname = "bdd";
@@ -67 +69 @@
         unsigned int i, j;
         dev_handle_t handle;
-        block_t *block;
         uint8_t *blk;
         size_t size, bytes, rows;
+        size_t block_size;
         int rc;
-        bn_t boff;
+        bn_t ba;
         uint8_t b;
 
@@ -83 +85 @@
 
         if (argc >= 3)
-                boff = strtol(argv[2], NULL, 0);
+                ba = strtol(argv[2], NULL, 0);
         else
-                boff = 0;
+                ba = 0;
 
         if (argc >= 4)
@@ -94 +96 @@
         rc = devmap_device_get_handle(argv[1], &handle, 0);
         if (rc != EOK) {
-                printf("Error: could not resolve device `%s'.\n", argv[1]);
+                printf("%s: Error resolving device `%s'.\n", cmdname, argv[1]);
                 return CMD_FAILURE;
         }
 
-        rc = block_init(handle, BLOCK_SIZE);
+        rc = block_init(handle, 2048);
         if (rc != EOK)  {
-                printf("Error: could not init libblock.\n");
+                printf("%s: Error initializing libblock.\n", cmdname);
                 return CMD_FAILURE;
         }
 
-        rc = block_cache_init(handle, BLOCK_SIZE, 2, CACHE_MODE_WB);
+        rc = block_get_bsize(handle, &block_size);
         if (rc != EOK) {
-                printf("Error: could not init block cache.\n");
+                printf("%s: Error determining device block size.\n", cmdname);
+                return CMD_FAILURE;
+        }
+
+        blk = malloc(block_size);
+        if (blk == NULL) {
+                printf("%s: Error allocating memory.\n", cmdname);
+                block_fini(handle);
                 return CMD_FAILURE;
         }
 
         while (size > 0) {
-                rc = block_get(&block, handle, boff, 0);
+                rc = block_read_direct(handle, ba, 1, blk);
                 if (rc != EOK) {
-                        printf("Error: could not get block %u, device %u.\n",
-                            boff, handle);
+                        printf("%s: Error reading block %llu\n", cmdname, ba);
+                        free(blk);
+                        block_fini(handle);
                         return CMD_FAILURE;
                 }
-                blk = (uint8_t *) block->data;
 
-                bytes = (size < BLOCK_SIZE) ? size : BLOCK_SIZE;
+                bytes = (size < block_size) ? size : block_size;
                 rows = (bytes + BPR - 1) / BPR;
 
@@ -145 +154 @@
                 }
 
-                rc = block_put(block);
-                if (rc != EOK) {
-                        printf("Error: could not put block %p.\n",
-                            block);
-                        return CMD_FAILURE;
-                }
-
                 if (size > rows * BPR)
                         size -= rows * BPR;
@@ -157 +159 @@
                         size = 0;
 
-                boff += rows * BPR;
+                /* Next block */
+                ba += 1;
         }
 
+        free(blk);
         block_fini(handle);