Changeset 84d6c39 in mainline

Timestamp:

2011-11-30T23:13:35Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

57cf3b3

Parents:

ac07a13

Message:

sb16: Drop support for 8bit format for now.

Looks like 8bit playback needs working dma8 channel (need to verify).

Location:

uspace/drv/audio/sb16

Files:

• dsp.c (modified) (3 diffs)
• dsp_commands.h (modified) (3 diffs)

uspace/drv/audio/sb16/dsp.c

@@ -148 +148 @@
 static inline size_t sample_count(uint8_t mode, size_t byte_count)
 {
-        if (mode & DSP_MODE_16BIT) {
+        // FIXME we only support 16 bit playback for now.
+        return byte_count / 2;
+
+        if (mode & DSP_MODE_SIGNED) {
                 return byte_count / 2;
         }
@@ -256 +259 @@
 
         /* Check supported parameters */
-        if (sample_size != 8 && sample_size != 16)
+        if (sample_size != 16) // FIXME We only support 16 bit playback
                 return ENOTSUP;
         if (channels != 1 && channels != 2)
@@ -275 +278 @@
         dsp->playing.mode = 0;
 
-        if (sample_size == 16)
-                dsp->playing.mode |= DSP_MODE_16BIT;
+                dsp->playing.mode |= DSP_MODE_SIGNED;
         if (channels == 2)
                 dsp->playing.mode |= DSP_MODE_STEREO;

uspace/drv/audio/sb16/dsp_commands.h

@@ -142 +142 @@
         SINGLE_DMA_16B_DA = 0xb0,     /* Followed by mode, size.low, size.high*/
         SINGLE_DMA_16B_DA_FIFO = 0xb2,/* mode format is:                      */
-        AUTO_DMA_16B_DA = 0xb4,       /*    0x00 - unsigned mono 8bit         */
-        AUTO_DMA_16B_DA_FIFO = 0xb6,  /*    0x10 - signed mono 16bit          */
-        SINGLE_DMA_16B_AD = 0xb8,     /*    0x20 - unsigned stereo 8bit       */
-        SINGLE_DMA_16B_AD_FIFO = 0xba,/*    0x30 - signed stereo 16bit        */
+        AUTO_DMA_16B_DA = 0xb4,       /*    0x00 - unsigned mono              */
+        AUTO_DMA_16B_DA_FIFO = 0xb6,  /*    0x10 - signed mono                */
+        SINGLE_DMA_16B_AD = 0xb8,     /*    0x20 - unsigned stereo            */
+        SINGLE_DMA_16B_AD_FIFO = 0xba,/*    0x30 - signed stereo              */
         AUTO_DMA_16B_AD = 0xbc,       /* Size is -1. Terminate by EXIT        */
         AUTO_DMA_16B_AD_FIFO = 0xbe,  /* or switch to SINGLE_DMA              */
@@ -151 +151 @@
         SINGLE_DMA_8B_DA = 0xc0,     /* Followed by mode, size.low, size.high */
         SINGLE_DMA_8B_DA_FIFO = 0xc2,/* mode format is:                       */
-        AUTO_DMA_8B_DA = 0xc4,       /*    0x00 - unsigned mono 8bit          */
-        AUTO_DMA_8B_DA_FIFO = 0xc6,  /*    0x10 - signed mono 16bit           */
-        SINGLE_DMA_8B_AD = 0xc8,     /*    0x20 - unsigned stereo 8bit        */
-        SINGLE_DMA_8B_AD_FIFO = 0xca,/*    0x30 - signed stereo 16bit         */
+        AUTO_DMA_8B_DA = 0xc4,       /*    0x00 - unsigned mono               */
+        AUTO_DMA_8B_DA_FIFO = 0xc6,  /*    0x10 - signed mono                 */
+        SINGLE_DMA_8B_AD = 0xc8,     /*    0x20 - unsigned stereo             */
+        SINGLE_DMA_8B_AD_FIFO = 0xca,/*    0x30 - signed stereo               */
         AUTO_DMA_8B_AD = 0xcc,       /* Size is -1. Terminate by EXIT         */
         AUTO_DMA_8B_AD_FIFO = 0xce,  /* or switch to SINGLE_DMA               */
@@ -163 +163 @@
 } dsp_command_t;
 /*----------------------------------------------------------------------------*/
-#define DSP_MODE_16BIT 0x10
+#define DSP_MODE_SIGNED 0x10
 #define DSP_MODE_STEREO 0x20