--- nono/vm/newsio.cpp 2026/04/29 17:05:25 1.1.1.2 +++ nono/vm/newsio.cpp 2026/04/29 17:05:29 1.1.1.3 @@ -45,7 +45,7 @@ NewsIODevice::NewsIODevice() : inherited(OBJ_NEWSIO) { - NEWDV(KBC, new KBCDevice()); + NEWDV(KBC, new BusIO_B()); NEWDV(RTC, new BusIO_B()); NEWDV(SCC, new BusIO_B()); NEWDV(Lance, new BusIO_W()); @@ -131,59 +131,31 @@ NewsIODevice::SearchDevice(uint32 addr) } busdata -NewsIODevice::Read8(uint32 addr) +NewsIODevice::Read(busaddr addr) { - IODevice *d = SearchDevice(addr); - return d->Read8(addr); -} - -busdata -NewsIODevice::Read16(uint32 addr) -{ - IODevice *d = SearchDevice(addr); - return d->Read16(addr); -} - -busdata -NewsIODevice::Read32(uint32 addr) -{ - IODevice *d = SearchDevice(addr); - return d->Read32(addr); + IODevice *d = SearchDevice(addr.Addr()); + return d->Read(addr); } busdata -NewsIODevice::Write8(uint32 addr, uint32 data) +NewsIODevice::Write(busaddr addr, uint32 data) { - IODevice *d = SearchDevice(addr); - return d->Write8(addr, data); -} - -busdata -NewsIODevice::Write16(uint32 addr, uint32 data) -{ - IODevice *d = SearchDevice(addr); - return d->Write16(addr, data); -} - -busdata -NewsIODevice::Write32(uint32 addr, uint32 data) -{ - IODevice *d = SearchDevice(addr); - return d->Write32(addr, data); + IODevice *d = SearchDevice(addr.Addr()); + return d->Write(addr, data); } busdata -NewsIODevice::Peek8(uint32 addr) +NewsIODevice::Peek1(uint32 addr) { IODevice *d = SearchDevice(addr); - return d->Peek8(addr); + return d->Peek1(addr); } bool -NewsIODevice::Poke8(uint32 addr, uint32 data) +NewsIODevice::Poke1(uint32 addr, uint32 data) { IODevice *d = SearchDevice(addr); - return d->Poke8(addr, data); + return d->Poke1(addr, data); } // モニタを初期化。