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

mcd, fix timing for irq while polling detected

Browse source
This commit is contained in:
kub 2021-05-06 21:19:25 +02:00
parent 7e77080f45
commit eb36d9c7e6
5 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pico/cd/cdc.c
View file

@ -367,7 +367,7 @@ void cdc_dma_update(void)
{ {
/* update IRQ level */ /* update IRQ level */
elprintf(EL_INTS, "cdc DTE irq 5"); elprintf(EL_INTS, "cdc DTE irq 5");
SekInterruptS68k(5); pcd_irq_s68k(5, 1);
} }
} }
@ -411,7 +411,7 @@ int cdc_decoder_update(uint8 header[4])
{ {
/* update IRQ level */ /* update IRQ level */
elprintf(EL_INTS, "cdc DEC irq 5"); elprintf(EL_INTS, "cdc DEC irq 5");
SekInterruptS68k(5); pcd_irq_s68k(5, 1);
} }
} }
@ -469,13 +469,13 @@ void cdc_reg_w(unsigned char data)
{ {
/* update IRQ level */ /* update IRQ level */
elprintf(EL_INTS, "cdc pending irq 5"); elprintf(EL_INTS, "cdc pending irq 5");
SekInterruptS68k(5); pcd_irq_s68k(5, 1);
} }
} }
else // if (scd.pending & (1 << 5)) else // if (scd.pending & (1 << 5))
{ {
/* clear pending level 5 interrupts */ /* clear pending level 5 interrupts */
SekInterruptClearS68k(5); pcd_irq_s68k(5, 0);
} }
/* abort any data transfer if data output is disabled */ /* abort any data transfer if data output is disabled */
@ -614,7 +614,7 @@ void cdc_reg_w(unsigned char data)
if ((cdc.ifstat | BIT_DECI) || !(cdc.ifctrl & BIT_DECIEN)) if ((cdc.ifstat | BIT_DECI) || !(cdc.ifctrl & BIT_DECIEN))
{ {
/* clear pending level 5 interrupt */ /* clear pending level 5 interrupt */
SekInterruptClearS68k(5); pcd_irq_s68k(5, 0);
} }
#endif #endif
Pico_mcd->s68k_regs[0x04+1] = 0x08; Pico_mcd->s68k_regs[0x04+1] = 0x08;
@ -774,7 +774,7 @@ unsigned char cdc_reg_r(void)
if ((cdc.ifstat | BIT_DTEI) || !(cdc.ifctrl & BIT_DTEIEN)) if ((cdc.ifstat | BIT_DTEI) || !(cdc.ifctrl & BIT_DTEIEN))
{ {
/* clear pending level 5 interrupt */ /* clear pending level 5 interrupt */
SekInterruptClearS68k(5); pcd_irq_s68k(5, 0);
} }
#endif #endif
@ -826,7 +826,7 @@ unsigned short cdc_host_r(void)
{ {
/* update IRQ level */ /* update IRQ level */
elprintf(EL_INTS, "cdc DTE irq 5"); elprintf(EL_INTS, "cdc DTE irq 5");
SekInterruptS68k(5); pcd_irq_s68k(5, 1);
} }
} }

2
pico/cd/gfx.c
View file

