Changeset 3b3e776 in mainline for uspace/srv/bd/part/mbr_part/mbr_part.c

Timestamp:

2010-02-05T10:57:50Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

0358da0

Parents:

3f085132 (diff), b4cbef1 (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:

merged with head

File:

• uspace/srv/bd/part/mbr_part/mbr_part.c (moved) (moved from uspace/srv/part/mbr_part/mbr_part.c ) (7 diffs)

uspace/srv/bd/part/mbr_part/mbr_part.c

@@ -61 +61 @@
 #include <async.h>
 #include <as.h>
-#include <fibril_sync.h>
+#include <fibril_synch.h>
 #include <devmap.h>
 #include <sys/types.h>
+#include <sys/typefmt.h>
+#include <inttypes.h>
 #include <libblock.h>
 #include <devmap.h>
@@ -247 +249 @@
                 size_mb = (part->length * block_size + 1024 * 1024 - 1)
                     / (1024 * 1024);
-                printf(NAME ": Registered device %s: %llu blocks %llu MB.\n",
-                    name, part->length, size_mb);
+                printf(NAME ": Registered device %s: %" PRIuBN " blocks "
+                    "%" PRIu64 " MB.\n", name, part->length, size_mb);
 
                 part->dev = dev;
@@ -274 +276 @@
         if (brb == NULL) {
                 printf(NAME ": Failed allocating memory.\n");
-                return ENOMEM;  
+                return ENOMEM;
         }
 
@@ -289 +291 @@
         sgn = uint16_t_le2host(brb->signature);
         if (sgn != BR_SIGNATURE) {
-                printf(NAME ": Invalid boot record signature 0x%04X.\n", sgn);
+                printf(NAME ": Invalid boot record signature 0x%04" PRIX16
+                    ".\n", sgn);
                 return EINVAL;
         }
@@ -333 +336 @@
                 rc = block_read_direct(indev_handle, ba, 1, brb);
                 if (rc != EOK) {
-                        printf(NAME ": Failed reading EBR block at %u.\n", ba);
+                        printf(NAME ": Failed reading EBR block at %"
+                            PRIu32 ".\n", ba);
                         return rc;
                 }
@@ -339 +343 @@
                 sgn = uint16_t_le2host(brb->signature);
                 if (sgn != BR_SIGNATURE) {
-                        printf(NAME ": Invalid boot record signature 0x%04X "
-                            " in EBR at %u.\n", sgn, ba);
+                        printf(NAME ": Invalid boot record signature 0x%04"
+                            PRIX16 " in EBR at %" PRIu32 ".\n", sgn, ba);
                         return EINVAL;
                 }
@@ -463 +467 @@
                         ipc_answer_1(callid, EOK, block_size);
                         continue;
-
+                case BD_GET_NUM_BLOCKS:
+                        ipc_answer_2(callid, EOK, LOWER32(part->length),
+                            UPPER32(part->length));
+                        continue;
                 default:
                         retval = EINVAL;