}\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
int PadRead(int i)\r
{\r
int pad,value,data_reg;\r
- pad=~PicoPad[i]; // Get inverse of pad MXYZ SACB RLDU\r
+ pad=~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU\r
data_reg=Pico.ioports[i+1];\r
\r
// orr the bits, which are set as output\r
log_io(a, 8, 0);\r
if ((a&0xff4000)==0xa00000) { d=z80Read8(a); goto end; } // Z80 Ram\r
\r
- if ((a&0xe700e0)==0xc00000) // VDP\r
- d=PicoVideoRead(a);\r
- else d=OtherRead16(a&~1, 8);\r
+ if ((a&0xe700e0)==0xc00000) { d=PicoVideoRead8(a); goto end; } // VDP\r
+\r
+ d=OtherRead16(a&~1, 8);\r
if ((a&1)==0) d>>=8;\r
\r
end:\r
\r
static void PicoWrite32(u32 a,u32 d)\r
{\r
- elprintf(EL_IO, "w32: %06x, %08x", a&0xffffff, d);\r
+ elprintf(EL_IO, "w32: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
#ifdef EMU_CORE_DEBUG\r
lastwrite_cyc_d[lwp_cyc++&15] = d;\r
#endif\r
\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
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
+/* probably should not be in this file, but it's near related code here */\r
void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new)\r
{\r
int xcycles = z80_cycles << 8;\r
\r
if ((mode_old ^ mode_new) & 1) // turning on/off\r
{\r
- if (mode_old & 1) {\r
- timer_a_offset = timer_a_next_oflow - xcycles;\r
+ if (mode_old & 1)\r
timer_a_next_oflow = TIMER_NO_OFLOW;\r
- }\r
else\r
- timer_a_next_oflow = xcycles + timer_a_offset;\r
+ timer_a_next_oflow = xcycles + timer_a_step;\r
}\r
if (mode_new & 1)\r
elprintf(EL_YMTIMER, "timer a upd to %i @ %i", timer_a_next_oflow>>8, z80_cycles);\r
\r
if ((mode_old ^ mode_new) & 2)\r
{\r
- if (mode_old & 2) {\r
- timer_b_offset = timer_b_next_oflow - xcycles;\r
+ if (mode_old & 2)\r
timer_b_next_oflow = TIMER_NO_OFLOW;\r
- }\r
else\r
- timer_b_next_oflow = xcycles + timer_b_offset;\r
+ timer_b_next_oflow = xcycles + timer_b_step;\r
}\r
if (mode_new & 2)\r
elprintf(EL_YMTIMER, "timer b upd to %i @ %i", timer_b_next_oflow>>8, z80_cycles);\r
ym2612.OPN.ST.TA = TAnew;\r
//ym2612.OPN.ST.TAC = (1024-TAnew)*18;\r
//ym2612.OPN.ST.TAT = 0;\r
- timer_a_step = timer_a_offset = 16466 * (1024 - TAnew);\r
+ timer_a_step = TIMER_A_TICK_ZCYCLES * (1024 - TAnew);\r
if (ym2612.OPN.ST.mode & 1) {\r
+ // this is not right, should really be done on overflow only\r
int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());\r
timer_a_next_oflow = (cycles << 8) + timer_a_step;\r
}\r
ym2612.OPN.ST.TB = d;\r
//ym2612.OPN.ST.TBC = (256-d) * 288;\r
//ym2612.OPN.ST.TBT = 0;\r
- timer_b_step = timer_b_offset = 262800 * (256 - d); // 262881\r
+ timer_b_step = TIMER_B_TICK_ZCYCLES * (256 - d); // 262800\r
if (ym2612.OPN.ST.mode & 2) {\r
int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());\r
timer_b_next_oflow = (cycles << 8) + timer_b_step;\r
\r
if ((d ^ old_mode) & 0xc0) {\r
#ifdef __GP2X__\r
- if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, get_scanline(is_from_z80));\r
+ if (PicoOpt & POPT_EXT_FM) return YM2612Write_940(a, d, get_scanline(is_from_z80));\r
#endif\r
return 1;\r
}\r
tac = (1024 - ym2612.OPN.ST.TA) << 16;\r
tbc = (256 - ym2612.OPN.ST.TB) << 16;\r
if (ym2612.OPN.ST.mode & 1)\r
- timer_a_next_oflow = (double)(tac - tat) / (double)tac * timer_a_step;\r
+ timer_a_next_oflow = (int)((double)(tac - tat) / (double)tac * timer_a_step);\r
else\r
timer_a_next_oflow = TIMER_NO_OFLOW;\r
if (ym2612.OPN.ST.mode & 2)\r
- timer_b_next_oflow = (double)(tbc - tbt) / (double)tbc * timer_b_step;\r
+ timer_b_next_oflow = (int)((double)(tbc - tbt) / (double)tbc * timer_b_step);\r
else\r
timer_b_next_oflow = TIMER_NO_OFLOW;\r
elprintf(EL_YMTIMER, "load: %i/%i, timer_a_next_oflow %i", tat>>16, tac>>16, timer_a_next_oflow >> 8);\r
\r
if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)\r
{\r
- if (PicoOpt&POPT_EN_FM) ret = ym2612_read_local_z80();\r
- return ret;\r
+ return ym2612_read_local_z80();\r
}\r
\r
if (a>=0x8000)\r