Changeset d9cf684a in mainline for uspace/lib/c

Timestamp:

2011-12-22T14:10:31Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

fe5e9629

Parents:

a438de48

Message:

cherrypick and adopt Intel 8237A DMA controller support from bzr://krabicka.net/orome/helenos/audio/

Location:

uspace/lib/c/include/device

Files:

• hw_res.h (modified) (4 diffs)
• hw_res_parsed.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 {
         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
 

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

@@ -72 +72 @@
 } irq_list_t;
 
+/** List of ISA DMA channels */
+typedef struct dma_list {
+        /** Channel count */
+        size_t count;
+
+        /** Array of channels */
+        unsigned int *channels;
+} dma_list_t;
+
 /** List of memory areas */
 typedef struct addr_range_list {
@@ -91 +100 @@
         /** List of IRQs */
         irq_list_t irqs;
+        
+        /** List of DMA channels */
+        dma_list_t dma_channels;
         
         /** List of memory areas */
@@ -113 +125 @@
         free(list->io_ranges.ranges);
         free(list->mem_ranges.ranges);
+        free(list->dma_channels.channels);
         
         bzero(list, sizeof(hw_res_list_parsed_t));