Changeset 6233c4e in mainline

Timestamp:

2011-10-24T21:50:31Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

88dcd19

Parents:

0b4f060

Message:

sb16: Prettify debug output.

Add mode to string conversion.

Location:

uspace/drv/audio/sb16

Files:

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

uspace/drv/audio/sb16/dsp.c

@@ -43 +43 @@
 #include "dsp.h"
 
-#define PLAYBACK_16BIT 0x10
-#define PLAYBACK_STEREO 0x20
-
 #define BUFFER_SIZE (PAGE_SIZE / 4)
 #define PLAY_BLOCK_SIZE (BUFFER_SIZE / 2)
@@ -145 +142 @@
 static inline size_t sample_count(uint8_t mode, size_t byte_count)
 {
-        if (mode & PLAYBACK_16BIT) {
+        if (mode & DSP_MODE_16BIT) {
                 return byte_count / 2;
         }
@@ -279 +276 @@
         dsp->playing.mode = 0;
         if (sample_size == 16)
-                dsp->playing.mode |= PLAYBACK_16BIT;
+                dsp->playing.mode |= DSP_MODE_16BIT;
         if (channels == 2)
-                dsp->playing.mode |= PLAYBACK_STEREO;
+                dsp->playing.mode |= DSP_MODE_STEREO;
 
         const size_t samples = sample_count(dsp->playing.mode, play_size);
 
-        ddf_log_debug("Playing sound(%hhx): %zu(%zu) bytes => %zu samples.\n",
-            dsp->playing.mode, play_size, size, samples);
+        ddf_log_debug("Playing %s sound: %zu(%zu) bytes => %zu samples.\n",
+            mode_to_str(dsp->playing.mode), play_size, size, samples);
 
         memcpy(dsp->buffer.data, dsp->playing.data, copy_size);

uspace/drv/audio/sb16/dsp_commands.h

@@ -162 +162 @@
         DMA_16B_EXIT = 0xd9, /* Ends DMA transfer and terminates I/O process */
 } dsp_command_t;
+/*----------------------------------------------------------------------------*/
+#define DSP_MODE_16BIT 0x10
+#define DSP_MODE_STEREO 0x20
+
+static inline const char * mode_to_str(uint8_t mode)
+{
+        if (mode & 0xcf)
+                return "unknown";
+        static const char * names[] = {
+                "unsigned mono (8bit)",
+                "signed mono (16bit)",
+                "unsigned stereo (8bit)",
+                "signed stereo (16bit)",
+        };
+        return names[mode >> 4];
+}
 
 #endif