Changeset 6843a9c in mainline for uspace/lib/c/include/device/hw_res.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/lib/c/include/device/hw_res.h (modified) (3 diffs)

uspace/lib/c/include/device/hw_res.h

@@ -40 +40 @@
 #include <bool.h>
 
+#define DMA_MODE_ON_DEMAND  0
+#define DMA_MODE_WRITE      (1 << 2)
+#define DMA_MODE_READ       (1 << 3)
+#define DMA_MODE_AUTO       (1 << 4)
+#define DMA_MODE_DOWN       (1 << 5)
+#define DMA_MODE_SINGLE     (1 << 6)
+#define DMA_MODE_BLOCK      (1 << 7)
+
 /** HW resource provider interface */
 typedef enum {
@@ -80 +88 @@
                         int irq;
                 } interrupt;
-
+                
                 union {
-                        int dma8;
-                        int dma16;
+                        unsigned int dma8;
+                        unsigned int dma16;
                 } dma_channel;
         } res;
@@ -106 +114 @@
 extern bool hw_res_enable_interrupt(async_sess_t *);
 
-#define DMA_MODE_WRITE (1 << 2)
-#define DMA_MODE_READ (1 << 3)
-#define DMA_MODE_AUTO (1 << 4)
-#define DMA_MODE_DOWN (1 << 5)
-#define DMA_MODE_SINGLE (1 << 6)
-#define DMA_MODE_BLOCK (1 << 7)
-#define DMA_MODE_ON_DEMAND (0)
-
-extern int hw_res_dma_channel_setup(async_sess_t *,
-    unsigned, uint32_t, uint16_t, uint8_t);
+extern int hw_res_dma_channel_setup(async_sess_t *, unsigned int, uint32_t,
+    uint16_t, uint8_t);
 
 #endif