Changeset b5e68c8 in mainline for uspace/app/bdsh/cmds/modules/bdd/bdd.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/app/bdsh/cmds/modules/bdd/bdd.c (modified) (5 diffs)

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

@@ -30 +30 @@
 #include <stdlib.h>
 #include <str.h>
+#include <sys/typefmt.h>
 #include "config.h"
 #include "util.h"
@@ -68 +69 @@
         unsigned int argc;
         unsigned int i, j;
-        dev_handle_t handle;
+        devmap_handle_t handle;
+        aoff64_t offset;
         uint8_t *blk;
         size_t size, bytes, rows;
@@ -119 +121 @@
         }
 
+        offset = ba * block_size;
+
         while (size > 0) {
                 rc = block_read_direct(handle, ba, 1, blk);
                 if (rc != EOK) {
-                        printf("%s: Error reading block %llu\n", cmdname, ba);
+                        printf("%s: Error reading block %" PRIuOFF64 "\n", cmdname, ba);
                         free(blk);
                         block_fini(handle);
@@ -132 +136 @@
 
                 for (j = 0; j < rows; j++) {
+                        printf("[%06" PRIxOFF64 "] ", offset);
                         for (i = 0; i < BPR; i++) {
                                 if (j * BPR + i < bytes)
@@ -151 +156 @@
                                 }
                         }
+                        offset += BPR;
                         putchar('\n');
                 }