Changeset 61013bd in mainline

Timestamp:

2011-09-24T17:03:27Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7d5057e

Parents:

9dd79bc7

Message:

sb16: Fix register offsets.

Location:

uspace/drv/audio/sb16

Files:

• registers.h (modified) (1 diff)
• sb16.c (modified) (3 diffs)

uspace/drv/audio/sb16/registers.h

@@ -43 +43 @@
         ioport8_t mixer_address;
         ioport8_t mixer_data;
-        ioport16_t dsp_reset;
+        ioport8_t dsp_reset;
+        ioport8_t __reserved1; /* 0x7 */
         ioport8_t fm_address_status2;
         ioport8_t fm_data2;
         ioport8_t dsp_data_read;
+        ioport8_t __reserved2; /*0xb*/
         ioport8_t dsp_write; /* Both command and data, bit 7 is write status */
 #define DSP_WRITE_READY (1 << 7)
+        ioport8_t __reserved3; /*0xd*/
         ioport8_t dsp_read_status; /* Bit 7 */
 #define DSP_READ_READY (1 << 7)
-        ioport8_t reserved;
+        ioport8_t __reserved4; /*0xf*/
         ioport8_t cd_command_data;
         ioport8_t cd_status;

uspace/drv/audio/sb16/sb16.c

@@ -45 +45 @@
         pio_write_8(&drv->regs->dsp_write, command);
 }
-
+/*----------------------------------------------------------------------------*/
 static inline uint8_t sb16_dsp_read(sb16_drv_t *drv)
 {
@@ -55 +55 @@
         return pio_read_8(&drv->regs->dsp_data_read);
 }
-
-
+/*----------------------------------------------------------------------------*/
 /* ISA interrupts should be edge-triggered so there should be no need for
  * irq code magic */
@@ -79 +78 @@
 
         /* Reset DSP, see Chapter 2 of Sound Blaster HW programming guide */
-        pio_write_16(&drv->regs->dsp_reset, 1);
+        pio_write_8(&drv->regs->dsp_reset, 1);
         udelay(3);
-        pio_write_16(&drv->regs->dsp_reset, 0);
+        pio_write_8(&drv->regs->dsp_reset, 0);
         udelay(100);