Backport fixes and improvements from D32XR

Author: viciious

cd/crt.s

@@ -55,8 +55,12 @@ SPMain:
 
 | wait for command in main comm port
 WaitCmd:
+        tst.b   updates_suspend
+        bne     WaitCmdPostUpdate
+
         jsr     S_Update
 
+WaitCmdPostUpdate:
         tst.b   0x800E.w
         beq.b   WaitCmd
         cmpi.b  #'D,0x800E.w
@@ -92,8 +96,8 @@ WaitCmd:
         beq     SfxStopSource
         cmpi.b  #'G,0x800E.w
         beq     SfxGetSourcePosition
-        cmpi.b  #'Y,0x800E.w
-        beq     SfxSourceIsPlaying
+        cmpi.b  #'E,0x800E.w
+        beq     SfxSuspendUpdates
 
         move.b  #'E,0x800F.w            /* sub comm port = ERROR */
 WaitAck:
@@ -315,7 +319,6 @@ SfxUpdateSource:
 SfxGetSourcePosition:
 | void S_GetSourcePosition(uint8_t src_id);
         moveq   #0,d0
-
         move.w  0x8010.w,d0
         move.l  d0,-(sp)                /* src_id */
 
@@ -327,17 +330,8 @@ SfxGetSourcePosition:
         move.b  #'D,0x800F.w            /* sub comm port = DONE */
         bra     WaitAck
 
-SfxSourceIsPlaying:
-| uint8_t S_SourceIsPlaying(uint8_t src_id);
-        moveq   #0,d0
-
-        move.w  0x8010.w,d0
-        move.l  d0,-(sp)                /* src_id */
-
-        jsr     S_SourceIsPlaying
-        lea     4(sp),sp                /* clear the stack */
-
-        move.b  d0,0x8020.w             /* state */
+SfxSuspendUpdates:
+        move.b  0x8010.w,updates_suspend
 
         move.b  #'D,0x800F.w            /* sub comm port = DONE */
         bra     WaitAck
@@ -379,5 +373,8 @@ drive_init_parms:
 track_number:
         .word   0
 
+updates_suspend:
+        .byte   0
+
         .global _start
 _start:

cd/s_channels.c

@@ -20,8 +20,11 @@ int8_t S_Chan_FrontBuffer(sfx_channel_t *chan) {
         return 1;
     }
     volatile uint8_t *ptr = S_Chan_RAMPtr(chan);
+    uint16_t lo = *(ptr + 0); // LSB of PCM RAM location
     uint16_t hi = *(ptr + 2); // MSB of PCM RAM location
-    return (hi & 0x8) != 0;
+    if (CHBUF_SHIFT <= 8)
+        return (lo & (1<<(CHBUF_SHIFT-1))) != 0;
+    return (hi & (1<<(CHBUF_SHIFT-8))) != 0;
 }
 
 // buffer we can paint to

cd/s_channels.h

@@ -6,7 +6,7 @@
 
 #define S_MAX_CHANNELS 8
 
-#define CHBUF_SHIFT 11
+#define CHBUF_SHIFT 9
 #define CHBUF_SIZE (1<<CHBUF_SHIFT)
 #define CHBUF_POS(b) ((b)<<CHBUF_SHIFT)
 

cd/s_main.c

@@ -30,12 +30,14 @@ void S_Clear(void)
 void S_Update(void)
 {
     static int s_upd = 0;
+    sfx_source_t *src;
+
     if (s_upd >= S_MAX_SOURCES) {
         s_upd = 0;
     }
-    if (S_Src_Paint(&s_sources[ s_upd ])) {
-        s_upd++;
-    }
+
+    src = &s_sources[ s_upd++ ];
+    S_Src_Paint(src);
 }
 
 void S_SetBufferData(uint16_t buf_id, uint8_t *data, uint32_t data_len)
@@ -74,9 +76,9 @@ uint8_t S_PlaySource(uint8_t src_id, uint16_t buf_id, uint16_t freq, uint8_t pan
     src = &s_sources[ src_id - 1 ];
     buf = &s_buffers[ buf_id - 1 ];
 
-    S_Src_Stop( src );
+    S_Src_Stop(src);
 
-    S_Src_Play( src, buf, freq, pan, vol, autoloop );
+    S_Src_Play(src, buf, freq, pan, vol, autoloop);
 
     if (!src->buf) {
         // refused to start
@@ -92,7 +94,6 @@ void S_UpdateSource(uint8_t src_id, uint16_t freq, uint8_t pan, uint8_t vol, uin
     if (src_id == 0 || src_id > S_MAX_SOURCES) {
         return;
     }
-
     S_Src_Update(src, freq, pan, vol, autoloop);
 }
 
@@ -103,7 +104,6 @@ void S_RewindSource(uint8_t src_id)
     if (src_id == 0 || src_id > S_MAX_SOURCES) {
         return;
     }
-
     S_Src_Rewind(src);
 }
 
@@ -124,7 +124,6 @@ void S_StopSource(uint8_t src_id)
     if (src_id == 0 || src_id > S_MAX_SOURCES) {
         return;
     }
-
     S_Src_Stop( src );
 }
 
