Changeset c885a21 in mainline for uspace/drv/audio/sb16/main.c

Timestamp:

2011-11-14T12:38:50Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1269160

Parents:

1b93658

Message:

sb16: Switch to new ISA bus provided DMA controller access.

File:

• uspace/drv/audio/sb16/main.c (modified) (8 diffs)

uspace/drv/audio/sb16/main.c

@@ -50 +50 @@
 static int sb_add_device(ddf_dev_t *device);
 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);
+    size_t *sb_regs_size, uintptr_t *mpu_regs, size_t *mpu_regs_size,
+    int *irq, int *dma8, int *dma16);
 static int sb_enable_interrupts(ddf_dev_t *device);
 /*----------------------------------------------------------------------------*/
@@ -81 +82 @@
 {
         assert(dev);
-        sb16_drv_t *sb = dev->driver_data;
-        assert(sb);
-        sb16_interrupt(sb);
+        assert(dev->driver_data);
+        sb16_interrupt(dev->driver_data);
 }
 /*----------------------------------------------------------------------------*/
@@ -101 +101 @@
         assert(device);
 
-        sb16_drv_t *soft_state = ddf_dev_data_alloc(device, sizeof(sb16_drv_t));
+        sb16_t *soft_state = ddf_dev_data_alloc(device, sizeof(sb16_t));
         int ret = soft_state ? EOK : ENOMEM;
         CHECK_RET_RETURN(ret, "Failed to allocate sb16 structure.\n");
@@ -107 +107 @@
         uintptr_t sb_regs = 0, mpu_regs = 0;
         size_t sb_regs_size = 0, mpu_regs_size = 0;
-        int irq = 0;
+        int irq = 0, dma8 = 0, dma16 = 0;
 
         ret = sb_get_res(device, &sb_regs, &sb_regs_size, &mpu_regs,
-            &mpu_regs_size, &irq);
+            &mpu_regs_size, &irq, &dma8, &dma16);
         CHECK_RET_RETURN(ret,
             "Failed to get resources: %s.\n", str_error(ret));
@@ -145 +145 @@
         CHECK_RET_UNREG_DEST_RETURN(ret, "Failed to create mixer function.");
 
-        ret = sb16_init_sb16(soft_state, (void*)sb_regs, sb_regs_size);
+        ret = sb16_init_sb16(
+            soft_state, (void*)sb_regs, sb_regs_size, device, dma8, dma16);
         CHECK_RET_UNREG_DEST_RETURN(ret,
             "Failed to init sb16 driver: %s.\n", str_error(ret));
@@ -183 +184 @@
 /*----------------------------------------------------------------------------*/
 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)
+    size_t *sb_regs_size, uintptr_t *mpu_regs, size_t *mpu_regs_size,
+    int *irq, int *dma8, int *dma16)
 {
         assert(device);
@@ -191 +193 @@
         assert(mpu_regs_size);
         assert(irq);
+        assert(dma8);
+        assert(dma16);
 
         async_sess_t *parent_sess =
@@ -224 +228 @@
                         }
                         break;
+                case DMA_CHANNEL_16:
+                        *dma16 = res->res.dma_channel.dma16;
+                        ddf_log_debug("Found DMA16 channel: %d.\n", *dma16);
+                        break;
+                case DMA_CHANNEL_8:
+                        *dma8 = res->res.dma_channel.dma8;
+                        ddf_log_debug("Found DMA8 channel: %d.\n", *dma8);
                 default:
                         break;