Changeset ac149d5 in mainline

Timestamp:

2011-10-22T11:01:56Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b4857bc

Parents:

5984107

Message:

sb16: Fixes.

Fixes crash on initial data copy.
Fill the entire buffer if possible.

File:

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

uspace/drv/audio/sb16/dsp.c

@@ -196 +196 @@
         if (remain_size == 0) {
                 ddf_log_note("Nothing more to play");
-                sb_dsp_write(dsp, DMA_16B_EXIT);
+                if (AUTO_DMA_MODE) {
+                        sb_dsp_write(dsp, DMA_16B_EXIT);
+                }
                 sb_clear_buffer(dsp);
                 return;
         }
-        if (remain_size < PLAY_BLOCK_SIZE) {
+        if (remain_size <= PLAY_BLOCK_SIZE) {
                 ddf_log_note("Last %zu bytes to play.\n", remain_size);
                 /* This is the last block */
@@ -264 +266 @@
         const size_t play_size =
             size < PLAY_BLOCK_SIZE ? size : PLAY_BLOCK_SIZE;
-        memcpy(dsp->buffer.data, dsp->playing.data, play_size);
-
-        ddf_log_debug("Playing sound: %zu(%zu) bytes.\n", play_size, size);
+        const size_t copy_size =
+            size < BUFFER_SIZE ? size : BUFFER_SIZE;
+
 
         dsp->playing.data = data;
-        dsp->playing.position = data + play_size;
+        dsp->playing.position = data + copy_size;
         dsp->playing.size = size;
         dsp->playing.mode =
             (bit_depth == 16 ? 0x10 : 0) | (channels == 2 ? 0x20 : 0);
-
         ddf_log_debug("Setting mode %hhx.\n", dsp->playing.mode);
+
+        ddf_log_debug("Playing sound: %zu(%zu) bytes.\n", play_size, size);
+        memcpy(dsp->buffer.data, dsp->playing.data, copy_size);
+
         sb_dsp_write(dsp, SET_SAMPLING_RATE_OUTPUT);
         sb_dsp_write(dsp, sampling_rate >> 8);