Changeset cf083e8 in mainline

Timestamp:

2011-09-25T11:23:06Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

01282fc

Parents:

7d5057e

Message:

sb16: Move DSP routines to separate header.

Location:

uspace/drv/audio/sb16

Files:

• dsp.h (added)
• sb16.c (modified) (2 diffs)

uspace/drv/audio/sb16/sb16.c

@@ -32 +32 @@
 #include "ddf_log.h"
 #include "dsp_commands.h"
+#include "dsp.h"
 #include "sb16.h"
 
-#define PIO_DELAY udelay(10)
-
-
-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_BUSY) != 0);
-        PIO_DELAY;
-        pio_write_8(&drv->regs->dsp_write, data);
-}
-/*----------------------------------------------------------------------------*/
-static inline uint8_t sb16_dsp_read(sb16_drv_t *drv)
-{
-        assert(drv);
-        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);
-}
-/*----------------------------------------------------------------------------*/
 /* ISA interrupts should be edge-triggered so there should be no need for
  * irq code magic */
@@ -83 +56 @@
         ddf_log_debug("PIO registers at %p accessible.\n", drv->regs);
 
-        /* Reset DSP, see Chapter 2 of Sound Blaster HW programming guide */
-        pio_write_8(&drv->regs->dsp_reset, 1);
-        udelay(3); /* Keep reset for 3 us */
-        pio_write_8(&drv->regs->dsp_reset, 0);
-
+        dsp_reset(drv->regs);
         /* "DSP takes about 100 microseconds to initialize itself" */
         udelay(100);
 
+        uint8_t response;
+        ret = dsp_read(drv->regs, &response);
+        if (ret != EOK) {
+                ddf_log_error("Failed to read DSP reset response value.\n");
+                return ret;
+        }
 
-        unsigned attempts = 100;
-        uint8_t status;
-        do {
-                PIO_DELAY;
-                status = pio_read_8(&drv->regs->dsp_read_status);
-        } while (--attempts && ((status & DSP_READ_READY) == 0));
-
-        if (status & DSP_READ_READY) {
-                const uint8_t response = sb16_dsp_read(drv);
-                if (response != 0xaa) {
-                        ddf_log_error("Invalid DSP reset response: %x.\n",
-                            response);
-                        return EIO;
-                }
-        } else {
-                ddf_log_error("Failed to reset Sound Blaster DSP.\n");
+        if (response != DSP_RESET_RESPONSE) {
+                ddf_log_error("Invalid DSP reset response: %x.\n", response);
                 return EIO;
         }
 
         /* Get DSP version number */
-        sb16_dsp_write(drv, DSP_VERSION);
-        drv->dsp_version.major = sb16_dsp_read(drv);
-        drv->dsp_version.minor = sb16_dsp_read(drv);
+        dsp_write(drv->regs, DSP_VERSION);
+        dsp_read(drv->regs, &drv->dsp_version.major);
+        dsp_read(drv->regs, &drv->dsp_version.minor);
         ddf_log_note("Sound blaster DSP (%x.%x) Initialized.\n",
             drv->dsp_version.major, drv->dsp_version.minor);