Changeset 46c20c8 in mainline for uspace/srv/bd/file_bd/file_bd.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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) (4 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -57 +57 @@
 
 static const size_t block_size = 512;
-static bn_t num_blocks;
+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;
 
@@ -82 +82 @@
                 return -1;
 
-        rc = devmap_device_register(argv[2], &dev_handle);
+        rc = devmap_device_register(argv[2], &devmap_handle);
         if (rc != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);
@@ -210 +210 @@
         /* Check whether access is within device address bounds. */
         if (ba + cnt > num_blocks) {
-                printf(NAME ": Accessed blocks %" PRIuBN "-%" PRIuBN ", while "
-                    "max block number is %" PRIuBN ".\n", ba, ba + cnt - 1,
+                printf(NAME ": Accessed blocks %" PRIuOFF64 "-%" PRIuOFF64 ", while "
+                    "max block number is %" PRIuOFF64 ".\n", ba, ba + cnt - 1,
                     num_blocks - 1);
                 return ELIMIT;
@@ -248 +248 @@
         /* Check whether access is within device address bounds. */
         if (ba + cnt > num_blocks) {
-                printf(NAME ": Accessed blocks %" PRIuBN "-%" PRIuBN ", while "
-                    "max block numeber is %" PRIuBN ".\n", ba, ba + cnt - 1,
+                printf(NAME ": Accessed blocks %" PRIuOFF64 "-%" PRIuOFF64 ", while "
+                    "max block number is %" PRIuOFF64 ".\n", ba, ba + cnt - 1,
                     num_blocks - 1);
                 return ELIMIT;