Changeset b130d0e in mainline

Timestamp:

2011-10-24T13:17:26Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b7f7183

Parents:

25f8e5d

Message:

sb16: Dump PNP registers on startup. Move well-known mixer addresses to one place.

Location:

uspace/drv/audio/sb16

Files:

• dma_controller.c (modified) (4 diffs)
• mixer.c (modified) (2 diffs)
• registers.h (modified) (1 diff)
• sb16.c (modified) (1 diff)

uspace/drv/audio/sb16/dma_controller.c

@@ -168 +168 @@
 static dma_controller_t controller_8237 = {
         .channels = {
-            /* The first chip */
+            /* The first chip 8-bit */
             { (uint8_t*)0x00, (uint8_t*)0x01, (uint8_t*)0x87,
               (uint8_t*)0x0a, (uint8_t*)0x0b, (uint8_t*)0x0c, },
@@ -178 +178 @@
               (uint8_t*)0x0a, (uint8_t*)0x0b, (uint8_t*)0x0c, },
 
-            /* The second chip */
+            /* The second chip 16-bit */
             { (uint8_t*)0xc0, (uint8_t*)0xc2, (uint8_t*)0x8f,
               (uint8_t*)0xd4, (uint8_t*)0xd6, (uint8_t*)0xd8, },
@@ -298 +298 @@
                 return EIO;
 
-        dma_channel_t dma_channel = controller_8237.channels[channel];
+        const dma_channel_t dma_channel = controller_8237.channels[channel];
 
         /* Mask DMA request */
@@ -311 +311 @@
             | (auto_mode ? DMA_MODE_CHAN_AUTO_FLAG : 0)
             | (mode << DMA_MODE_CHAN_MODE_SHIFT);
-        ddf_log_verbose("Setting mode: %hhx.\n", value);
+        ddf_log_verbose("Setting DMA mode: %hhx.\n", value);
         pio_write_8(dma_channel.mode_address, value);
 

uspace/drv/audio/sb16/mixer.c

@@ -34 +34 @@
 #include "mixer.h"
 
-#define CT_MIXER_RESET_ADDRESS 0x00
-
 typedef struct channel {
         uint8_t address;
@@ -186 +184 @@
 
         if (type != SB_MIXER_NONE) {
-                pio_write_8(&regs->mixer_address, CT_MIXER_RESET_ADDRESS);
+                pio_write_8(&regs->mixer_address, MIXER_RESET_ADDRESS);
                 pio_write_8(&regs->mixer_data, 1);
                 sb_mixer_max_master_levels(mixer);
         }
+        pio_write_8(&regs->mixer_address, MIXER_PNP_IRQ_ADDRESS);
+        const uint8_t irq = pio_read_8(&regs->mixer_data);
+        pio_write_8(&regs->mixer_address, MIXER_PNP_DMA_ADDRESS);
+        const uint8_t dma = pio_read_8(&regs->mixer_data);
+        ddf_log_debug("SB16 setup with IRQ 0x%hhx and DMA 0x%hhx.\n", irq, dma);
         return EOK;
 }

uspace/drv/audio/sb16/registers.h

@@ -44 +44 @@
         ioport8_t afm_data;
         ioport8_t mixer_address;
-#define MIXER_IRQ_ADDRESS 0x82 /* The Interrupt Status register, addressed as
-                                * register 82h on the Mixer register map p.27 */
+#define MIXER_RESET_ADDRESS 0x00
+#define MIXER_PNP_IRQ_ADDRESS 0x80
+#define MIXER_PNP_DMA_ADDRESS 0x81
+#define MIXER_IRQ_STATUS_ADDRESS 0x82 /* The Interrupt Status register,
+                                       * addressed as register 82h on the
+                                       * Mixer register map p.27 */
         ioport8_t mixer_data;
         ioport8_t dsp_reset;

uspace/drv/audio/sb16/sb16.c

@@ -107 +107 @@
          * differently */
         if (drv->dsp.version.major >= 4) {
-                pio_write_8(&drv->regs->mixer_address, MIXER_IRQ_ADDRESS);
+                pio_write_8(&drv->regs->mixer_address, MIXER_IRQ_STATUS_ADDRESS);
                 const uint8_t irq_mask = pio_read_8(&drv->regs->mixer_data);
                 ddf_log_debug("SB16 IRQ mask %hhx.\n", irq_mask);