Changeset 7de1988c in mainline for uspace/drv/audio/sb16

Timestamp:

2013-09-12T20:53:09Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddd0499d

Parents:

8049b79

Message:

Adapt drivers using parsed HW resources to use the new interface.

Location:

uspace/drv/audio/sb16

Files:

• main.c (modified) (8 diffs)
• sb16.c (modified) (3 diffs)
• sb16.h (modified) (2 diffs)

uspace/drv/audio/sb16/main.c

@@ -49 +49 @@
 
 static int sb_add_device(ddf_dev_t *device);
-static int sb_get_res(ddf_dev_t *device, uintptr_t *sb_regs,
-    size_t *sb_regs_size, uintptr_t *mpu_regs, size_t *mpu_regs_size,
-    int *irq, int *dma8, int *dma16);
+static int sb_get_res(ddf_dev_t *device, addr_range_t **pp_sb_regs,
+    addr_range_t **pp_mpu_regs, int *irq, int *dma8, int *dma16);
 static int sb_enable_interrupts(ddf_dev_t *device);
 
@@ -103 +102 @@
         }
 
-        uintptr_t sb_regs = 0, mpu_regs = 0;
-        size_t sb_regs_size = 0, mpu_regs_size = 0;
+        addr_range_t sb_regs;
+        addr_range_t *p_sb_regs = &sb_regs;
+        addr_range_t mpu_regs;
+        addr_range_t *p_mpu_regs = &mpu_regs;
         int irq = 0, dma8 = 0, dma16 = 0;
 
-        rc = sb_get_res(device, &sb_regs, &sb_regs_size, &mpu_regs,
-            &mpu_regs_size, &irq, &dma8, &dma16);
+        rc = sb_get_res(device, &p_sb_regs, &p_mpu_regs, &irq, &dma8, &dma16);
         if (rc != EOK) {
                 ddf_log_error("Failed to get resources: %s.", str_error(rc));
@@ -114 +114 @@
         }
 
-        sb16_irq_code((void*)sb_regs, dma8, dma16, irq_cmds, irq_ranges);
+        sb16_irq_code(p_sb_regs, dma8, dma16, irq_cmds, irq_ranges);
 
         irq_code_t irq_code = {
@@ -139 +139 @@
         }
 
-        rc = sb16_init_sb16(soft_state, (void*)sb_regs, sb_regs_size, device,
-            dma8, dma16);
+        rc = sb16_init_sb16(soft_state, p_sb_regs, device, dma8, dma16);
         if (rc != EOK) {
                 ddf_log_error("Failed to init sb16 driver: %s.",
@@ -147 +146 @@
         }
 
-        rc = sb16_init_mpu(soft_state, (void*)mpu_regs, mpu_regs_size);
+        rc = sb16_init_mpu(soft_state, p_mpu_regs);
         if (rc == EOK) {
                 ddf_fun_t *mpu_fun =
@@ -173 +172 @@
 }
 
-static int sb_get_res(ddf_dev_t *device, uintptr_t *sb_regs,
-    size_t *sb_regs_size, uintptr_t *mpu_regs, size_t *mpu_regs_size,
-    int *irq, int *dma8, int *dma16)
+static int sb_get_res(ddf_dev_t *device, addr_range_t **pp_sb_regs,
+    addr_range_t **pp_mpu_regs, int *irq, int *dma8, int *dma16)
 {
         assert(device);
@@ -225 +223 @@
         }
 
-
         if (hw_res.io_ranges.count == 1) {
-                if (sb_regs)
-                        *sb_regs = hw_res.io_ranges.ranges[0].address;
-                if (sb_regs_size)
-                        *sb_regs_size = hw_res.io_ranges.ranges[0].size;
+                if (pp_sb_regs && *pp_sb_regs)
+                        **pp_sb_regs = hw_res.io_ranges.ranges[0];
+                if (pp_mpu_regs)
+                        *pp_mpu_regs = NULL;
         } else {
                 const int sb =
                     (hw_res.io_ranges.ranges[0].size >= sizeof(sb16_regs_t))
-                        ? 1 : 0;
+                        ? 0 : 1;
                 const int mpu = 1 - sb;
-                if (sb_regs)
-                        *sb_regs = hw_res.io_ranges.ranges[sb].address;
-                if (sb_regs_size)
-                        *sb_regs_size = hw_res.io_ranges.ranges[sb].size;
-                if (mpu_regs)
-                        *sb_regs = hw_res.io_ranges.ranges[mpu].address;
-                if (mpu_regs_size)
-                        *sb_regs_size = hw_res.io_ranges.ranges[mpu].size;
+                if (pp_sb_regs && *pp_sb_regs)
+                        **pp_sb_regs = hw_res.io_ranges.ranges[sb];
+                if (pp_mpu_regs && *pp_mpu_regs)
+                        **pp_mpu_regs = hw_res.io_ranges.ranges[mpu];
         }
 
@@ -261 +254 @@
         return enabled ? EOK : EIO;
 }