@@ -135,17 +134,5 @@ uint16_t S_GetSourcePosition(uint8_t src_id)
     if (src_id == 0 || src_id > S_MAX_SOURCES) {
         return 0xffff;
     }
-
     return S_Src_GetPosition(src);
 }
-
-uint8_t S_SourceIsPlaying(uint8_t src_id)
-{
-    sfx_source_t *src = &s_sources[ src_id - 1 ];
-
-    if (src_id == 0 || src_id > S_MAX_SOURCES) {
-        return 0;
-    }
-
-    return src->buf != 0/* && src->painted > 0*/;
-}

cd/s_main.h

@@ -22,7 +22,6 @@ void S_RewindSource(uint8_t src_id);
 void S_StopSource(uint8_t src_id);
 void S_PUnPSource(uint8_t src_id, uint8_t pause);
 uint16_t S_GetSourcePosition(uint8_t src_id);
-uint8_t S_SourceIsPlaying(uint8_t src_id);
 
 #ifdef __cplusplus
 }

cd/s_sources.c

@@ -3,31 +3,40 @@
 #include "s_buffers.h"
 #include "pcm.h"
 
-#define S_PAINT_CHUNK   128 // the number of samples to paint in a single call of S_Src_Paint
+#define S_PAINT_CHUNK   CHBUF_SIZE // the number of samples to paint in a single call of S_Src_Paint
 
 sfx_source_t s_sources[ S_MAX_SOURCES ] = { { 0 } };
 
 void S_Src_Init(sfx_source_t *src)
 {
     src->buf = NULL;
     src->num_channels = 0;
-    src->channels[0] = src->channels[1] = 0;
     src->rem = 0;
     src->eof = 0;
+    src->backbuf = -1;
 }
 
 void S_Src_Stop(sfx_source_t *src)
 {
     int i;
+
+    if (!src->buf) {
+        return;
+    }
+
     for (i = 0; i < src->num_channels; i++) {
         S_Chan_Clear( &s_channels[ src->channels[ i ] ] );
     }
+
     src->buf = NULL;
     src->freq = 0;
     src->painted = 0;
     src->num_channels = 0;
     src->rem = 0;
     src->eof = 1;
+    src->backbuf = -1; // force data refresh on the next update
+
+    S_UpdateSourcesStatus();
 }
 
 void S_Src_Rewind(sfx_source_t *src)
@@ -125,7 +134,7 @@ uint16_t S_Src_LoadSamples(sfx_source_t *src, uint16_t *pos, uint16_t len)
     return painted;
 }
 
