Changeset 7943c43 in mainline for uspace/lib/c/include/device/hw_res.h

Timestamp:

2012-01-16T22:45:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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/lib/c/include/device/hw_res.h (modified) (4 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 {
         HW_RES_GET_RESOURCE_LIST = 0,
-        HW_RES_ENABLE_INTERRUPT
+        HW_RES_ENABLE_INTERRUPT,
+        HW_RES_DMA_CHANNEL_SETUP,
 } hw_res_method_t;
 
@@ -50 +59 @@
         INTERRUPT,
         IO_RANGE,
-        MEM_RANGE
+        MEM_RANGE,
+        DMA_CHANNEL_8,
+        DMA_CHANNEL_16,
 } hw_res_type_t;
 
@@ -77 +88 @@
                         int irq;
                 } interrupt;
+                
+                union {
+                        unsigned int dma8;
+                        unsigned int dma16;
+                } dma_channel;
         } res;
 } hw_resource_t;
@@ -98 +114 @@
 extern bool hw_res_enable_interrupt(async_sess_t *);
 
+extern int hw_res_dma_channel_setup(async_sess_t *, unsigned int, uint32_t,
+    uint16_t, uint8_t);
+
 #endif