-// This is part of Pico Library
-
-// (c) Copyright 2004 Dave, All rights reserved.
// (c) Copyright 2007 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
#include "../PicoInt.h"
-#include "../sound/sound.h"
extern unsigned char formatted_bram[4*0x10];
extern unsigned int s68k_poll_adclk;
+void (*PicoMCDopenTray)(void) = NULL;
+int (*PicoMCDcloseTray)(void) = NULL;
#define dump_ram(ram,fname) \
{ \
}
-int PicoInitMCD(void)
+PICO_INTERNAL int PicoInitMCD(void)
{
SekInitS68k();
Init_CD_Driver();
}
-void PicoExitMCD(void)
+PICO_INTERNAL void PicoExitMCD(void)
{
End_CD_Driver();
//dump_ram(Pico.ram, "ram.bin");
}
-int PicoResetMCD(int hard)
+PICO_INTERNAL int PicoResetMCD(int hard)
{
if (hard) {
int fmt_size = sizeof(formatted_bram);
//PicoMemResetCDdecode(1); // don't have to call this in 2M mode
#endif
+ // use SRam.data for RAM cart
+ if (SRam.data) free(SRam.data);
+ SRam.data = NULL;
+ if (PicoOpt&0x8000)
+ SRam.data = calloc(1, 0x12000);
+
return 0;
}
-static __inline void SekRun(int cyc)
+static __inline void SekRunM68k(int cyc)
{
int cyc_do;
SekCycleAim+=cyc;
static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
{
int cycn, cycn_s68k, cyc_do;
- int d_cm = 0, d_cs = 0, ex;
+ int ex;
SekCycleAim+=cyc_m68k;
SekCycleAimS68k+=cyc_s68k;
{
ex = 0;
cycn_s68k = (cycn + cycn/2 + cycn/8) >> 16;
-//fprintf(stderr, "%3i/%3i: ", cycn>>16, cycn_s68k);
if ((cyc_do = SekCycleAim-SekCycleCnt-(cycn>>16)) > 0) {
#if defined(EMU_C68K)
PicoCpu.cycles = cyc_do;
SekCycleCnt += (ex = m68k_execute(cyc_do));
#endif
}
-//fprintf(stderr, "%3i ", ex); d_cm += ex; ex = 0;
if ((cyc_do = SekCycleAimS68k-SekCycleCntS68k-cycn_s68k) > 0) {
#if defined(EMU_C68K)
PicoCpuS68k.cycles = cyc_do;
SekCycleCntS68k += (ex = m68k_execute(cyc_do));
#endif
}
-//fprintf(stderr, "%3i\n", ex); d_cs += ex;
}
-
-//fprintf(stderr, "== end %3i/%3i ==\n", d_cm, d_cs);
}
#endif
Pico_mcd->m.timer_int3 -= counter_timer;
if (Pico_mcd->m.timer_int3 < 0) {
if (Pico_mcd->s68k_regs[0x33] & (1<<3)) {
- dprintf("s68k: timer irq 3");
+ elprintf(EL_INTS, "s68k: timer irq 3");
SekInterruptS68k(3);
Pico_mcd->m.timer_int3 += int3_set << 16;
}
// delayed setting of DMNA bit (needed for Silpheed)
if (Pico_mcd->m.state_flags & 2) {
Pico_mcd->m.state_flags &= ~2;
- Pico_mcd->s68k_regs[3] |= 2;
- Pico_mcd->s68k_regs[3] &= ~1;
+ if (!(Pico_mcd->s68k_regs[3] & 4)) {
+ Pico_mcd->s68k_regs[3] |= 2;
+ Pico_mcd->s68k_regs[3] &= ~1;
#ifdef USE_POLL_DETECT
- if ((s68k_poll_adclk&0xfe) == 2) {
- SekSetStopS68k(0); s68k_poll_adclk = 0;
- }
+ if ((s68k_poll_adclk&0xfe) == 2) {
+ SekSetStopS68k(0); s68k_poll_adclk = 0;
+ }
#endif
+ }
}
}
{
//dprintf("vint: @ %06x [%i|%i]", SekPc, y, SekCycleCnt);
pv->status|=0x88; // V-Int happened, go into vblank
- SekRun(128); SekCycleAim-=128; // there must be a gap between H and V ints, also after vblank bit set (Mazin Saga, Bram Stoker's Dracula)
+ SekRunM68k(128); SekCycleAim-=128; // there must be a gap between H and V ints, also after vblank bit set (Mazin Saga, Bram Stoker's Dracula)
/*if(Pico.m.z80Run && (PicoOpt&4)) {
z80CycleAim+=cycles_z80/2;
total_z80+=z80_run(z80CycleAim-total_z80);
// Run scanline:
//dprintf("m68k starting exec @ %06x", SekPc);
- if (Pico.m.dma_bytes) SekCycleCnt+=CheckDMA();
+ if (Pico.m.dma_xfers) SekCycleCnt+=CheckDMA();
if ((PicoOpt & 0x2000) && (Pico_mcd->m.busreq&3) == 1) {
SekRunPS(cycles_68k, cycles_s68k); // "better/perfect sync"
} else {
- SekRun(cycles_68k);
+ SekRunM68k(cycles_68k);
if ((Pico_mcd->m.busreq&3) == 1) // no busreq/no reset
SekRunS68k(cycles_s68k);
}
}
-int PicoFrameMCD(void)
+PICO_INTERNAL int PicoFrameMCD(void)
{
if(!(PicoOpt&0x10))
PicoFrameStart();