--- nono/vm/goldfish_pic.cpp 2026/04/29 17:05:29 1.1.1.2 +++ nono/vm/goldfish_pic.cpp 2026/04/29 17:06:00 1.1.1.5 @@ -46,6 +46,7 @@ // +- GFPICDevice(Lv1) #include "goldfish_pic.h" +#include "monitor.h" #include // コンストラクタ @@ -63,10 +64,6 @@ GFPICDevice::~GFPICDevice() bool GFPICDevice::Init() { - if (inherited::Init() == false) { - return false; - } - interrupt = GetInterruptDevice(); return true; @@ -76,6 +73,8 @@ GFPICDevice::Init() void GFPICDevice::ResetHard(bool poweron) { + inherited::ResetHard(poweron); + intmap_enable = 0; ChangeInterrupt(); } @@ -153,7 +152,7 @@ GFPICDevice::PeekPort(uint32 offset) // Virt68kInterrupt の下請け。上のサマリ部分。 void -GFPICDevice::MonitorUpdateSummary(TextScreen& screen, int x, int y) +GFPICDevice::MonitorScreenSummary(TextScreen& screen, int x, int y) { for (int i = 0; i < 32; i++) { uint32 bit = 0x8000'0000 >> i; @@ -173,7 +172,7 @@ GFPICDevice::MonitorUpdateSummary(TextSc // Virt68kInterrupt の下請け。下の個別部分。 int -GFPICDevice::MonitorUpdateDetail(TextScreen& screen, int y, int lv) +GFPICDevice::MonitorScreenDetail(TextScreen& screen, int y, int lv) { // 0 1 2 3 4 5 6 7 // 01234567890123456789012345678901234567890123456789012345678901234567890123456