Changeset a9bbe48d in mainline for uspace/srv

Timestamp:

2010-01-27T22:23:50Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e7aa9f4

Parents:

95e6c4f (diff), 1ccafee (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 formatting macros for userspace.

Location:

uspace/srv

Files:

• bd/ata_bd/ata_bd.c (modified) (3 diffs)
• bd/part/guid_part/guid_part.c (modified) (2 diffs)
• bd/part/mbr_part/mbr_part.c (modified) (6 diffs)
• loader/elf_load.c (modified) (4 diffs)
• loader/main.c (modified) (1 diff)
• taskmon/taskmon.c (modified) (2 diffs)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -59 +59 @@
 #include <devmap.h>
 #include <sys/types.h>
+#include <inttypes.h>
 #include <errno.h>
 #include <bool.h>
@@ -112 +113 @@
         printf(NAME ": ATA disk driver\n");
 
-        printf("I/O address 0x%p/0x%p\n", ctl_physical, cmd_physical);
+        printf("I/O address %p/%p\n", ctl_physical, cmd_physical);
 
         if (ata_bd_init() != EOK)
@@ -180 +181 @@
         }
 
-        printf(" %llu blocks", d->blocks, d->blocks / (2 * 1024));
+        printf(" %" PRIu64 " blocks", d->blocks, d->blocks / (2 * 1024));
 
         mbytes = d->blocks / (2 * 1024);
         if (mbytes > 0)
-                printf(" %llu MB.", mbytes);
+                printf(" %" PRIu64 " MB.", mbytes);
 
         printf("\n");

uspace/srv/bd/part/guid_part/guid_part.c

@@ -54 +54 @@
 #include <devmap.h>
 #include <sys/types.h>
+#include <sys/typefmt.h>
+#include <inttypes.h>
 #include <libblock.h>
 #include <devmap.h>
@@ -196 +198 @@
                 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: %" PRIu64 " blocks "
+                    "%" PRIuBN " MB.\n", name, part->length, size_mb);
 
                 part->dev = dev;

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

@@ -64 +64 @@
 #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;
                 }

uspace/srv/loader/elf_load.c

@@ -342 +342 @@
         seg_ptr = (void *) seg_addr;
 
-        DPRINTF("Load segment at addr 0x%x, size 0x%x\n", seg_addr,
-                entry->p_memsz);        
+        DPRINTF("Load segment at addr %p, size 0x%x\n", seg_addr,
+                entry->p_memsz);
 
         if (entry->p_align > 1) {
@@ -370 +370 @@
         mem_sz = entry->p_memsz + (entry->p_vaddr - base);
 
-        DPRINTF("Map to seg_addr=0x%x-0x%x.\n", seg_addr,
+        DPRINTF("Map to seg_addr=%p-%p.\n", seg_addr,
         entry->p_vaddr + bias + ALIGN_UP(entry->p_memsz, PAGE_SIZE));
 
@@ -384 +384 @@
         }
 
-        DPRINTF("as_area_create(0x%lx, 0x%x, %d) -> 0x%lx\n",
+        DPRINTF("as_area_create(%p, 0x%x, %d) -> 0x%lx\n",
                 base + bias, mem_sz, flags, (uintptr_t)a);
 
@@ -461 +461 @@
                 elf->info->dynamic =
                     (void *)((uint8_t *)entry->sh_addr + elf->bias);
-                DPRINTF("Dynamic section found at 0x%x.\n",
+                DPRINTF("Dynamic section found at %p.\n",
                         (uintptr_t)elf->info->dynamic);
                 break;

uspace/srv/loader/main.c

@@ -392 +392 @@
                 /* Dynamically linked program */
                 DPRINTF("Run ELF interpreter.\n");
-                DPRINTF("Entry point: 0x%lx\n", interp_info.entry);
+                DPRINTF("Entry point: %p\n", interp_info.entry);
                 
                 ipc_answer_0(rid, EOK);

uspace/srv/taskmon/taskmon.c

@@ -39 +39 @@
 #include <async.h>
 #include <ipc/services.h>
+#include <sys/typefmt.h>
 #include <task.h>
 #include <event.h>
@@ -60 +61 @@
         thread = IPC_GET_ARG3(*call);
 
-        if (asprintf(&s_taskid, "%lld", taskid) < 0) {
+        if (asprintf(&s_taskid, "%" PRIuTASKID, taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
         }
 
-        if (asprintf(&dump_fname, "/scratch/d%lld.txt", taskid) < 0) {
+        if (asprintf(&dump_fname, "/scratch/d" PRIuTASKID ".txt", taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
         }
 
-        printf(NAME ": Task %lld fault in thread 0x%lx.\n", taskid, thread);
+        printf(NAME ": Task %" PRIuTASKID " fault in thread %p.\n", taskid, thread);
 
 #ifdef CONFIG_VERBOSE_DUMPS