Changeset bbc28be in mainline for uspace/drv

Timestamp:

2010-12-03T12:59:13Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

70c85211

Parents:

2e15ac40 (diff), da55d5b (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 branch development into /lelian/hidd

Location:

uspace/drv

Files:

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

uspace/drv/isa/isa.c

@@ -493 +493 @@
         /* 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 *) 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;

uspace/drv/pciintel/pci.c

@@ -323 +323 @@
         if (range_addr != 0) {
                 printf(NAME ": device %s : ", dev->name);
-                printf("address = %x", range_addr);
+                printf("address = %" PRIx64, range_addr);
                 printf(", size = %x\n", 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

@@ -45 +45 @@
 #include <ctype.h>
 #include <macros.h>
+#include <inttypes.h>
 
 #include <driver.h>
@@ -180 +181 @@
 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);
         
         /* Register root device's children. */