void NOINLINE ctl_write_z80busreq(u32 d)\r
{\r
d&=1; d^=1;\r
- elprintf(EL_BUSREQ, "set_zrun: %i->%i [%i] @%06x", Pico.m.z80Run, d, SekCyclesDone(), SekPc);\r
+ elprintf(EL_BUSREQ, "set_zrun: %i->%i [%u] @%06x", Pico.m.z80Run, d, SekCyclesDone(), SekPc);\r
if (d ^ Pico.m.z80Run)\r
{\r
if (d)\r
void NOINLINE ctl_write_z80reset(u32 d)\r
{\r
d&=1; d^=1;\r
- elprintf(EL_BUSREQ, "set_zreset: %i->%i [%i] @%06x", Pico.m.z80_reset, d, SekCyclesDone(), SekPc);\r
+ elprintf(EL_BUSREQ, "set_zreset: %i->%i [%u] @%06x", Pico.m.z80_reset, d, SekCyclesDone(), SekPc);\r
if (d ^ Pico.m.z80_reset)\r
{\r
if (d)\r
}\r
}\r
\r
+static int get_scanline(int is_from_z80);\r
+\r
+static void psg_write_68k(u32 d)\r
+{\r
+ // look for volume write and update if needed\r
+ if ((d & 0x90) == 0x90 && PsndPsgLine < Pico.m.scanline)\r
+ PsndDoPSG(Pico.m.scanline);\r
+\r
+ SN76496Write(d);\r
+}\r
+\r
+static void psg_write_z80(u32 d)\r
+{\r
+ if ((d & 0x90) == 0x90) {\r
+ int scanline = get_scanline(1);\r
+ if (PsndPsgLine < scanline)\r
+ PsndDoPSG(scanline);\r
+ }\r
+\r
+ SN76496Write(d);\r
+}\r
+\r
// -----------------------------------------------------------------\r
\r
#ifndef _ASM_MEMORY_C\r
}\r
\r
if ((a & 0x4000) == 0x0000) { // z80 RAM\r
- SekCyclesBurnRun(2); // FIXME hack\r
Pico.zram[a & 0x1fff] = (u8)d;\r
return;\r
}\r
}\r
// TODO: probably other VDP access too? Maybe more mirrors?\r
if ((a & 0x7ff9) == 0x7f11) { // PSG Sound\r
- if (PicoOpt & POPT_EN_PSG)\r
- SN76496Write(d);\r
+ psg_write_68k(d);\r
return;\r
}\r
if ((a & 0x7f00) == 0x6000) // Z80 BANK register\r
\r
if ((a & 0xff01) == 0x1100) { // z80 busreq (verified)\r
d |= (Pico.m.z80Run | Pico.m.z80_reset) & 1;\r
- elprintf(EL_BUSREQ, "get_zrun: %02x [%i] @%06x", d, SekCyclesDone(), SekPc);\r
+ elprintf(EL_BUSREQ, "get_zrun: %02x [%u] @%06x", d, SekCyclesDone(), SekPc);\r
}\r
goto end;\r
}\r
\r
if ((a & 0xff00) == 0x1100) { // z80 busreq\r
d |= ((Pico.m.z80Run | Pico.m.z80_reset) & 1) << 8;\r
- elprintf(EL_BUSREQ, "get_zrun: %04x [%i] @%06x", d, SekCyclesDone(), SekPc);\r
+ elprintf(EL_BUSREQ, "get_zrun: %04x [%u] @%06x", d, SekCyclesDone(), SekPc);\r
}\r
goto end;\r
}\r
\r
// VDP area (0xc00000 - 0xdfffff)\r
// TODO: verify if lower byte goes to PSG on word writes\r
-static u32 PicoRead8_vdp(u32 a)\r
+u32 PicoRead8_vdp(u32 a)\r
{\r
- if ((a & 0x00e0) == 0x0000)\r
- return PicoVideoRead8(a);\r
+ if ((a & 0x00f0) == 0x0000) {\r
+ switch (a & 0x0d)\r
+ {\r
+ case 0x00: return PicoVideoRead8DataH();\r
+ case 0x01: return PicoVideoRead8DataL();\r
+ case 0x04: return PicoVideoRead8CtlH();\r
+ case 0x05: return PicoVideoRead8CtlL();\r
+ case 0x08:\r
+ case 0x0c: return PicoVideoRead8HV_H();\r
+ case 0x09:\r
+ case 0x0d: return PicoVideoRead8HV_L();\r
+ }\r
+ }\r
\r
elprintf(EL_UIO|EL_ANOMALY, "68k bad read [%06x] @%06x", a, SekPc);\r
return 0;\r
static void PicoWrite8_vdp(u32 a, u32 d)\r
{\r
if ((a & 0x00f9) == 0x0011) { // PSG Sound\r
- if (PicoOpt & POPT_EN_PSG)\r
- SN76496Write(d);\r
+ psg_write_68k(d);\r
return;\r
}\r
if ((a & 0x00e0) == 0x0000) {\r
\r
static void PicoWrite16_vdp(u32 a, u32 d)\r
{\r
- if ((a & 0x00f9) == 0x0010) { // PSG Sound\r
- if (PicoOpt & POPT_EN_PSG)\r
- SN76496Write(d);\r
- return;\r
- }\r
+ if ((a & 0x00f9) == 0x0010) // PSG Sound\r
+ psg_write_68k(d);\r
if ((a & 0x00e0) == 0x0000) {\r
PicoVideoWrite(a, d);\r
return;\r
\r
static unsigned char z80_md_vdp_read(unsigned short a)\r
{\r
- if ((a & 0x00e0) == 0x0000)\r
- return PicoVideoRead8(a); // FIXME: depends on 68k cycles\r
+ z80_subCLeft(2);\r
+\r
+ if ((a & 0x00f0) == 0x0000) {\r
+ switch (a & 0x0d)\r
+ {\r
+ case 0x00: return PicoVideoRead8DataH();\r
+ case 0x01: return PicoVideoRead8DataL();\r
+ case 0x04: return PicoVideoRead8CtlH();\r
+ case 0x05: return PicoVideoRead8CtlL();\r
+ case 0x08:\r
+ case 0x0c: return get_scanline(1); // FIXME: make it proper\r
+ case 0x09:\r
+ case 0x0d: return Pico.m.rotate++;\r
+ }\r
+ }\r
\r
elprintf(EL_ANOMALY, "z80 invalid r8 [%06x] %02x", a, 0xff);\r
return 0xff;\r
unsigned int addr68k;\r
unsigned char ret;\r
\r
- addr68k = Pico.m.z80_bank68k<<15;\r
- addr68k += a & 0x7fff;\r
+ z80_subCLeft(3);\r
+\r
+ addr68k = Pico.m.z80_bank68k << 15;\r
+ addr68k |= a & 0x7fff;\r
\r
ret = m68k_read8(addr68k);\r
\r
{\r
if ((a&0xfff9) == 0x7f11) // 7f11 7f13 7f15 7f17\r
{\r
- if (PicoOpt & POPT_EN_PSG)\r
- SN76496Write(data);\r
+ psg_write_z80(data);\r
return;\r
}\r
// at least VDP data writes hang my machine\r