Changeset e0f9950 in mainline

Timestamp:

2011-10-21T13:59:19Z (13 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.

Location:

uspace/drv/audio/sb16

Files:

• dma.h (modified) (2 diffs)
• dma_controller.c (modified) (5 diffs)
• main.c (modified) (7 diffs)

uspace/drv/audio/sb16/dma.h

@@ -60 +60 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Physical mallocator simulator
+/** DMA mallocator simulator
  *
  * @param[in] size Size of the required memory space
- * @return Address of the alligned and big enough memory place, NULL on failure.
+ * @return Address of the aligned and big enough memory place, NULL on failure.
  */
 static inline void * malloc24(size_t size)
@@ -79 +79 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Physical mallocator simulator
+/** DMA mallocator simulator
  *
- * @param[in] addr Address of the place allocated by malloc32
+ * @param[in] addr Address of the place allocated by malloc24
  */
 static inline void free24(void *addr)

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

uspace/drv/audio/sb16/main.c

@@ -51 +51 @@
 static int sb_get_res(const ddf_dev_t *device, uintptr_t *sb_regs,
     size_t *sb_regs_size, uintptr_t *mpu_regs, size_t *mpu_regs_size, int *irq);
+static int sb_enable_interrupts(ddf_dev_t *device);
 /*----------------------------------------------------------------------------*/
 static driver_ops_t sb_driver_ops = {
@@ -89 +90 @@
 static int sb_add_device(ddf_dev_t *device)
 {
-#define CHECK_RET_FREE_RETURN(ret, msg...) \
+#define CHECK_RET_RETURN(ret, msg...) \
 if (ret != EOK) { \
-        free(soft_state); \
         ddf_log_error(msg); \
         return ret; \
@@ -98 +98 @@
         assert(device);
 
-        sb16_drv_t *soft_state = malloc(sizeof(sb16_drv_t));
+        sb16_drv_t *soft_state = ddf_dev_data_alloc(device, sizeof(sb16_drv_t));
         int ret = soft_state ? EOK : ENOMEM;
-        CHECK_RET_FREE_RETURN(ret, "Failed to allocate sb16 structure.\n");
+        CHECK_RET_RETURN(ret, "Failed to allocate sb16 structure.\n");
 
         uintptr_t sb_regs = 0, mpu_regs = 0;
@@ -108 +108 @@
         ret = sb_get_res(device, &sb_regs, &sb_regs_size, &mpu_regs,
             &mpu_regs_size, &irq);
-        CHECK_RET_FREE_RETURN(ret,
+        CHECK_RET_RETURN(ret,
             "Failed to get resources: %s.\n", str_error(ret));
 
         irq_code_t *irq_code = sb16_irq_code();
         ret = register_interrupt_handler(device, irq, irq_handler, irq_code);
-        CHECK_RET_FREE_RETURN(ret,
+        CHECK_RET_RETURN(ret,
             "Failed to register irq handler: %s.\n", str_error(ret));
+
 
         ddf_fun_t *dsp_fun = NULL, *mixer_fun = NULL;
@@ -124 +125 @@
         if (mixer_fun) \
                 ddf_fun_destroy(mixer_fun); \
-        free(soft_state); \
         unregister_interrupt_handler(device, irq); \
         return ret; \
 } else (void)0
+
+        ret = sb_enable_interrupts(device);
+        CHECK_RET_UNREG_DEST_RETURN(ret, "Failed to enable interrupts: %s.\n",
+            str_error(ret));
+
         dsp_fun = ddf_fun_create(device, fun_exposed, "dsp");
         ret = dsp_fun ? EOK : ENOMEM;
@@ -144 +149 @@
         CHECK_RET_UNREG_DEST_RETURN(ret,
             "Failed to bind dsp function: %s.\n", str_error(ret));
-        dsp_fun->driver_data = soft_state;
 
         ret = ddf_fun_bind(mixer_fun);
         CHECK_RET_UNREG_DEST_RETURN(ret,
             "Failed to bind mixer function: %s.\n", str_error(ret));
+
+        /* Everything's OK assign driver_data. */
         mixer_fun->driver_data = soft_state;
-
+        dsp_fun->driver_data = soft_state;
 
         ret = sb16_init_mpu(soft_state, (void*)mpu_regs, mpu_regs_size);
@@ -224 +230 @@
         return EOK;
 }
+/*----------------------------------------------------------------------------*/
+int sb_enable_interrupts(ddf_dev_t *device)
+{
+        async_sess_t *parent_sess =
+            devman_parent_device_connect(EXCHANGE_SERIALIZE, device->handle,
+            IPC_FLAG_BLOCKING);
+        if (!parent_sess)
+                return ENOMEM;
+
+        bool enabled = hw_res_enable_interrupt(parent_sess);
+        async_hangup(parent_sess);
+
+        return enabled ? EOK : EIO;
+}
 /**
  * @}
  */
-