Changeset 95c675b in mainline for uspace/drv/bus/isa/i8237.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

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

uspace/drv/bus/isa/i8237.c

@@ -371 +371 @@
         
         /* 16 bit transfers are a bit special */
-        ddf_msg(LVL_DEBUG, "Unspoiled address %#" PRIx32 " (size %" PRIu16 ")",
+        ddf_msg(LVL_DEBUG, "Unspoiled address %#" PRIx32 " (size %" PRIu32 ")",
             pa, size);
         if (is_dma16(channel)) {
@@ -388 +388 @@
         
         ddf_msg(LVL_DEBUG, "Setting channel %u to address %#" PRIx32 " "
-            "(size %" PRIu16 "), mode %hhx.", channel, pa, size, mode);
+            "(size %" PRIu32 "), mode %hhx.", channel, pa, size, mode);
         
         /* Mask DMA request */