Changeset e0f9950 in mainline for uspace/drv/audio/sb16/dma_controller.c

Timestamp:

2011-10-21T13:59:19Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1a11a16

Parents:

aa5ae788

Message:

sb16: Enable interrupts during initialization.

Fix possible double free on error paths.
Minor dma changes.

File:

• uspace/drv/audio/sb16/dma_controller.c (modified) (5 diffs)

uspace/drv/audio/sb16/dma_controller.c

@@ -157 +157 @@
 } dma_controller_t;
 
-dma_controller_t controller_8237 = {
+static const dma_controller_t controller_8237 = {
         .channel = {
             { (uint8_t*)0x00, (uint8_t*)0x01, (uint8_t*)0x87 },
@@ -172 +172 @@
 };
 
-static inline dma_controller_t *dma_controller_init()
+static inline const dma_controller_t *dma_controller_init()
 {
         int ret = pio_enable(DMA_CONTROLLER_PAGE_BASE, sizeof(dma_page_regs_t),
@@ -193 +193 @@
 }
 /*----------------------------------------------------------------------------*/
-static int dma_setup_channel_8bit(dma_controller_t *controller,
+static int dma_setup_channel_8bit(const dma_controller_t *controller,
     unsigned channel, uint32_t pa, uint16_t size)
 {
@@ -237 +237 @@
 }
 /*----------------------------------------------------------------------------*/
-static int dma_setup_channel_16bit(dma_controller_t *controller,
+static int dma_setup_channel_16bit(const dma_controller_t *controller,
     unsigned channel, uintptr_t pa, size_t size)
 {
@@ -283 +283 @@
 int dma_setup_channel(unsigned channel, uintptr_t pa, size_t size)
 {
-        static dma_controller_t *controller = NULL;
+        static const dma_controller_t *controller = NULL;
         if (!controller)
                 controller = dma_controller_init();