+
 /**
  * @}

uspace/drv/audio/sb16/sb16.c

@@ -77 +77 @@
 }
 
-void sb16_irq_code(void *regs, int dma8, int dma16, irq_cmd_t cmds[], irq_pio_range_t ranges[])
+void sb16_irq_code(addr_range_t *regs, int dma8, int dma16, irq_cmd_t cmds[],
+    irq_pio_range_t ranges[])
 {
         assert(regs);
         assert(dma8 > 0 && dma8 < 4);
-        sb16_regs_t *registers = regs;
+
+        sb16_regs_t *registers = RNGABSPTR(*regs);
         memcpy(cmds, irq_cmds, sizeof(irq_cmds));
-        cmds[0].addr = (void*)&registers->dsp_read_status;
-        ranges[0].base = (uintptr_t)registers;
+        cmds[0].addr = (void *) &registers->dsp_read_status;
+        ranges[0].base = (uintptr_t) registers;
         ranges[0].size = sizeof(*registers);
         if (dma16 > 4 && dma16 < 8) {
                 /* Valid dma16 */
-                cmds[1].addr = (void*)&registers->dma16_ack;
+                cmds[1].addr = (void *) &registers->dma16_ack;
         } else {
                 cmds[1].cmd = CMD_ACCEPT;
@@ -94 +96 @@
 }
 
-int sb16_init_sb16(sb16_t *sb, void *regs, size_t size,
-    ddf_dev_t *dev, int dma8, int dma16)
+int sb16_init_sb16(sb16_t *sb, addr_range_t *regs, ddf_dev_t *dev, int dma8,
+    int dma16)
 {
         assert(sb);
+
         /* Setup registers */
-        int ret = pio_enable(regs, size, (void**)&sb->regs);
+        int ret = pio_enable_range(regs, (void **) &sb->regs);
         if (ret != EOK)
                 return ret;
-        ddf_log_debug("PIO registers at %p accessible.", sb->regs);
+        ddf_log_note("PIO registers at %p accessible.", sb->regs);
 
         /* Initialize DSP */
@@ -187 +190 @@
 }
 
-int sb16_init_mpu(sb16_t *sb, void *regs, size_t size)
+int sb16_init_mpu(sb16_t *sb, addr_range_t *regs)
 {
         sb->mpu_regs = NULL;

uspace/drv/audio/sb16/sb16.h

@@ -38 +38 @@
 #include <ddf/driver.h>
 #include <ddi.h>
+#include <device/hw_res_parsed.h>
 
 #include "dsp.h"
@@ -51 +52 @@
 
 size_t sb16_irq_code_size(void);
-void sb16_irq_code(void *regs, int dma8, int dma16, irq_cmd_t cmds[], irq_pio_range_t ranges[]);
-int sb16_init_sb16(sb16_t *sb, void *regs, size_t size,
-    ddf_dev_t *dev, int dma8, int dma16);
-int sb16_init_mpu(sb16_t *sb, void *regs, size_t size);
+void sb16_irq_code(addr_range_t *regs, int dma8, int dma16, irq_cmd_t cmds[], irq_pio_range_t ranges[]);
+int sb16_init_sb16(sb16_t *sb, addr_range_t *regs, ddf_dev_t *dev, int dma8, int dma16);
+int sb16_init_mpu(sb16_t *sb, addr_range_t *regs);
 void sb16_interrupt(sb16_t *sb);