@ -421,7 +421,7 @@ void gfx_update(unsigned int cycles)
if (Pico_mcd->s68k_regs[0x33] & PCDS_IEN1) { if (Pico_mcd->s68k_regs[0x33] & PCDS_IEN1) {
elprintf(EL_INTS|EL_CD, "s68k: gfx_cd irq 1"); elprintf(EL_INTS|EL_CD, "s68k: gfx_cd irq 1");
SekInterruptS68k(1); pcd_irq_s68k(1, 1);
} }
} }
else { else {

14
pico/cd/mcd.c
View file

@ -177,7 +177,7 @@ static void pcd_cdc_event(unsigned int now)
if (Pico_mcd->s68k_regs[0x33] & PCDS_IEN4) { if (Pico_mcd->s68k_regs[0x33] & PCDS_IEN4) {
elprintf(EL_INTS|EL_CD, "s68k: cdd irq 4"); elprintf(EL_INTS|EL_CD, "s68k: cdd irq 4");
SekInterruptS68k(4); pcd_irq_s68k(4, 1);
} }
} }
@ -188,7 +188,7 @@ static void pcd_int3_timer_event(unsigned int now)
{ {
if (Pico_mcd->s68k_regs[0x33] & PCDS_IEN3) { if (Pico_mcd->s68k_regs[0x33] & PCDS_IEN3) {
elprintf(EL_INTS|EL_CD, "s68k: timer irq 3"); elprintf(EL_INTS|EL_CD, "s68k: timer irq 3");
SekInterruptS68k(3); pcd_irq_s68k(3, 1);
} }
if (Pico_mcd->s68k_regs[0x31] != 0) if (Pico_mcd->s68k_regs[0x31] != 0)
@ -280,6 +280,16 @@ static void pcd_run_events(unsigned int until)
oldest, event_time_next); oldest, event_time_next);
} }
void pcd_irq_s68k(int irq, int state)
{
if (state) {
SekInterruptS68k(irq);
SekSetStopS68k(0);
Pico_mcd->m.s68k_poll_a = 0;
} else
SekInterruptClearS68k(irq);
}
int pcd_sync_s68k(unsigned int m68k_target, int m68k_poll_sync) int pcd_sync_s68k(unsigned int m68k_target, int m68k_poll_sync)
{ {
#define now SekCycleCntS68k #define now SekCycleCntS68k

6
pico/cd/memory.c
View file

@ -150,7 +150,7 @@ void m68k_reg_write8(u32 a, u32 d)
if (d && (Pico_mcd->s68k_regs[0x33] & PCDS_IEN2)) { if (d && (Pico_mcd->s68k_regs[0x33] & PCDS_IEN2)) {
elprintf(EL_INTS, "m68k: s68k irq 2"); elprintf(EL_INTS, "m68k: s68k irq 2");
pcd_sync_s68k(SekCyclesDone(), 0); pcd_sync_s68k(SekCyclesDone(), 0);
SekInterruptS68k(2); pcd_irq_s68k(2, 1);
} }
return; return;
case 1: case 1:
@ -425,7 +425,7 @@ void s68k_reg_write8(u32 a, u32 d)
// XXX: emulate pending irq instead? // XXX: emulate pending irq instead?
if (Pico_mcd->s68k_regs[0x37] & 4) { if (Pico_mcd->s68k_regs[0x37] & 4) {
elprintf(EL_INTS, "cdd export irq 4 (unmask)"); elprintf(EL_INTS, "cdd export irq 4 (unmask)");
SekInterruptS68k(4); pcd_irq_s68k(4, 1);
} }
} }
break; break;
@ -443,7 +443,7 @@ void s68k_reg_write8(u32 a, u32 d)
if (Pico_mcd->s68k_regs[0x33] & PCDS_IEN4) { if (Pico_mcd->s68k_regs[0x33] & PCDS_IEN4) {
elprintf(EL_INTS, "cdd export irq 4"); elprintf(EL_INTS, "cdd export irq 4");
SekInterruptS68k(4); pcd_irq_s68k(4, 1);
} }
} }
return; return;

1
pico/pico_int.h
View file

@ -773,6 +773,7 @@ void pcd_event_schedule(unsigned int now, enum pcd_event event, int after);
void pcd_event_schedule_s68k(enum pcd_event event, int after); void pcd_event_schedule_s68k(enum pcd_event event, int after);
void pcd_prepare_frame(void); void pcd_prepare_frame(void);
unsigned int pcd_cycles_m68k_to_s68k(unsigned int c); unsigned int pcd_cycles_m68k_to_s68k(unsigned int c);
void pcd_irq_s68k(int irq, int state);
int pcd_sync_s68k(unsigned int m68k_target, int m68k_poll_sync); int pcd_sync_s68k(unsigned int m68k_target, int m68k_poll_sync);
void pcd_run_cpus(int m68k_cycles); void pcd_run_cpus(int m68k_cycles);
void pcd_soft_reset(void); void pcd_soft_reset(void);