#include "../pico_int.h"\r
#include "../memory.h"\r
\r
-#include "gfx_cd.h"\r
-\r
uptr s68k_read8_map [0x1000000 >> M68K_MEM_SHIFT];\r
uptr s68k_read16_map [0x1000000 >> M68K_MEM_SHIFT];\r
uptr s68k_write8_map [0x1000000 >> M68K_MEM_SHIFT];\r
void m68k_comm_check(u32 a)\r
{\r
pcd_sync_s68k(SekCyclesDone(), 0);\r
+ if (a >= 0x0e && !Pico_mcd->m.need_sync) {\r
+ // there are cases when slave updates comm and only switches RAM\r
+ // over after that (mcd1b), so there must be a resync..\r
+ SekEndRun(64);\r
+ Pico_mcd->m.need_sync = 1;\r
+ }\r
if (SekNotPolling || a != Pico_mcd->m.m68k_poll_a) {\r
Pico_mcd->m.m68k_poll_a = a;\r
Pico_mcd->m.m68k_poll_cnt = 0;\r
d = *(u16 *)(Pico_mcd->bios + 0x72);\r
goto end;\r
case 8:\r
- d = Read_CDC_Host(0);\r
+ d = cdc_host_r();\r
goto end;\r
case 0xA:\r
elprintf(EL_UIO, "m68k FIXME: reserved read");\r
\r
pcd_sync_s68k(SekCyclesDone(), 0);\r
Pico_mcd->s68k_regs[a] = d;\r
- if (Pico_mcd->m.s68k_poll_a == (a & ~1)\r
- && Pico_mcd->m.s68k_poll_cnt > POLL_LIMIT)\r
+ if (Pico_mcd->m.s68k_poll_a == (a & ~1))\r
{\r
- SekSetStopS68k(0);\r
+ if (Pico_mcd->m.s68k_poll_cnt > POLL_LIMIT) {\r
+ elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);\r
+ SekSetStopS68k(0);\r
+ }\r
Pico_mcd->m.s68k_poll_a = 0;\r
- elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);\r
}\r
}\r
\r
elprintf(EL_CDREG3, "s68k_regs r3: %02x @%06x", (u8)d, SekPcS68k);\r
return s68k_poll_detect(a, d);\r
case 6:\r
- return CDC_Read_Reg();\r
+ return cdc_reg_r();\r
case 8:\r
- return Read_CDC_Host(1); // Gens returns 0 here on byte reads\r
+ return cdc_host_r();\r
case 0xC:\r
d = SekCyclesDoneS68k() - Pico_mcd->m.stopwatch_base_c;\r
d /= 384;\r
//dprintf("s68k CDC reg addr: %x", d&0xf);\r
break;\r
case 7:\r
- CDC_Write_Reg(d);\r
+ cdc_reg_w(d & 0xff);\r
return;\r
case 0xa:\r
elprintf(EL_CDREGS, "s68k set CDC dma addr");\r
elprintf(EL_CDREGS|EL_CD, "s68k irq mask: %02x", d);\r
d &= 0x7e;\r
if ((d ^ Pico_mcd->s68k_regs[0x33]) & d & PCDS_IEN4) {\r
- if (Pico_mcd->s68k_regs[0x37] & 4)\r
- CDD_Export_Status();\r
+ // XXX: emulate pending irq instead?\r
+ if (Pico_mcd->s68k_regs[0x37] & 4) {\r
+ elprintf(EL_INTS, "cdd export irq 4 (unmask)");\r
+ SekInterruptS68k(4);\r
+ }\r
}\r
break;\r
case 0x34: // fader\r
return; // d/m bit is unsetable\r
case 0x37: {\r
u32 d_old = Pico_mcd->s68k_regs[0x37];\r
- Pico_mcd->s68k_regs[0x37] = d&7;\r
+ Pico_mcd->s68k_regs[0x37] = d & 7;\r
if ((d&4) && !(d_old&4)) {\r
- CDD_Export_Status();\r
+ // ??\r
+ pcd_event_schedule_s68k(PCD_EVENT_CDC, 12500000/75);\r
+\r
+ if (Pico_mcd->s68k_regs[0x33] & PCDS_IEN4) {\r
+ elprintf(EL_INTS, "cdd export irq 4");\r
+ SekInterruptS68k(4);\r
+ }\r
}\r
return;\r
}\r
case 0x4b:\r
- Pico_mcd->s68k_regs[a] = (u8) d;\r
- CDD_Import_Command();\r
+ Pico_mcd->s68k_regs[a] = 0; // (u8) d; ?\r
+ cdd_process();\r
+ {\r
+ static const char *nm[] =\r
+ { "stat", "stop", "read_toc", "play",\r
+ "seek", "???", "pause", "resume",\r
+ "ff", "fr", "tjump", "???",\r
+ "close","open", "???", "???" };\r
+ u8 *c = &Pico_mcd->s68k_regs[0x42];\r
+ u8 *s = &Pico_mcd->s68k_regs[0x38];\r
+ elprintf(EL_CD,\r
+ "CDD command: %02x %02x %02x %02x %02x %02x %02x %02x %12s",\r
+ c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], nm[c[0] & 0x0f]);\r
+ elprintf(EL_CD,\r
+ "CDD status: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",\r
+ s[0], s[1], s[2], s[3], s[4], s[5], s[6], s[7], s[8], s[9]);\r
+ }\r
+ return;\r
+ case 0x58:\r
return;\r
}\r
\r
Pico_mcd->m.m68k_poll_cnt = 0;\r
}\r
\r
+void s68k_reg_write16(u32 a, u32 d)\r
+{\r
+ u8 *r = Pico_mcd->s68k_regs;\r
+\r
+ if ((a & 0x1f0) == 0x20)\r
+ goto write_comm;\r
+\r
+ switch (a) {\r
+ case 0x0e:\r
+ // special case, 2 byte writes would be handled differently\r
+ // TODO: verify\r
+ r[0xf] = d;\r
+ return;\r
+ case 0x58: // stamp data size\r
+ r[0x59] = d & 7;\r
+ return;\r
+ case 0x5a: // stamp map base address\r
+ r[0x5a] = d >> 8;\r
+ r[0x5b] = d & 0xe0;\r
+ return;\r
+ case 0x5c: // V cell size\r
+ r[0x5d] = d & 0x1f;\r
+ return;\r
+ case 0x5e: // image buffer start address\r
+ r[0x5e] = d >> 8;\r
+ r[0x5f] = d & 0xf8;\r
+ return;\r
+ case 0x60: // image buffer offset\r
+ r[0x61] = d & 0x3f;\r
+ return;\r
+ case 0x62: // h dot size\r
+ r[0x62] = (d >> 8) & 1;\r
+ r[0x63] = d;\r
+ return;\r
+ case 0x64: // v dot size\r
+ r[0x65] = d;\r
+ return;\r
+ case 0x66: // trace vector base address\r
+ d &= 0xfffe;\r
+ r[0x66] = d >> 8;\r
+ r[0x67] = d;\r
+ gfx_start(d);\r
+ return;\r
+ default:\r
+ break;\r
+ }\r
+\r
+ s68k_reg_write8(a, d >> 8);\r
+ s68k_reg_write8(a + 1, d & 0xff);\r
+ return;\r
+\r
+write_comm:\r
+ r[a] = d >> 8;\r
+ r[a + 1] = d;\r
+ if (Pico_mcd->m.m68k_poll_cnt)\r
+ SekEndRunS68k(0);\r
+ Pico_mcd->m.m68k_poll_cnt = 0;\r
+}\r
+\r
// -----------------------------------------------------------------\r
// Main 68k\r
// -----------------------------------------------------------------\r
{\r
u32 d = 0;\r
if (a == 0x400001) {\r
- if (SRam.data != NULL)\r
+ if (Pico.sv.data != NULL)\r
d = 3; // 64k cart\r
return d;\r
}\r
\r
if ((a & 0xfe0000) == 0x600000) {\r
- if (SRam.data != NULL)\r
- d = SRam.data[((a >> 1) & 0xffff) + 0x2000];\r
+ if (Pico.sv.data != NULL)\r
+ d = Pico.sv.data[((a >> 1) & 0xffff) + 0x2000];\r
return d;\r
}\r
\r
static void PicoWriteM68k8_ramc(u32 a, u32 d)\r
{\r
if ((a & 0xfe0000) == 0x600000) {\r
- if (SRam.data != NULL && (Pico_mcd->m.bcram_reg & 1)) {\r
- SRam.data[((a>>1) & 0xffff) + 0x2000] = d;\r
- SRam.changed = 1;\r
+ if (Pico.sv.data != NULL && (Pico_mcd->m.bcram_reg & 1)) {\r
+ Pico.sv.data[((a>>1) & 0xffff) + 0x2000] = d;\r
+ Pico.sv.changed = 1;\r
}\r
return;\r
}\r
return;\r
}\r
\r
- PicoWrite16_io(a, d);\r
+ PicoWrite8_io(a, d);\r
}\r
\r
void PicoWrite16_mcd_io(u32 a, u32 d)\r
elprintf(EL_CDREGS, "m68k_regs w16: [%02x] %04x @%06x",\r
a & 0x3f, d, SekPc);\r
\r
- m68k_reg_write8(a, d >> 8);\r
+ m68k_reg_write8(a, d >> 8);\r
if ((a & 0x3e) != 0x0e) // special case\r
m68k_reg_write8(a + 1, d & 0xff);\r
return;\r
static void PicoWriteS68k8_bram(u32 a, u32 d)\r
{\r
Pico_mcd->bram[(a >> 1) & 0x1fff] = d;\r
- SRam.changed = 1;\r
+ Pico.sv.changed = 1;\r
}\r
\r
static void PicoWriteS68k16_bram(u32 a, u32 d)\r
a = (a >> 1) & 0x1fff;\r
Pico_mcd->bram[a++] = d;\r
Pico_mcd->bram[a++] = d >> 8; // TODO: verify..\r
- SRam.changed = 1;\r
+ Pico.sv.changed = 1;\r
}\r
\r
#ifndef _ASM_CD_MEMORY_C\r
s68k_poll_detect(a & ~1, d);\r
goto regs_done;\r
}\r
- else if (a >= 0x58 && a < 0x68)\r
- d = gfx_cd_read(a & ~1);\r
- else d = s68k_reg_read16(a & ~1);\r
+ d = s68k_reg_read16(a & ~1);\r
if (!(a & 1))\r
d >>= 8;\r
\r
// regs\r
if ((a & 0xfe00) == 0x8000) {\r
a &= 0x1fe;\r
- if (0x58 <= a && a < 0x68)\r
- d = gfx_cd_read(a);\r
- else d = s68k_reg_read16(a);\r
+ d = s68k_reg_read16(a);\r
\r
elprintf(EL_CDREGS, "s68k_regs r16: [%02x] %04x @%06x",\r
a, d, SekPcS68k);\r
if ((a & 0xfe00) == 0x8000) {\r
a &= 0x1ff;\r
elprintf(EL_CDREGS, "s68k_regs w8: [%02x] %02x @%06x", a, d, SekPcS68k);\r
- if (0x58 <= a && a < 0x68)\r
- gfx_cd_write16(a&~1, (d<<8)|d);\r
- else s68k_reg_write8(a,d);\r
+ if (0x59 <= a && a < 0x68) // word regs\r
+ s68k_reg_write16(a & ~1, (d << 8) | d);\r
+ else\r
+ s68k_reg_write8(a, d);\r
return;\r
}\r
\r
if ((a & 0xfe00) == 0x8000) {\r
a &= 0x1fe;\r
elprintf(EL_CDREGS, "s68k_regs w16: [%02x] %04x @%06x", a, d, SekPcS68k);\r
- if (a >= 0x58 && a < 0x68)\r
- gfx_cd_write16(a, d);\r
- else {\r
- if (a == 0xe) {\r
- // special case, 2 byte writes would be handled differently\r
- // TODO: verify\r
- Pico_mcd->s68k_regs[0xf] = d;\r
- return;\r
- }\r
- s68k_reg_write8(a, d >> 8);\r
- s68k_reg_write8(a + 1, d & 0xff);\r
- }\r
+ s68k_reg_write16(a, d);\r
return;\r
}\r
\r
cpu68k_map_set(s68k_write8_map, 0x080000, 0x0bffff, s68k_dec_write8[b0 ^ 1][m], 1);\r
cpu68k_map_set(s68k_write16_map, 0x080000, 0x0bffff, s68k_dec_write16[b0 ^ 1][m], 1);\r
}\r
-\r
-#ifdef EMU_F68K\r
- // update fetchmap..\r
- int i;\r
- if (!(r3 & 4))\r
- {\r
- for (i = M68K_FETCHBANK1*2/16; (i<<(24-FAMEC_FETCHBITS)) < 0x240000; i++)\r
- PicoCpuFM68k.Fetch[i] = (unsigned long)Pico_mcd->word_ram2M - 0x200000;\r
- }\r
- else\r
- {\r
- for (i = M68K_FETCHBANK1*2/16; (i<<(24-FAMEC_FETCHBITS)) < 0x220000; i++)\r
- PicoCpuFM68k.Fetch[i] = (unsigned long)Pico_mcd->word_ram1M[r3 & 1] - 0x200000;\r
- for (i = M68K_FETCHBANK1*0x0c/0x100; (i<<(24-FAMEC_FETCHBITS)) < 0x0e0000; i++)\r
- PicoCpuFS68k.Fetch[i] = (unsigned long)Pico_mcd->word_ram1M[(r3&1)^1] - 0x0c0000;\r
- }\r
-#endif\r
}\r
\r
void pcd_state_loaded_mem(void)\r
PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.rom;\r
// .. and RAM\r
for (i = M68K_FETCHBANK1*14/16; i < M68K_FETCHBANK1; i++)\r
- PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.ram - (i<<(24-FAMEC_FETCHBITS));\r
+ PicoCpuFM68k.Fetch[i] = (unsigned long)PicoMem.ram - (i<<(24-FAMEC_FETCHBITS));\r
// S68k\r
// PRG RAM is default\r
for (i = 0; i < M68K_FETCHBANK1; i++)\r
notaz.gp2x.de / picodrive.git / blobdiff