Changeset 7e752b2 in mainline for uspace/srv/hw

Timestamp:

2010-11-26T01:33:20Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bf61d3a

Parents:

202f57b

Message:

• correct printf() formatting strings and corresponding arguments
• minor cstyle changes and other small fixes

Location:

uspace/srv/hw

Files:

• char/i8042/i8042.c (modified) (3 diffs)
• char/s3c24xx_uart/s3c24xx_uart.c (modified) (4 diffs)
• cir/fhc/fhc.c (modified) (1 diff)
• netif/dp8390/dp8390.c (modified) (1 diff)
• netif/dp8390/ne2000.c (modified) (1 diff)

uspace/srv/hw/char/i8042/i8042.c

@@ -46 +46 @@
 #include <stdio.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include "i8042.h"
@@ -201 +202 @@
         ipc_register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd);
         ipc_register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd);
-        printf("%s: registered for interrupts %d and %d\n", NAME, inr_a, inr_b);
+        printf("%s: registered for interrupts %" PRIun " and %" PRIun "\n",
+            NAME, inr_a, inr_b);
 
         wait_ready();
@@ -262 +264 @@
                         break;
                 case IPC_FIRST_USER_METHOD:
-                        printf(NAME ": write %d to devid %d\n",
+                        printf(NAME ": write %" PRIun " to devid %d\n",
                             IPC_GET_ARG1(call), dev_id);
                         i8042_port_write(dev_id, IPC_GET_ARG1(call));

uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

@@ -48 +48 @@
 #include <sysinfo.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include "s3c24xx_uart.h"
@@ -95 +96 @@
         if (rc != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);
-                printf(NAME ": Unable to register device %s.\n");
+                printf(NAME ": Unable to register device %s.\n",
+                    NAMESPACE "/" NAME);
                 return -1;
         }
@@ -134 +136 @@
                         break;
                 case CHAR_WRITE_BYTE:
-                        printf(NAME ": write %d to device\n",
+                        printf(NAME ": write %" PRIun " to device\n",
                             IPC_GET_ARG1(call));
                         s3c24xx_uart_sendb(uart, (uint8_t) IPC_GET_ARG1(call));
@@ -185 +187 @@
         uart->client_phone = -1;
 
-        printf(NAME ": device at physical address 0x%x, inr %d.\n",
-            uart->paddr, inr);
+        printf(NAME ": device at physical address %p, inr %" PRIun ".\n",
+            (void *) uart->paddr, inr);
 
         async_set_interrupt_received(s3c24xx_uart_irq_handler);

uspace/srv/hw/cir/fhc/fhc.c

@@ -129 +129 @@
         }
         
-        printf(NAME ": FHC UART registers at %p, %d bytes\n", fhc_uart_phys,
+        printf(NAME ": FHC UART registers at %p, %zu bytes\n", fhc_uart_phys,
             fhc_uart_size);
         

uspace/srv/hw/netif/dp8390/dp8390.c

@@ -1516 +1516 @@
         if (!wdeth_probe(dep) && !ne_probe(dep) && !el2_probe(dep))
         {
-                printf("%s: No ethernet card found at 0x%x\n", 
-                        dep->de_name, dep->de_base_port);
+                printf("%s: No ethernet card found at %#lx\n",
+                    dep->de_name, dep->de_base_port);
                 dep->de_mode= DEM_DISABLED;
                 return;

uspace/srv/hw/netif/dp8390/ne2000.c

@@ -267 +267 @@
         if (!debug)
         {
-                printf("%s: NE%d000 at %X:%d\n",
-                        dep->de_name, dep->de_16bit ? 2 : 1,
-                        dep->de_base_port, dep->de_irq);
+                printf("%s: NE%d000 at %#lx:%d\n",
+                    dep->de_name, dep->de_16bit ? 2 : 1,
+                    dep->de_base_port, dep->de_irq);
         }
         else
         {
                 printf("%s: Novell NE%d000 ethernet card at I/O address "
-                        "0x%X, memory size 0x%X, irq %d\n",
-                        dep->de_name, dep->de_16bit ? 2 : 1,
-                        dep->de_base_port, dep->de_ramsize, dep->de_irq);
+                    "%#lx, memory size %#lx, irq %d\n",
+                    dep->de_name, dep->de_16bit ? 2 : 1,
+                    dep->de_base_port, dep->de_ramsize, dep->de_irq);
         }
 }