Changeset 7d5057e in mainline

Timestamp:

2011-09-24T20:32:09Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

cf083e8

Parents:

61013bd

Message:

sb16: Fix DSP writing logic, add DSP version to main structure.

Location:

uspace/drv/audio/sb16

Files:

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

uspace/drv/audio/sb16/registers.h

@@ -50 +50 @@
         ioport8_t __reserved2; /*0xb*/
         ioport8_t dsp_write; /* Both command and data, bit 7 is write status */
-#define DSP_WRITE_READY (1 << 7)
+#define DSP_WRITE_BUSY (1 << 7)
         ioport8_t __reserved3; /*0xd*/
         ioport8_t dsp_read_status; /* Bit 7 */

uspace/drv/audio/sb16/sb16.c

@@ -34 +34 @@
 #include "sb16.h"
 
+#define PIO_DELAY udelay(10)
 
-static inline void sb16_dsp_command(sb16_drv_t *drv, dsp_command_t command)
+
+static inline void sb16_dsp_write(sb16_drv_t *drv, uint8_t data)
 {
         assert(drv);
         uint8_t status;
         do {
+                PIO_DELAY;
                 status = pio_read_8(&drv->regs->dsp_write);
-        } while ((status & DSP_WRITE_READY) == 0);
-
-        pio_write_8(&drv->regs->dsp_write, command);
+        } while ((status & DSP_WRITE_BUSY) != 0);
+        PIO_DELAY;
+        pio_write_8(&drv->regs->dsp_write, data);
 }
 /*----------------------------------------------------------------------------*/
@@ -51 +54 @@
         uint8_t status;
         do {
+                PIO_DELAY;
                 status = pio_read_8(&drv->regs->dsp_read_status);
         } while ((status & DSP_READ_READY) == 0);
+
+        PIO_DELAY;
         return pio_read_8(&drv->regs->dsp_data_read);
 }
@@ -79 +85 @@
         /* Reset DSP, see Chapter 2 of Sound Blaster HW programming guide */
         pio_write_8(&drv->regs->dsp_reset, 1);
-        udelay(3);
+        udelay(3); /* Keep reset for 3 us */
         pio_write_8(&drv->regs->dsp_reset, 0);
+
+        /* "DSP takes about 100 microseconds to initialize itself" */
         udelay(100);
+
 
         unsigned attempts = 100;
         uint8_t status;
         do {
+                PIO_DELAY;
                 status = pio_read_8(&drv->regs->dsp_read_status);
-                udelay(10);
         } while (--attempts && ((status & DSP_READ_READY) == 0));
 
@@ -101 +110 @@
                 return EIO;
         }
-        ddf_log_note("Sound blaster reset!\n");
-
 
         /* Get DSP version number */
-        sb16_dsp_command(drv, DSP_VERSION);
-        const uint8_t major = sb16_dsp_read(drv);
-        const uint8_t minor = sb16_dsp_read(drv);
-        ddf_log_note("Sound blaster DSP version: %x.%x.\n", major, minor);
+        sb16_dsp_write(drv, DSP_VERSION);
+        drv->dsp_version.major = sb16_dsp_read(drv);
+        drv->dsp_version.minor = sb16_dsp_read(drv);
+        ddf_log_note("Sound blaster DSP (%x.%x) Initialized.\n",
+            drv->dsp_version.major, drv->dsp_version.minor);
 
 

uspace/drv/audio/sb16/sb16.h

@@ -43 +43 @@
         sb16_regs_t *regs;
         mpu_regs_t *mpu_regs;
+        struct {
+                uint8_t major;
+                uint8_t minor;
+        } dsp_version;
 } sb16_drv_t;