Changeset fe2333d in mainline for uspace/drv/isa/isa.c

Timestamp:

2010-12-09T00:08:57Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0a5a950

Parents:

07b9203e (diff), c01f8e6 (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

File:

• uspace/drv/isa/isa.c (modified) (2 diffs)

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. */