-int S_Src_Paint(sfx_source_t *src)
+void S_Src_Paint(sfx_source_t *src)
 {
     int i;
     uint16_t painted, rem;
@@ -135,21 +144,23 @@ int S_Src_Paint(sfx_source_t *src)
     // stream data
     if (!src->buf || !src->num_channels) {
         S_Src_Stop(src);
-        return 1;
+        return;
     }
 
     // use position of the primary channel to determine backbuffer id
     prichan = &s_channels[ src->channels[ 0 ] ];
 
     int8_t backbuf = S_Chan_BackBuffer( prichan );
     if (src->backbuf != backbuf) {
-        if (src->eof) {
+        if (src->eof > 1) {
             S_Src_Stop(src);
-            return 1;
+            return;
         }
 
         src->backbuf = backbuf;
         src->rem = CHBUF_SIZE;
+        if (src->eof)
+            src->eof++;
 
         for (i = 0; i < src->num_channels; i++ ) {
             uint16_t startblock;
@@ -161,7 +172,7 @@ int S_Src_Paint(sfx_source_t *src)
     }
     else {
         if (src->rem == 0) {
-            return 1;
+            return;
         }
     }
 
@@ -206,43 +217,44 @@ int S_Src_Paint(sfx_source_t *src)
         src->rem = 0;
     }
 
-    if (src->rem == 0) {
-        // copy channel parameters from source and update
-        for (i = 0; i < src->num_channels; i++) {
-            chan = &s_channels[ src->channels[ i ] ];
-            chan->freq = src->freq;
-            chan->env = src->env;
-            chan->pan = src->pan[i];
-            S_Chan_Update(chan);
-        }
-
-        return 1;
+    if (src->rem != 0) {
+        return;
     }
 
-    return 0;
+    // copy channel parameters from source and update
+    for (i = 0; i < src->num_channels; i++) {
+        chan = &s_channels[ src->channels[ i ] ];
+        chan->freq = src->freq;
+        chan->env = src->env;
+        chan->pan = src->pan[i];
+        S_Chan_Update(chan);
+    }
 }
 
 void S_Src_Play(sfx_source_t *src, sfx_buffer_t *buf, uint16_t freq, uint8_t pan, uint8_t vol, uint8_t autoloop)
 {
     int i;
     sfx_channel_t *chan;
 
+    if (src->num_channels > 0 && src->num_channels != buf->num_channels) {
+        // we need to re-allocate channels for this source
+        S_Src_Stop(src);
+    }
+
     src->buf = buf;
-    src->backbuf = -1; // force data refresh on the next update
     src->pan[0] = S_Chan_MidiPan(pan);
     src->env = vol;
     src->autoloop = autoloop;
-    src->channels[ 0 ] = 0;
-    src->channels[ 1 ] = 0;
     src->freq = freq ? freq : buf->freq;
     src->paused = 0;
     src->eof = 0;
+    src->painted = 0;
+    //src->backbuf = -1;
 
     if (!buf || !buf->num_channels || !buf->data || !src->freq) {
         goto noplay;
     }
 
-    src->num_channels = buf->num_channels;
     src->adpcm.codec = buf->adpcm_codec;
     src->adpcm.block_size = buf->adpcm_block_size;
 
@@ -252,29 +264,40 @@ void S_Src_Play(sfx_source_t *src, sfx_buffer_t *buf, uint16_t freq, uint8_t pan
         src->pan[1] = 0b10000000; // right
     }
 
-    for (i = 0; i < buf->num_channels; i++) {
-        src->channels[ i ] = S_AllocChannel();
-        if (!src->channels[ i ]) {
-            // out of free channels
-            break;
+    if (src->num_channels != buf->num_channels) {
+        for (i = 0; i < buf->num_channels; i++) {
+            src->channels[ i ] = S_AllocChannel();
+            if (!src->channels[ i ]) {
+                // out of free channels
+                break;
+            }
+            chan = &s_channels[ src->channels[ i ] ];
+            chan->freq = src->freq;
         }
-        chan = &s_channels[ src->channels[ i ] ];
-        chan->freq = src->freq;
-    }
 
-    if (i < buf->num_channels) {
-        // deallocate channels, exit
-        while (i-- > 0) {
+        src->num_channels = buf->num_channels;
+
+        if (i < buf->num_channels) {
+            // deallocate channels, exit
+            while (i-- > 0) {
+                chan = &s_channels[ src->channels[ i ] ];
+                chan->freq = 0;
+            }
+noplay:
+            S_Src_Stop(src);
+            return;
+        }
+    }
+    else {
+        for (i = 0; i < buf->num_channels; i++) {
             chan = &s_channels[ src->channels[ i ] ];
-            chan->freq = 0;
+            chan->freq = src->freq;
         }
-noplay:
-        src->buf = NULL;
-        src->num_channels = 0;
-        return;
     }
 
     S_Src_Rewind(src);
+
+    S_UpdateSourcesStatus();
 }
 
 void S_Src_Update(sfx_source_t *src, uint16_t freq, uint8_t pan, uint8_t vol, uint8_t autoloop)
@@ -308,6 +331,7 @@ void S_InitSources(void)
     for (i = 0; i < S_MAX_SOURCES; i++) {
         S_Src_Init(&s_sources[ i ]);
     }
+    S_UpdateSourcesStatus();
 }
 
 void S_StopSources(void)
@@ -332,3 +356,22 @@ int S_AllocSource(void)
     }
     return 0;
 }
+
+void S_UpdateSourcesStatus(void)
+{
+    int i;
+    uint8_t status, bit;
+
+    // update playback status register: for all active 
+    // sources, the matching bit will be set to 1
+    bit = 1;
+    status = 0;
+    for (i = 0; i < S_MAX_SOURCES; i++) {
+        sfx_source_t *src = &s_sources[ i ];
+        if (src->buf != NULL) {
+            status |= bit;
+        }
+        bit += bit;
+    }
+    *(volatile uint8_t *)0xFF802F = status;
+}