Changeset 33fee91 in mainline for uspace/drv/bus/isa/i8237.c

Timestamp:

2012-08-31T07:35:27Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a3da2b2

Parents:

72cf064 (diff), 0d57c3e (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/bus/isa/i8237.c (modified) (2 diffs)

uspace/drv/bus/isa/i8237.c

@@ -351 +351 @@
         
         /* 16 bit transfers are a bit special */
-        ddf_msg(LVL_DEBUG, "Unspoiled address: %p and size: %zu.", pa, size);
+        ddf_msg(LVL_DEBUG, "Unspoiled address %#" PRIx32 " (size %" PRIu16 ")",
+            pa, size);
         if (channel > 4) {
                 /* Size must be aligned to 16 bits */
@@ -367 +368 @@
         const dma_channel_t dma_channel = controller_8237.channels[channel];
         
-        ddf_msg(LVL_DEBUG, "Setting channel %u, to address %p(%zu), mode %hhx.",
-            channel, pa, size, mode);
+        ddf_msg(LVL_DEBUG, "Setting channel %u to address %#" PRIx32 " "
+            "(size %" PRIu16 "), mode %hhx.", channel, pa, size, mode);
         
         /* Mask DMA request */