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

cd: fix busreq and reset

Browse source
This commit is contained in:
notaz 2013-08-29 03:43:56 +03:00
parent 59991f1117
commit 4fb435550b
4 changed files with 44 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

23
pico/cd/mcd.c
View file

@ -35,19 +35,24 @@ PICO_INTERNAL void PicoPowerMCD(void)
memset(Pico_mcd->word_ram2M, 0, sizeof(Pico_mcd->word_ram2M)); memset(Pico_mcd->word_ram2M, 0, sizeof(Pico_mcd->word_ram2M));
memset(Pico_mcd->pcm_ram, 0, sizeof(Pico_mcd->pcm_ram)); memset(Pico_mcd->pcm_ram, 0, sizeof(Pico_mcd->pcm_ram));
memset(Pico_mcd->bram, 0, sizeof(Pico_mcd->bram)); memset(Pico_mcd->bram, 0, sizeof(Pico_mcd->bram));
memcpy(Pico_mcd->bram + sizeof(Pico_mcd->bram) - fmt_size, formatted_bram, fmt_size); memcpy(Pico_mcd->bram + sizeof(Pico_mcd->bram) - fmt_size,
} formatted_bram, fmt_size);
PICO_INTERNAL int PicoResetMCD(void)
{
memset(Pico_mcd->s68k_regs, 0, sizeof(Pico_mcd->s68k_regs)); memset(Pico_mcd->s68k_regs, 0, sizeof(Pico_mcd->s68k_regs));
memset(&Pico_mcd->pcm, 0, sizeof(Pico_mcd->pcm)); memset(&Pico_mcd->pcm, 0, sizeof(Pico_mcd->pcm));
memset(&Pico_mcd->m, 0, sizeof(Pico_mcd->m)); memset(&Pico_mcd->m, 0, sizeof(Pico_mcd->m));
memset(Pico_mcd->bios + 0x70, 0xff, 4); // reset hint vector (simplest way to implement reg6) // cold reset state (tested)
Pico_mcd->m.state_flags = 0; Pico_mcd->m.state_flags = PCD_ST_S68K_RST;
Pico_mcd->s68k_regs[3] = 1; // 2M word RAM mode with m68k access after reset Pico_mcd->m.busreq = 2; // busreq on, s68k in reset
Pico_mcd->s68k_regs[3] = 1; // 2M word RAM mode, m68k access
Pico_mcd->s68k_regs[6] = 0xff;
Pico_mcd->s68k_regs[7] = 0xff;
memset(Pico_mcd->bios + 0x70, 0xff, 4);
}
PICO_INTERNAL int PicoResetMCD(void)
{
// ??
Reset_CD(); Reset_CD();
LC89510_Reset(); LC89510_Reset();
gfx_cd_reset(); gfx_cd_reset();
@ -229,7 +234,7 @@ int pcd_sync_s68k(unsigned int m68k_target, int m68k_poll_sync)
elprintf(EL_CD, "s68k sync to %u, %u->%u", elprintf(EL_CD, "s68k sync to %u, %u->%u",
m68k_target, now, s68k_target); m68k_target, now, s68k_target);
if ((Pico_mcd->m.busreq & 3) != 1) { /* busreq/reset */ if (Pico_mcd->m.busreq != 1) { /* busreq/reset */
SekCycleCntS68k = SekCycleAimS68k = s68k_target; SekCycleCntS68k = SekCycleAimS68k = s68k_target;
pcd_run_events(m68k_target); pcd_run_events(m68k_target);
return 0; return 0;

49
pico/cd/memory.c
View file

@ -65,8 +65,8 @@ void PicoWriteS68k16_dec_m1b1(u32 a, u32 d);
void PicoWriteS68k16_dec_m2b1(u32 a, u32 d); void PicoWriteS68k16_dec_m2b1(u32 a, u32 d);
#endif #endif
static void remap_prg_window(int r3); static void remap_prg_window(u32 r1, u32 r3);
static void remap_word_ram(int r3); static void remap_word_ram(u32 r3);
// poller detection // poller detection
#define POLL_LIMIT 16 #define POLL_LIMIT 16
@ -87,12 +87,14 @@ u32 m68k_comm_check(u32 a, u32 d)
#ifndef _ASM_CD_MEMORY_C #ifndef _ASM_CD_MEMORY_C
static u32 m68k_reg_read16(u32 a) static u32 m68k_reg_read16(u32 a)
{ {
u32 d=0; u32 d = 0;
a &= 0x3e; a &= 0x3e;
switch (a) { switch (a) {
case 0: case 0:
d = ((Pico_mcd->s68k_regs[0x33]<<13)&0x8000) | Pico_mcd->m.busreq; // here IFL2 is always 0, just like in Gens // here IFL2 is always 0, just like in Gens
d = ((Pico_mcd->s68k_regs[0x33] << 13) & 0x8000)
| Pico_mcd->m.busreq;
goto end; goto end;
case 2: case 2:
d = (Pico_mcd->s68k_regs[a]<<8) | (Pico_mcd->s68k_regs[a+1]&0xc7); d = (Pico_mcd->s68k_regs[a]<<8) | (Pico_mcd->s68k_regs[a+1]&0xc7);
@ -157,23 +159,26 @@ void m68k_reg_write8(u32 a, u32 d)
return; return;
case 1: case 1:
d &= 3; d &= 3;
elprintf(EL_CDREGS, "d m.busreq %u %u", d, Pico_mcd->m.busreq); dold = Pico_mcd->m.busreq;
if (d == Pico_mcd->m.busreq) if (!(d & 1))
d |= 2; // verified: can't release bus on reset
if (dold == d)
return; return;
pcd_sync_s68k(SekCyclesDone(), 0); pcd_sync_s68k(SekCyclesDone(), 0);
if ((Pico_mcd->m.busreq ^ d) & 1) { if ((dold ^ d) & 1)
elprintf(EL_INTSW, "m68k: s68k reset %i", !(d&1)); elprintf(EL_INTSW, "m68k: s68k reset %i", !(d&1));
if (!(d & 1)) if (!(d & 1))
d |= 2; // verified: reset also gives bus Pico_mcd->m.state_flags |= PCD_ST_S68K_RST;
else { else if (d == 1 && (Pico_mcd->m.state_flags & PCD_ST_S68K_RST)) {
elprintf(EL_CDREGS, "m68k: resetting s68k"); Pico_mcd->m.state_flags &= ~PCD_ST_S68K_RST;
SekResetS68k(); elprintf(EL_CDREGS, "m68k: resetting s68k");
} SekResetS68k();
} }
if ((Pico_mcd->m.busreq ^ d) & 2) { if ((dold ^ d) & 2) {
elprintf(EL_INTSW, "m68k: s68k brq %i", d >> 1); elprintf(EL_INTSW, "m68k: s68k brq %i", d >> 1);
remap_prg_window(Pico_mcd->s68k_regs[3]); remap_prg_window(d, Pico_mcd->s68k_regs[3]);
} }
Pico_mcd->m.busreq = d; Pico_mcd->m.busreq = d;
return; return;
@ -187,7 +192,7 @@ void m68k_reg_write8(u32 a, u32 d)
if ((d ^ dold) & 0xc0) { if ((d ^ dold) & 0xc0) {
elprintf(EL_CDREGS, "m68k: prg bank: %i -> %i", elprintf(EL_CDREGS, "m68k: prg bank: %i -> %i",
(Pico_mcd->s68k_regs[a]>>6), ((d>>6)&3)); (Pico_mcd->s68k_regs[a]>>6), ((d>>6)&3));
remap_prg_window(d); remap_prg_window(Pico_mcd->m.busreq, d);
} }
// 2M mode state is tracked regardless of current mode // 2M mode state is tracked regardless of current mode
@ -953,11 +958,11 @@ static const void *s68k_dec_write16[2][4] = {
// ----------------------------------------------------------------- // -----------------------------------------------------------------
static void remap_prg_window(int r3) static void remap_prg_window(u32 r1, u32 r3)
{ {
// PRG RAM // PRG RAM
if (Pico_mcd->m.busreq & 2) { if (r1 & 2) {
void *bank = Pico_mcd->prg_ram_b[r3 >> 6]; void *bank = Pico_mcd->prg_ram_b[(r3 >> 6) & 3];
cpu68k_map_all_ram(0x020000, 0x03ffff, bank, 0); cpu68k_map_all_ram(0x020000, 0x03ffff, bank, 0);
} }
else { else {
@ -965,7 +970,7 @@ static void remap_prg_window(int r3)
} }
} }
static void remap_word_ram(int r3) static void remap_word_ram(u32 r3)
{ {
void *bank; void *bank;
@ -1016,13 +1021,13 @@ static void remap_word_ram(int r3)
void pcd_state_loaded_mem(void) void pcd_state_loaded_mem(void)
{ {
int r3 = Pico_mcd->s68k_regs[3]; u32 r3 = Pico_mcd->s68k_regs[3];
/* after load events */ /* after load events */
if (r3 & 4) // 1M mode? if (r3 & 4) // 1M mode?
wram_2M_to_1M(Pico_mcd->word_ram2M); wram_2M_to_1M(Pico_mcd->word_ram2M);
remap_word_ram(r3); remap_word_ram(r3);
remap_prg_window(r3); remap_prg_window(Pico_mcd->m.busreq, r3);
Pico_mcd->m.dmna_ret_2m &= 3; Pico_mcd->m.dmna_ret_2m &= 3;
// restore hint vector // restore hint vector

4
pico/pico.c
View file

@ -171,10 +171,6 @@ int PicoReset(void)
SekSetRealTAS(PicoAHW & PAHW_MCD); SekSetRealTAS(PicoAHW & PAHW_MCD);
SekCycleCnt = SekCycleAim = 0; SekCycleCnt = SekCycleAim = 0;
if (PicoAHW & PAHW_MCD)
// needed for MCD to reset properly, probably some bug hides behind this..
memset(Pico.ioports,0,sizeof(Pico.ioports));
Pico.m.dirtyPal = 1; Pico.m.dirtyPal = 1;
Pico.m.z80_bank68k = 0; Pico.m.z80_bank68k = 0;

4
pico/pico_int.h
View file

@ -382,10 +382,12 @@ struct mcd_pcm
} ch[8]; } ch[8];
}; };
#define PCD_ST_S68K_RST 1
struct mcd_misc struct mcd_misc
{ {
unsigned short hint_vector; unsigned short hint_vector;
unsigned char busreq; unsigned char busreq; // not s68k_regs[1]
unsigned char s68k_pend_ints; unsigned char s68k_pend_ints;
unsigned int state_flags; // 04 unsigned int state_flags; // 04
unsigned int stopwatch_base_c; unsigned int stopwatch_base_c;