Changeset 3819ce5 in mainline for uspace/lib/c/include/device/hw_res_parsed.h

Timestamp:

2011-12-25T10:05:28Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ecf823a

Parents:

1440eae (diff), 7e1b130 (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 with mainline

File:

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

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));