--- nono/vm/sysport.cpp 2026/04/29 17:04:42 1.1.1.4 +++ nono/vm/sysport.cpp 2026/04/29 17:04:56 1.1.1.7 @@ -10,10 +10,13 @@ #include "romimg_x68k.h" #include "sram.h" +std::unique_ptr gSysport; + SysportDevice::SysportDevice() + : inherited("SystemPort") { - logname = "sysport"; - devname = "Sysport"; + AddAlias("SysPort"); + devaddr = baseaddr; devlen = 0x2000; } @@ -25,16 +28,18 @@ SysportDevice::~SysportDevice() void SysportDevice::ResetHard() { + sysport.contrast = 0; // XXX 未調査 sysport.ram_wait = 0; sysport.rom_wait = 0; + sysport.key_ctrl = false; } uint64 -SysportDevice::Read(uint32 addr) +SysportDevice::Read(uint32 offset) { uint32 data; - switch (addr) { + switch (offset) { case SYSPORT::CONTRAST: data = 0xf0 | sysport.contrast; break; @@ -63,14 +68,14 @@ SysportDevice::Read(uint32 addr) default: __unreachable(); } - putlog(1, "$%06X -> $%02x", addr, data); + putlog(1, "$%06X -> $%02x", gMPU->GetPaddr(), data); return data; } uint64 -SysportDevice::Write(uint32 addr, uint32 data) +SysportDevice::Write(uint32 offset, uint32 data) { - switch (addr) { + switch (offset) { case SYSPORT::CONTRAST: sysport.contrast = data & 15; break; @@ -85,8 +90,7 @@ SysportDevice::Write(uint32 addr, uint32 if ((data & 0x06)) { putlog(0, "$E8E007 未サポート書き込み $%02x", data); } - // bit3 KEY CTRL は MFP で管理する - gMFP->SetKeyCtrl(data & 0x08); + sysport.key_ctrl = (data & 0x08); break; case SYSPORT::WAIT: @@ -119,7 +123,7 @@ SysportDevice::Write(uint32 addr, uint32 break; case SYSPORT::POWEROFF: - putlog(0, "$E8E00F (POWEROFF) 未サポート書き込み %02x", data); + putlog(0, "$e8e00f (POWEROFF) 未サポート書き込み %02x", data); break; default: @@ -129,11 +133,11 @@ SysportDevice::Write(uint32 addr, uint32 } uint64 -SysportDevice::Peek(uint32 addr) +SysportDevice::Peek(uint32 offset) { uint32 data; - switch (addr) { + switch (offset) { case SYSPORT::CONTRAST: data = 0xf0 | sysport.contrast; break;