nonacc mode removal, function return value audit

[picodrive.git] / Pico / Memory.c

diff --git a/Pico/Memory.c b/Pico/Memory.c
index 88e3a32..22bd7ad 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -89,10 +89,9 @@ PICO_INTERNAL u32 PicoCheckPc(u32 pc)
 }\r
 \r
 \r
-PICO_INTERNAL int PicoInitPc(u32 pc)\r
+PICO_INTERNAL void PicoInitPc(u32 pc)\r
 {\r
   PicoCheckPc(pc);\r
-  return 0;\r
 }\r
 \r
 #ifndef _ASM_MEMORY_C\r
@@ -689,8 +688,6 @@ static void m68k_mem_setup(void)
 \r
 // -----------------------------------------------------------------\r
 \r
-extern const unsigned short vcounts[];\r
-\r
 static int get_scanline(int is_from_z80)\r
 {\r
   if (is_from_z80) {\r
@@ -700,10 +697,7 @@ static int get_scanline(int is_from_z80)
     return z80_scanline;\r
   }\r
 \r
-  if (Pico.m.scanline != -1)\r
-    return Pico.m.scanline;\r
-\r
-  return vcounts[SekCyclesDone()>>8];\r
+  return Pico.m.scanline;\r
 }\r
 \r
 /* probably not should be in this file, but it's near related code here */\r