Changeset 6843a9c in mainline for uspace/lib/c/include/device/hw_res_parsed.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_parsed.h (modified) (2 diffs)

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

@@ -78 +78 @@
 
         /** Array of channels */
-        int *channels;
+        unsigned int *channels;
 } dma_list_t;
 
@@ -101 +101 @@
         irq_list_t irqs;
 
+        /** List of DMA channels */
+        dma_list_t dma_channels;
+        
         /** List of DMA channels */
         dma_list_t dma_channels;