X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPicoInt.h;h=8525198f351bfc558ee0fb5471dd15f3b7e15eca;hb=4b9c58882616c5205a5ad5c9350f20a3d22bd7e1;hp=d3b1273c5e9ce127b8b3bf17ff0d4c1171d6d2cc;hpb=602133e1c66666f9152b1edb3014e137a9768cad;p=picodrive.git diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h index d3b1273..8525198 100644 --- a/Pico/PicoInt.h +++ b/Pico/PicoInt.h @@ -137,7 +137,7 @@ extern unsigned int SekCycleCntT; // total cycle counter, updated once per frame SekCycleAim=0; \ } #define SekCyclesBurn(c) SekCycleCnt+=c -#define SekCyclesDone() (SekCycleAim-SekCyclesLeft) // nuber of cycles done in this frame (can be checked anywhere) +#define SekCyclesDone() (SekCycleAim-SekCyclesLeft) // number of cycles done in this frame (can be checked anywhere) #define SekCyclesDoneT() (SekCycleCntT+SekCyclesDone()) // total nuber of cycles done for this rom #define SekEndRun(after) { \ @@ -156,14 +156,17 @@ extern int SekCycleAimS68k; #define SekCyclesDoneS68k() (SekCycleAimS68k-SekCyclesLeftS68k) #ifdef EMU_CORE_DEBUG +extern int dbg_irq_level; #undef SekSetCyclesLeftNoMCD #undef SekSetCyclesLeft #undef SekCyclesBurn #undef SekEndRun +#undef SekInterrupt #define SekSetCyclesLeftNoMCD(c) #define SekSetCyclesLeft(c) #define SekCyclesBurn(c) c #define SekEndRun(c) +#define SekInterrupt(irq) dbg_irq_level=irq #endif // ----------------------- Z80 CPU ----------------------- @@ -171,10 +174,9 @@ extern int SekCycleAimS68k; #if defined(_USE_MZ80) #include "../cpu/mz80/mz80.h" -#define z80_run(cycles) mz80_run(cycles) +#define z80_run(cycles) { mz80GetElapsedTicks(1); mz80_run(cycles) } #define z80_run_nr(cycles) mz80_run(cycles) #define z80_int() mz80int(0) -#define z80_resetCycles() mz80GetElapsedTicks(1) #elif defined(_USE_DRZ80) #include "../cpu/DrZ80/drz80.h" @@ -187,7 +189,8 @@ extern struct DrZ80 drZ80; drZ80.z80irqvector = 0xFF; /* default IRQ vector RST opcode */ \ drZ80.Z80_IRQ = 1; \ } -#define z80_resetCycles() + +#define z80_cyclesLeft drZ80.cycles #elif defined(_USE_CZ80) #include "../cpu/cz80/cz80.h" @@ -195,24 +198,32 @@ extern struct DrZ80 drZ80; #define z80_run(cycles) Cz80_Exec(&CZ80, cycles) #define z80_run_nr(cycles) Cz80_Exec(&CZ80, cycles) #define z80_int() Cz80_Set_IRQ(&CZ80, 0, HOLD_LINE) -#define z80_resetCycles() + +#define z80_cyclesLeft (CZ80.ICount - CZ80.ExtraCycles) #else #define z80_run(cycles) (cycles) #define z80_run_nr(cycles) #define z80_int() -#define z80_resetCycles() #endif -// --------------------------------------------------------- +extern int z80stopCycle; /* in 68k cycles */ +extern int z80_cycle_cnt; /* 'done' z80 cycles before z80_run() */ +extern int z80_cycle_aim; +extern int z80_scanline; +extern int z80_scanline_cycles; /* cycles done until z80_scanline */ + +#define z80_resetCycles() \ + z80_cycle_cnt = z80_cycle_aim = z80_scanline = z80_scanline_cycles = 0; -// Pico active hw -#define PAHW_MCD (1<<0) -#define PAHW_32X (1<<1) -#define PAHW_SVP (1<<2) -extern int PicoAHW; +#define z80_cyclesDone() \ + (z80_cycle_aim - z80_cyclesLeft) + +#define cycles_68k_to_z80(x) ((x)*957 >> 11) + +// --------------------------------------------------------- // main oscillator clock which controls timing #define OSC_NTSC 53693100 @@ -245,7 +256,7 @@ struct PicoMisc unsigned short z80_bank68k; // 0a unsigned short z80_lastaddr; // this is for Z80 faking unsigned char z80_fakeval; - unsigned char pad0; + unsigned char z80_reset; // z80 reset held unsigned char padDelay[2]; // 10 gamepad phase time outs, so we count a delay unsigned short eeprom_addr; // EEPROM address register unsigned char eeprom_cycle; // EEPROM SRAM cycle number @@ -318,9 +329,7 @@ struct mcd_misc unsigned char s68k_pend_ints; unsigned int state_flags; // 04: emu state: reset_pending, dmna_pending unsigned int counter75hz; - unsigned short audio_offset; // 0c: for savestates: play pointer offset (0-1023) - unsigned char audio_track; // playing audio track # (zero based) - char pad1; + unsigned int pad0; int timer_int3; // 10 unsigned int timer_stopwatch; unsigned char bcram_reg; // 18: battery-backed RAM cart register @@ -363,6 +372,7 @@ typedef struct #define Pico_mcd ((mcd_state *)Pico.rom) + // Area.c PICO_INTERNAL int PicoAreaPackCpu(unsigned char *cpu, int is_sub); PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub); @@ -395,6 +405,7 @@ PICO_INTERNAL void PicoFrameFull(); // Memory.c PICO_INTERNAL int PicoInitPc(unsigned int pc); +PICO_INTERNAL unsigned int PicoCheckPc(unsigned int pc); PICO_INTERNAL_ASM unsigned int PicoRead32(unsigned int a); PICO_INTERNAL void PicoMemSetup(void); PICO_INTERNAL_ASM void PicoMemReset(void); @@ -408,6 +419,7 @@ PICO_INTERNAL unsigned short z80_read16(unsigned short a); #else PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data); #endif +PICO_INTERNAL int ym2612_write_local(unsigned int a, unsigned int d, int is_from_z80); extern unsigned int (*PicoRead16Hook)(unsigned int a, int realsize); extern void (*PicoWrite8Hook) (unsigned int a,unsigned int d,int realsize); extern void (*PicoWrite16Hook)(unsigned int a,unsigned int d,int realsize); @@ -417,14 +429,18 @@ PICO_INTERNAL void PicoMemSetupCD(void); PICO_INTERNAL_ASM void PicoMemResetCD(int r3); PICO_INTERNAL_ASM void PicoMemResetCDdecode(int r3); +// Pico/Memory.c +PICO_INTERNAL void PicoMemSetupPico(void); + // Pico.c extern struct Pico Pico; extern struct PicoSRAM SRam; extern int emustatus; -extern int z80startCycle, z80stopCycle; // in 68k cycles extern void (*PicoResetHook)(void); extern void (*PicoLineHook)(int count); -PICO_INTERNAL int CheckDMA(void); +PICO_INTERNAL int CheckDMA(void); +PICO_INTERNAL void PicoDetectRegion(void); +PICO_INTERNAL void PicoSyncZ80(int m68k_cycles_done); // cd/Pico.c PICO_INTERNAL int PicoInitMCD(void); @@ -433,6 +449,15 @@ PICO_INTERNAL void PicoPowerMCD(void); PICO_INTERNAL int PicoResetMCD(void); PICO_INTERNAL int PicoFrameMCD(void); +// Pico/Pico.c +PICO_INTERNAL int PicoInitPico(void); +PICO_INTERNAL void PicoReratePico(void); + +// Pico/xpcm.c +PICO_INTERNAL void PicoPicoPCMUpdate(short *buffer, int length, int stereo); +PICO_INTERNAL void PicoPicoPCMReset(void); +PICO_INTERNAL void PicoPicoPCMRerate(int xpcm_rate); + // Sek.c PICO_INTERNAL int SekInit(void); PICO_INTERNAL int SekReset(void); @@ -445,8 +470,17 @@ PICO_INTERNAL int SekResetS68k(void); PICO_INTERNAL int SekInterruptS68k(int irq); // sound/sound.c +PICO_INTERNAL void cdda_start_play(); +extern short cdda_out_buffer[2*1152]; extern int PsndLen_exc_cnt; extern int PsndLen_exc_add; +extern int timer_a_next_oflow, timer_a_step; // in z80 cycles + +#define timers_cycle() \ + if (timer_a_next_oflow > 0) timer_a_next_oflow -= Pico.m.pal ? 70938*256 : 59659*256 + +#define timers_reset() \ + timer_a_next_oflow = 0x80000000 // VideoPort.c PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d); @@ -471,7 +505,7 @@ PICO_INTERNAL void PicoCDBufferRead(void *dest, int lba); // sound/sound.c PICO_INTERNAL void PsndReset(void); -PICO_INTERNAL void Psnd_timers_and_dac(int raster); +PICO_INTERNAL void PsndDoDAC(int line_to); PICO_INTERNAL int PsndRender(int offset, int length); PICO_INTERNAL void PsndClear(void); // z80 functionality wrappers @@ -480,7 +514,7 @@ PICO_INTERNAL void z80_pack(unsigned char *data); PICO_INTERNAL void z80_unpack(unsigned char *data); PICO_INTERNAL void z80_reset(void); PICO_INTERNAL void z80_exit(void); - +extern int PsndDacLine; #ifdef __cplusplus } // End of extern "C" @@ -506,6 +540,7 @@ PICO_INTERNAL void z80_exit(void); #define EL_IO 0x00001000 /* all i/o */ #define EL_CDPOLL 0x00002000 /* MCD: log poll detection */ #define EL_SVP 0x00004000 /* SVP stuff */ +#define EL_PICOHW 0x00008000 /* Pico stuff */ #define EL_STATUS 0x40000000 /* status messages */ #define EL_ANOMALY 0x80000000 /* some unexpected conditions (during emulation) */