X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FPico.c;h=5669238ffa39c811f43c89eddbc9d8f8eeb009d6;hb=fb9bec948efc6c7edca8f5463bc0c3522f96c165;hp=bd60d7b7e432160f5ad93741caa73d12f918cde0;hpb=48e8482fc2d74c9b96e581241390bade986acb22;p=picodrive.git diff --git a/Pico/cd/Pico.c b/Pico/cd/Pico.c index bd60d7b..5669238 100644 --- a/Pico/cd/Pico.c +++ b/Pico/cd/Pico.c @@ -1,20 +1,37 @@ -// 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 i, d; \ + FILE *f; \ +\ + for (i = 0; i < sizeof(ram); i+=2) { \ + d = (ram[i]<<8) | ram[i+1]; \ + *(unsigned short *)(ram+i) = d; \ + } \ + f = fopen(fname, "wb"); \ + if (f) { \ + fwrite(ram, 1, sizeof(ram), f); \ + fclose(f); \ + } \ + for (i = 0; i < sizeof(ram); i+=2) { \ + d = (ram[i]<<8) | ram[i+1]; \ + *(unsigned short *)(ram+i) = d; \ + } \ +} -int PicoInitMCD(void) +PICO_INTERNAL int PicoInitMCD(void) { SekInitS68k(); Init_CD_Driver(); @@ -23,27 +40,30 @@ int PicoInitMCD(void) } -void PicoExitMCD(void) +PICO_INTERNAL void PicoExitMCD(void) { End_CD_Driver(); + + //dump_ram(Pico_mcd->prg_ram, "prg.bin"); + //dump_ram(Pico.ram, "ram.bin"); } -int PicoResetMCD(int hard) +PICO_INTERNAL int PicoResetMCD(int hard) { if (hard) { - int fmt_size = sizeof(formatted_bram); - memset(Pico_mcd->prg_ram, 0, sizeof(Pico_mcd->prg_ram)); - 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->bram, 0, sizeof(Pico_mcd->bram)); - memcpy(Pico_mcd->bram + sizeof(Pico_mcd->bram) - fmt_size, formatted_bram, fmt_size); + int fmt_size = sizeof(formatted_bram); + memset(Pico_mcd->prg_ram, 0, sizeof(Pico_mcd->prg_ram)); + 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->bram, 0, sizeof(Pico_mcd->bram)); + memcpy(Pico_mcd->bram + sizeof(Pico_mcd->bram) - fmt_size, formatted_bram, fmt_size); } memset(Pico_mcd->s68k_regs, 0, sizeof(Pico_mcd->s68k_regs)); memset(&Pico_mcd->pcm, 0, sizeof(Pico_mcd->pcm)); memset(&Pico_mcd->m, 0, sizeof(Pico_mcd->m)); *(unsigned int *)(Pico_mcd->bios + 0x70) = 0xffffffff; // reset hint vector (simplest way to implement reg6) - Pico_mcd->m.state_flags |= 2; // s68k reset pending + Pico_mcd->m.state_flags |= 1; // s68k reset pending Pico_mcd->s68k_regs[3] = 1; // 2M word RAM mode with m68k access after reset Reset_CD(); @@ -51,13 +71,19 @@ int PicoResetMCD(int hard) gfx_cd_reset(); #ifdef _ASM_CD_MEMORY_C PicoMemResetCD(1); - PicoMemResetCDdecode(1); + //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; @@ -90,11 +116,13 @@ static __inline void SekRunS68k(int cyc) #define PS_STEP_M68K ((488<<16)/20) // ~24 //#define PS_STEP_S68K 13 -#ifndef _ASM_CD_PICO_C +#ifdef _ASM_CD_PICO_C +void SekRunPS(int cyc_m68k, int cyc_s68k); +#else 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; @@ -106,7 +134,6 @@ static __inline void SekRunPS(int cyc_m68k, int 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; @@ -117,7 +144,6 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k) 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; @@ -128,13 +154,8 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k) 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); } -#else -void SekRunPS(int cyc_m68k, int cyc_s68k); #endif @@ -185,6 +206,20 @@ static __inline void update_chips(void) // update gfx chip if (Pico_mcd->rot_comp.Reg_58 & 0x8000) gfx_cd_update(); + + // delayed setting of DMNA bit (needed for Silpheed) + if (Pico_mcd->m.state_flags & 2) { + Pico_mcd->m.state_flags &= ~2; + 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; + } +#endif + } + } } @@ -250,7 +285,7 @@ static int PicoFrameHintsMCD(void) { //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); @@ -284,18 +319,25 @@ static int PicoFrameHintsMCD(void) // Run scanline: //dprintf("m68k starting exec @ %06x", SekPc); - if(Pico.m.dma_bytes) SekCycleCnt+=CheckDMA(); - if((PicoOpt & 0x2000) && (Pico_mcd->m.busreq&3) == 1) { + if (Pico.m.dma_bytes) 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); } - if((PicoOpt&4) && Pico.m.z80Run) { - Pico.m.z80Run|=2; - z80CycleAim+=cycles_z80; + if ((PicoOpt&4) && Pico.m.z80Run) { + if (Pico.m.z80Run & 2) z80CycleAim+=cycles_z80; + else { + int cnt = SekCyclesDone() - z80startCycle; + cnt = (cnt>>1)-(cnt>>5); + //if (cnt > cycles_z80) printf("FIXME: z80 cycles: %i\n", cnt); + if (cnt > cycles_z80) cnt = cycles_z80; + Pico.m.z80Run |= 2; + z80CycleAim+=cnt; + } total_z80+=z80_run(z80CycleAim-total_z80); } @@ -303,14 +345,14 @@ static int PicoFrameHintsMCD(void) } // draw a frame just after vblank in alternative render mode - if(!PicoSkipFrame && (PicoOpt&0x10)) + if (!PicoSkipFrame && (PicoOpt&0x10)) PicoFrameFull(); return 0; } -int PicoFrameMCD(void) +PICO_INTERNAL int PicoFrameMCD(void) { if(!(PicoOpt&0x10)) PicoFrameStart();