X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemory.c;h=22bd7ad49760bbc2c6a063051158e955161a6c99;hb=2aa27095f2dbf5b38950fcb1f856d5ffc6a70361;hp=88e3a3220edf77b5b526996edd773b203b6ea33d;hpb=b6d7ac70909e29ba8f40d6eaee53dd5b1bb71e52;p=picodrive.git diff --git a/Pico/Memory.c b/Pico/Memory.c index 88e3a32..22bd7ad 100644 --- a/Pico/Memory.c +++ b/Pico/Memory.c @@ -89,10 +89,9 @@ PICO_INTERNAL u32 PicoCheckPc(u32 pc) } -PICO_INTERNAL int PicoInitPc(u32 pc) +PICO_INTERNAL void PicoInitPc(u32 pc) { PicoCheckPc(pc); - return 0; } #ifndef _ASM_MEMORY_C @@ -689,8 +688,6 @@ static void m68k_mem_setup(void) // ----------------------------------------------------------------- -extern const unsigned short vcounts[]; - static int get_scanline(int is_from_z80) { if (is_from_z80) { @@ -700,10 +697,7 @@ static int get_scanline(int is_from_z80) return z80_scanline; } - if (Pico.m.scanline != -1) - return Pico.m.scanline; - - return vcounts[SekCyclesDone()>>8]; + return Pico.m.scanline; } /* probably not should be in this file, but it's near related code here */