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

mcd, improve pre/post reading

Browse source
This commit is contained in:
kub 2024-04-27 00:32:04 +02:00
parent c7b771de6c
commit ce5c904a39
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
pico/cd/cdd.c
View file

@ -162,7 +162,7 @@ void cdd_reset(void)
cdd.latency = 0; cdd.latency = 0;
/* reset track index */ /* reset track index */
cdd.index = 0; cdd.index = -1;
/* reset logical block address */ /* reset logical block address */
cdd.lba = 0; cdd.lba = 0;
@ -830,10 +830,10 @@ void cdd_update(void)
} }
} }
if (Pico_mcd->s68k_regs[0x4b] & 0x1) { if (Pico_mcd->m.state_flags & PCD_ST_CDD_CMD) {
/* pending delayed command */ /* pending delayed command */
cdd_process(); cdd_process();
Pico_mcd->s68k_regs[0x4b] &= ~0x1; Pico_mcd->m.state_flags &= ~PCD_ST_CDD_CMD;
} }
} }
@ -1006,8 +1006,8 @@ void cdd_process(void)
(Pico_mcd->s68k_regs[0x48+0] * 10 + Pico_mcd->s68k_regs[0x48+1]) - 150; (Pico_mcd->s68k_regs[0x48+0] * 10 + Pico_mcd->s68k_regs[0x48+1]) - 150;
/* if drive is currently reading, another block or 2 are decoded before the seek starts */ /* if drive is currently reading, another block or 2 are decoded before the seek starts */
if (cdd.status == CD_PLAY && !(Pico_mcd->s68k_regs[0x4b] & 0x1)) { if (cdd.status == CD_PLAY && !(Pico_mcd->m.state_flags & PCD_ST_CDD_CMD)) {
Pico_mcd->s68k_regs[0x4b] |= 0x1; Pico_mcd->m.state_flags |= PCD_ST_CDD_CMD;
return; return;
} }
@ -1037,7 +1037,6 @@ void cdd_process(void)
} }
/* block transfer always starts 3 blocks earlier */ /* block transfer always starts 3 blocks earlier */
cdd.latency -= 3;
lba -= 3; lba -= 3;
/* get track index */ /* get track index */
@ -1072,8 +1071,8 @@ void cdd_process(void)
(Pico_mcd->s68k_regs[0x48+0] * 10 + Pico_mcd->s68k_regs[0x48+1]) - 150; (Pico_mcd->s68k_regs[0x48+0] * 10 + Pico_mcd->s68k_regs[0x48+1]) - 150;
/* if drive is currently reading, another block or 2 are decoded before the seek starts */ /* if drive is currently reading, another block or 2 are decoded before the seek starts */
if (cdd.status == CD_PLAY && !(Pico_mcd->s68k_regs[0x4b] & 0x1)) { if (cdd.status == CD_PLAY && !(Pico_mcd->m.state_flags & PCD_ST_CDD_CMD)) {
Pico_mcd->s68k_regs[0x4b] |= 0x1; Pico_mcd->m.state_flags |= PCD_ST_CDD_CMD;
return; return;
} }
@ -1113,7 +1112,11 @@ void cdd_process(void)
case 0x06: /* Pause */ case 0x06: /* Pause */
{ {
/* TODO another block is decoded before pausing? */ /* if drive is currently reading, another block or 2 are decoded before the seek starts */
if (cdd.status == CD_PLAY && !(Pico_mcd->m.state_flags & PCD_ST_CDD_CMD)) {
Pico_mcd->m.state_flags |= PCD_ST_CDD_CMD;
return;
}
/* no audio track playing */ /* no audio track playing */
Pico_mcd->s68k_regs[0x36+0] = 0x01; Pico_mcd->s68k_regs[0x36+0] = 0x01;

1
pico/pico_int.h
View file

@ -523,6 +523,7 @@ struct mcd_pcm
#define PCD_ST_S68K_SLEEP 4 #define PCD_ST_S68K_SLEEP 4
#define PCD_ST_S68K_POLL 16 #define PCD_ST_S68K_POLL 16
#define PCD_ST_M68K_POLL 32 #define PCD_ST_M68K_POLL 32
#define PCD_ST_CDD_CMD 64
#define PCD_ST_S68K_IFL2 0x100 #define PCD_ST_S68K_IFL2 0x100
struct mcd_misc struct mcd_misc