Changeset ab3a851 in mainline for uspace/drv

Timestamp:

2010-11-30T00:50:25Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1b2981aa

Parents:

178673c (diff), 41a7f62 (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

Local changes: fixed printf related warnings

Location:

uspace/drv

Files:

• isa/isa.c (modified) (2 diffs)
• ns8250/ns8250.c (modified) (2 diffs)
• pciintel/pci.c (modified) (2 diffs)
• root/root.c (modified) (2 diffs)
• rootpc/rootpc.c (modified) (1 diff)
• rootvirt/rootvirt.c (modified) (1 diff)

uspace/drv/isa/isa.c

@@ -282 +282 @@
 
                 printf(NAME ": added io range (addr=0x%x, size=0x%x) to "
-                    "device %s\n", addr, len, dev->name);
+                    "device %s\n", (unsigned int) addr, (unsigned int) len,
+                    dev->name);
         }
 }
@@ -489 +490 @@
 static int isa_add_device(device_t *dev)
 {
-        printf(NAME ": isa_add_device, device handle = %d\n", dev->handle);
+        printf(NAME ": isa_add_device, device handle = %d\n",
+            (int) dev->handle);
 
         /* Add child devices. */
         add_legacy_children(dev);
-        printf(NAME ": finished the enumeration of legacy devices\n",
-            dev->handle);
+        printf(NAME ": finished the enumeration of legacy devices\n");
 
         return EOK;

uspace/drv/ns8250/ns8250.c

@@ -276 +276 @@
         if (pio_enable((void *)(uintptr_t) data->io_addr, REG_COUNT,
             (void **) &data->port)) {
-                printf(NAME ": error - cannot gain the port %lx for device "
+                printf(NAME ": error - cannot gain the port %#" PRIx32 " for device "
                     "%s.\n", data->io_addr, dev->name);
                 return false;
@@ -727 +727 @@
 {
         printf(NAME ": ns8250_add_device %s (handle = %d)\n",
-            dev->name, dev->handle);
+            dev->name, (int) dev->handle);
         
         int res = ns8250_dev_initialize(dev);

uspace/drv/pciintel/pci.c

@@ -323 +323 @@
         if (range_addr != 0) {
                 printf(NAME ": device %s : ", dev->name);
-                printf("address = %x", range_addr);
-                printf(", size = %x\n", range_size);
+                printf("address = %" PRIx64, range_addr);
+                printf(", size = %x\n", (unsigned int) range_size);
         }
         
@@ -479 +479 @@
         }       
         
-        printf(NAME ": conf_addr = %x.\n",
+        printf(NAME ": conf_addr = %" PRIx64 ".\n",
             hw_resources.resources[0].res.io_range.address);
         

uspace/drv/root/root.c

@@ -46 +46 @@
 #include <ctype.h>
 #include <macros.h>
+#include <inttypes.h>
 
 #include <driver.h>
@@ -115 +116 @@
 static int root_add_device(device_t *dev)
 {
-        printf(NAME ": root_add_device, device handle = %d\n", dev->handle);
+        printf(NAME ": root_add_device, device handle=%" PRIun "\n",
+            dev->handle);
         
         /*

uspace/drv/rootpc/rootpc.c

@@ -177 +177 @@
 static int rootpc_add_device(device_t *dev)
 {
-        printf(NAME ": rootpc_add_device, device handle = %d\n", dev->handle);
+        printf(NAME ": rootpc_add_device, device handle = %d\n",
+            (int)dev->handle);
         
         /* Register child devices. */

uspace/drv/rootvirt/rootvirt.c

@@ -110 +110 @@
 
         printf(NAME ": add_device(name=\"%s\", handle=%d)\n",
-            dev->name, dev->handle);
+            dev->name, (int)dev->handle);
         
         /*