Changeset 03362fbd in mainline for uspace/drv/bus/isa/i8237.c

Timestamp:

2013-02-09T23:14:45Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

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

uspace/drv/bus/isa/i8237.c

@@ -36 +36 @@
 
 #include <assert.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <ddi.h>
 #include <ddf/log.h>
 #include <fibril_synch.h>
-#include <libarch/ddi.h>
+#include <ddi.h>
+#include <ddf/log.h>
 #include "i8237.h"
 
@@ -370 +371 @@
         }
         
-        ddf_msg(LVL_DEBUG, "Unspoiled address: %p and size: %zu.", pa, size);
-        
         /* 16 bit transfers are a bit special */
+        ddf_msg(LVL_DEBUG, "Unspoiled address %#" PRIx32 " (size %" PRIu16 ")",
+            pa, size);
         if (is_dma16(channel)) {
                 /* Size must be aligned to 16 bits */
@@ -387 +388 @@
         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 */