RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cd: pcm: tune addr reload

Browse source 
fahrenheit..
This commit is contained in:
notaz 2013-09-23 20:01:37 +03:00
parent f3cb39f29a
commit 021e47b375
3 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pico/cd/mcd.c
View file

@ -327,6 +327,7 @@ void pcd_state_loaded(void)
memset(Pico_mcd->pcm_mixbuf, 0, sizeof(Pico_mcd->pcm_mixbuf)); memset(Pico_mcd->pcm_mixbuf, 0, sizeof(Pico_mcd->pcm_mixbuf));
Pico_mcd->pcm_mixbuf_dirty = 0; Pico_mcd->pcm_mixbuf_dirty = 0;
Pico_mcd->pcm_mixpos = 0; Pico_mcd->pcm_mixpos = 0;
Pico_mcd->pcm_regs_dirty = 1;
// old savestates.. // old savestates..
cycles = pcd_cycles_m68k_to_s68k(SekCycleAim); cycles = pcd_cycles_m68k_to_s68k(SekCycleAim);

35
pico/cd/pcm.c
View file

@ -6,7 +6,6 @@
* See COPYING file in the top-level directory. * See COPYING file in the top-level directory.
*/ */
#include <assert.h>
#include "../pico_int.h" #include "../pico_int.h"
#define PCM_STEP_SHIFT 11 #define PCM_STEP_SHIFT 11
@ -30,19 +29,11 @@ void pcd_pcm_write(unsigned int a, unsigned int d)
Pico_mcd->pcm.control = d; Pico_mcd->pcm.control = d;
elprintf(EL_CD, "pcm control %02x", Pico_mcd->pcm.control); elprintf(EL_CD, "pcm control %02x", Pico_mcd->pcm.control);
} }
else if (a == 8 && Pico_mcd->pcm.enabled != (u_char)~d) else if (a == 8)
{ {
// sound on/off
int was_enabled = Pico_mcd->pcm.enabled;
int i;
for (i = 0; i < 8; i++)
if (!(was_enabled & (1 << i)))
Pico_mcd->pcm.ch[i].addr =
Pico_mcd->pcm.ch[i].regs[6] << (PCM_STEP_SHIFT + 8);
Pico_mcd->pcm.enabled = ~d; Pico_mcd->pcm.enabled = ~d;
} }
Pico_mcd->pcm_regs_dirty = 1;
} }
unsigned int pcd_pcm_read(unsigned int a) unsigned int pcd_pcm_read(unsigned int a)
@ -65,29 +56,37 @@ void pcd_pcm_sync(unsigned int to)
struct pcm_chan *ch; struct pcm_chan *ch;
unsigned int addr; unsigned int addr;
int c, s, steps; int c, s, steps;
int enabled;
int *out; int *out;
if ((int)(to - cycles) < 384) if ((int)(to - cycles) < 384)
return; return;
steps = (to - cycles) / 384; steps = (to - cycles) / 384;
if (Pico_mcd->pcm_mixpos + steps > PCM_MIXBUF_LEN)
// shouldn't happen, but occasionally does
steps = PCM_MIXBUF_LEN - Pico_mcd->pcm_mixpos;
// PCM disabled or all channels off // PCM disabled or all channels off
if (!(Pico_mcd->pcm.control & 0x80) || !Pico_mcd->pcm.enabled) enabled = Pico_mcd->pcm.enabled;
if (!(Pico_mcd->pcm.control & 0x80))
enabled = 0;
if (!enabled && !Pico_mcd->pcm_regs_dirty)
goto end; goto end;
out = Pico_mcd->pcm_mixbuf + Pico_mcd->pcm_mixpos * 2; out = Pico_mcd->pcm_mixbuf + Pico_mcd->pcm_mixpos * 2;
Pico_mcd->pcm_mixbuf_dirty = 1; Pico_mcd->pcm_mixbuf_dirty = 1;
if (Pico_mcd->pcm_mixpos + steps > PCM_MIXBUF_LEN) Pico_mcd->pcm_regs_dirty = 0;
// shouldn't happen
steps = PCM_MIXBUF_LEN - Pico_mcd->pcm_mixpos;
for (c = 0; c < 8; c++) for (c = 0; c < 8; c++)
{ {
if (!(Pico_mcd->pcm.enabled & (1 << c)))
continue; // channel disabled
ch = &Pico_mcd->pcm.ch[c]; ch = &Pico_mcd->pcm.ch[c];
if (!(enabled & (1 << c))) {
ch->addr = ch->regs[6] << (PCM_STEP_SHIFT + 8);
continue; // channel disabled
}
addr = ch->addr; addr = ch->addr;
inc = *(unsigned short *)&ch->regs[2]; inc = *(unsigned short *)&ch->regs[2];
mul_l = ((int)ch->regs[0] * (ch->regs[1] & 0xf)) >> (5+1); mul_l = ((int)ch->regs[0] * (ch->regs[1] & 0xf)) >> (5+1);

3
pico/pico_int.h
View file

@ -447,7 +447,8 @@ typedef struct
_scd scd; _scd scd;
int pcm_mixbuf[PCM_MIXBUF_LEN * 2]; int pcm_mixbuf[PCM_MIXBUF_LEN * 2];
int pcm_mixpos; int pcm_mixpos;
int pcm_mixbuf_dirty; char pcm_mixbuf_dirty;
char pcm_regs_dirty;
} mcd_state; } mcd_state;
// XXX: this will need to be reworked for cart+cd support. // XXX: this will need to be reworked for cart+cd support.