Changeset ea150dc6 in mainline

Timestamp:

2012-06-29T13:46:20Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

bd250b0f

Parents:

722912e

Message:

sb16: Add pio ranges to irq code.

Location:

uspace/drv/audio/sb16

Files:

• main.c (modified) (1 diff)
• sb16.c (modified) (2 diffs)
• sb16.h (modified) (1 diff)

uspace/drv/audio/sb16/main.c

@@ -116 +116 @@
         const size_t irq_cmd_count = sb16_irq_code_size();
         irq_cmd_t irq_cmds[irq_cmd_count];
-        sb16_irq_code((void*)sb_regs, dma8, dma16, irq_cmds);
-        irq_code_t irq_code = { .cmdcount = irq_cmd_count, .cmds = irq_cmds };
+        irq_pio_range_t irq_ranges[1];
+        sb16_irq_code((void*)sb_regs, dma8, dma16, irq_cmds, irq_ranges);
+
+        irq_code_t irq_code = {
+                .cmdcount = irq_cmd_count,
+                .cmds = irq_cmds,
+                .rangecount = 1,
+                .ranges = irq_ranges
+        };
 
         ret = register_interrupt_handler(device, irq, irq_handler, &irq_code);

uspace/drv/audio/sb16/sb16.c

@@ -74 +74 @@
 }
 /*----------------------------------------------------------------------------*/
-void sb16_irq_code(void *regs, int dma8, int dma16, irq_cmd_t cmds[])
+void sb16_irq_code(void *regs, int dma8, int dma16, irq_cmd_t cmds[], irq_pio_range_t ranges[])
 {
         assert(regs);
@@ -81 +81 @@
         memcpy(cmds, irq_cmds, sizeof(irq_cmds));
         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 */

uspace/drv/audio/sb16/sb16.h

@@ -51 +51 @@
 
 size_t sb16_irq_code_size(void);
-void sb16_irq_code(void *regs, int dma8, int dma16, irq_cmd_t cmds[]);
+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);