Changeset 9b3d999 in mainline

Timestamp:

2012-07-06T14:17:28Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ef246b9

Parents:

c5c65b6

Message:

drv/auid/sb16: Refactor debug output.

File:

• uspace/drv/audio/sb16/dsp.c (modified) (8 diffs)

uspace/drv/audio/sb16/dsp.c

@@ -46 +46 @@
 
 #define BUFFER_ID 1
-#define BUFFER_SIZE (PAGE_SIZE)
-#define PLAY_BLOCK_SIZE (BUFFER_SIZE / 2)
+#define MAX_BUFFER_SIZE (PAGE_SIZE)
 
 #ifndef DSP_RETRY_COUNT
@@ -116 +115 @@
 {
         assert(dsp);
-        if (size > BUFFER_SIZE || size == 0 || (size % 2) == 1)
-                size = BUFFER_SIZE;
+        if (size > MAX_BUFFER_SIZE || size == 0 || (size % 2) == 1)
+                size = MAX_BUFFER_SIZE;
         uint8_t *buffer = dma_create_buffer24(size);
         if (buffer == NULL) {
@@ -126 +125 @@
         const uintptr_t pa = addr_to_phys(buffer);
         assert(pa < (1 << 25));
+
         /* Set 16 bit channel */
         const int ret = sb_setup_dma(dsp, pa, size);
@@ -191 +191 @@
         assert(dsp);
         if (dsp->event_exchange) {
-//              ddf_log_verbose("Sending interrupt event.");
                 async_msg_0(dsp->event_exchange, IPC_FIRST_USER_METHOD);
         } else {
@@ -248 +247 @@
                 return ENOENT;
         sb_clear_buffer(dsp);
-        if (dsp->event_exchange)
-                async_exchange_end(dsp->event_exchange);
+        async_exchange_end(dsp->event_exchange);
         dsp->event_exchange = NULL;
         if (dsp->event_session)
@@ -273 +271 @@
 
         /* Check supported parameters */
-        ddf_log_debug("Starting playback on buffer(%u): %uHz, %u bit, "
-            " %u channel(s), %ssigned.", id, sampling_rate, sample_size,
-            channels, sign ? "" : "un" );
+        ddf_log_debug("Requested playback on buffer \"%u\" (%u parts): %uHz, "
+            "%ssinged %u bit, %u channel(s).", id, parts, sampling_rate,
+            sign ? "" : "un", sample_size, channels);
         if (id != BUFFER_ID)
                 return ENOENT;
@@ -293 +291 @@
         sb_dsp_write(dsp, sampling_rate & 0xff);
 
-        ddf_log_debug("Sampling rate: %hhx:%hhx.",
+        ddf_log_verbose("Sampling rate: %hhx:%hhx.",
             sampling_rate >> 8, sampling_rate & 0xff);
 
@@ -310 +308 @@
         sb_dsp_write(dsp, (dsp->playing.samples - 1) >> 8);
 
+        ddf_log_verbose("Playback started, interrupt every %u samples "
+            "(~1/%u sec)", dsp->playing.samples,
+            sampling_rate / dsp->playing.samples);
+
         return EOK;
 }