Changeset 124f9bd in mainline for uspace/drv/audio/sb16/dsp.c

Timestamp:

2012-07-05T20:52:36Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e941bf8

Parents:

4bec78f

Message:

audio/sb16: Remove newlines from debug messages.

File:

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

uspace/drv/audio/sb16/dsp.c

@@ -120 +120 @@
         uint8_t *buffer = dma_create_buffer24(size);
         if (buffer == NULL) {
-                ddf_log_error("Failed to allocate buffer.\n");
+                ddf_log_error("Failed to allocate DMA buffer.");
                 return ENOMEM;
         }
@@ -133 +133 @@
                 bzero(dsp->buffer.data, dsp->buffer.size);
         } else {
-                ddf_log_error("Failed to setup DMA16 channel %s.\n",
+                ddf_log_error("Failed to setup DMA16 channel: %s.",
                     str_error(ret));
                 dma_destroy_buffer(buffer);
@@ -171 +171 @@
         const int ret = sb_dsp_read(dsp, &response);
         if (ret != EOK) {
-                ddf_log_error("Failed to read DSP reset response value.\n");
+                ddf_log_error("Failed to read DSP reset response value.");
                 return ret;
         }
         if (response != DSP_RESET_RESPONSE) {
-                ddf_log_error("Invalid DSP reset response: %x.\n", response);
+                ddf_log_error("Invalid DSP reset response: %x.", response);
                 return EIO;
         }
@@ -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 {
@@ -214 +215 @@
 
         const int ret = sb_setup_buffer(dsp, *size);
-        ddf_log_debug("Providing buffer(%u): %p, %zu B.\n",
-            BUFFER_ID, dsp->buffer.data, dsp->buffer.size);
-
-        if (ret == EOK && buffer)
-                *buffer = dsp->buffer.data;
-        if (ret == EOK && size)
-                *size = dsp->buffer.size;
-        if (ret == EOK && id)
-                *id = BUFFER_ID;
+        if (ret == EOK) {
+                ddf_log_debug("Providing buffer(%u): %p, %zu B.",
+                    BUFFER_ID, dsp->buffer.data, dsp->buffer.size);
+
+                if (buffer)
+                        *buffer = dsp->buffer.data;
+                if (size)
+                        *size = dsp->buffer.size;
+                if (id)
+                        *id = BUFFER_ID;
+        }
         return ret;
 }
@@ -235 +238 @@
                 return EBUSY;
         dsp->event_session = session;
+        ddf_log_debug("Set event session.");
         return EOK;
 }
@@ -250 +254 @@
                 async_hangup(dsp->event_session);
         dsp->event_session = NULL;
+        ddf_log_debug("DSP buffer released.");
         return EOK;
 }
@@ -269 +274 @@
         /* Check supported parameters */
         ddf_log_debug("Starting playback on buffer(%u): rate: %u, size: %u, "
-            " channels: %u, signed: %s.\n", id, sampling_rate, sample_size,
+            " channels: %u, signed: %s.", id, sampling_rate, sample_size,
             channels, sign ? "YES" : "NO" );
         if (id != BUFFER_ID)
@@ -288 +293 @@
         sb_dsp_write(dsp, sampling_rate & 0xff);
 
-        ddf_log_debug("Sampling rate: %hhx:%hhx.\n",
+        ddf_log_debug("Sampling rate: %hhx:%hhx.",
             sampling_rate >> 8, sampling_rate & 0xff);