--- nono/lib/monitor_id.cpp 2026/04/29 17:05:19 1.1.1.6 +++ nono/lib/monitor_id.cpp 2026/04/29 17:05:26 1.1.1.8 @@ -4,6 +4,8 @@ /*static*/ const std::vector MonitorManager::info { + { ID_MONITOR_ACCSTAT, VMCap::NONE, { "accstat" } }, + { ID_MONITOR_AREASET, VMCap::NONE, { "areaset" } }, { ID_MONITOR_ATC0, VMCap::NONE, { "atc0" } }, { ID_MONITOR_ATC1, VMCap::NONE, { "atc1" } }, { ID_MONITOR_ATC2, VMCap::NONE, { "atc2" } }, @@ -41,6 +43,7 @@ MonitorManager::info { { ID_MONITOR_MFP, VMCap::NONE, { "mfp" } }, { ID_MONITOR_MK48T02, VMCap::NONE, { "mk48t02", "rtc" } }, { ID_MONITOR_MPUATC, VMCap::NONE, { "mpuatc" } }, + { ID_MONITOR_MPUCACHE, VMCap::NONE, { "mpucache" } }, { ID_MONITOR_MPUREG, VMCap::NONE, { "mpureg" } }, { ID_MONITOR_NEREID, VMCap::NONE, { "nereid" } }, { ID_MONITOR_PIO, VMCap::NONE, { "pio" } }, @@ -54,7 +57,19 @@ MonitorManager::info { { ID_MONITOR_SCSIDEVS, VMCap::NONE, { "scsidevs" } }, { ID_MONITOR_SIO, VMCap::NONE, { "sio" } }, { ID_MONITOR_SPC, VMCap::NONE, { "spc" } }, + { ID_MONITOR_SSG, VMCap::NONE, { "ssg" } }, { ID_MONITOR_SYSCLK, VMCap::NONE, { "sysclk" } }, + { ID_MONITOR_SYSPORT, VMCap::NONE, { "sysport" } }, + { ID_MONITOR_VIRTIO_BLOCK0, VMCap::NONE, { "vblk0" } }, + { ID_MONITOR_VIRTIO_BLOCK1, VMCap::NONE, { "vblk1" } }, + { ID_MONITOR_VIRTIO_BLOCK2, VMCap::NONE, { "vblk2" } }, + { ID_MONITOR_VIRTIO_BLOCK3, VMCap::NONE, { "vblk3" } }, + { ID_MONITOR_VIRTIO_BLOCK4, VMCap::NONE, { "vblk4" } }, + { ID_MONITOR_VIRTIO_BLOCK5, VMCap::NONE, { "vblk5" } }, + { ID_MONITOR_VIRTIO_BLOCK6, VMCap::NONE, { "vblk6" } }, + { ID_MONITOR_VIRTIO_BLOCK7, VMCap::NONE, { "vblk7" } }, + { ID_MONITOR_VIRTIO_ENTROPY, VMCap::NONE, { "virtio_entropy" } }, + { ID_MONITOR_VIRTIO_NET, VMCap::NONE, { "vnet" } }, { ID_MONITOR_WXHOSTINFO, VMCap::NONE, { "wxhostinfo" } }, { ID_MONITOR_XPMEMDUMP0, VMCap::NONE, { "xpmemdump0" } }, { ID_MONITOR_XPMEMDUMP1, VMCap::NONE, { "xpmemdump1" } }, @@ -79,6 +94,7 @@ MonitorManager::info { { ID_SUBWIN_LOG, VMCap::ALL, { "log" } }, { ID_SUBWIN_LOGSETTING, VMCap::ALL, { "logsetting" } }, { ID_SUBWIN_LUNAFB, VMCap::LUNA, { "bitmap" } }, + { ID_SUBWIN_NEWSIO, VMCap::NEWS, { "newsio" } }, { ID_SUBWIN_PALETTE, VMCap::LUNA, { "palette" } }, { ID_SUBWIN_ROM, VMCap::LUNA|VMCap::X68030, { "rom" } }, { ID_SUBWIN_SOFTKEY, VMCap::ALL, { "softkey" } }, @@ -90,8 +106,10 @@ MonitorManager::info { { ID_SUBWIN_XPEXHIST, VMCap::LUNA, { "xpexhist" } }, }; -/*static*/ const std::vector> +/*static*/ const std::vector> Monitor::idtext { + { ID_MONITOR_ACCSTAT, "ID_MONITOR_ACCSTAT" }, + { ID_MONITOR_AREASET, "ID_MONITOR_AREASET" }, { ID_MONITOR_ATC0, "ID_MONITOR_ATC0" }, { ID_MONITOR_ATC1, "ID_MONITOR_ATC1" }, { ID_MONITOR_ATC2, "ID_MONITOR_ATC2" }, @@ -144,8 +162,10 @@ Monitor::idtext { { ID_MONITOR_MFP, "ID_MONITOR_MFP" }, { ID_MONITOR_MK48T02, "ID_MONITOR_MK48T02" }, { ID_MONITOR_MPUATC, "ID_MONITOR_MPUATC" }, + { ID_MONITOR_MPUCACHE, "ID_MONITOR_MPUCACHE" }, { ID_MONITOR_MPUREG, "ID_MONITOR_MPUREG" }, { ID_MONITOR_NEREID, "ID_MONITOR_NEREID" }, + { ID_SUBWIN_NEWSIO, "ID_SUBWIN_NEWSIO" }, { ID_SUBWIN_PALETTE, "ID_SUBWIN_PALETTE" }, { ID_MONITOR_PIO, "ID_MONITOR_PIO" }, { ID_MONITOR_RENDERER, "ID_MONITOR_RENDERER" }, @@ -160,10 +180,22 @@ Monitor::idtext { { ID_MONITOR_SIO, "ID_MONITOR_SIO" }, { ID_SUBWIN_SOFTKEY, "ID_SUBWIN_SOFTKEY" }, { ID_MONITOR_SPC, "ID_MONITOR_SPC" }, + { ID_MONITOR_SSG, "ID_MONITOR_SSG" }, { ID_MONITOR_SYSCLK, "ID_MONITOR_SYSCLK" }, + { ID_MONITOR_SYSPORT, "ID_MONITOR_SYSPORT" }, { ID_SUBWIN_TEXTPAL, "ID_SUBWIN_TEXTPAL" }, { ID_SUBWIN_TVRAM, "ID_SUBWIN_TVRAM" }, { ID_SUBWIN_VECTOR, "ID_SUBWIN_VECTOR" }, + { ID_MONITOR_VIRTIO_BLOCK0, "ID_MONITOR_VIRTIO_BLOCK0" }, + { ID_MONITOR_VIRTIO_BLOCK1, "ID_MONITOR_VIRTIO_BLOCK1" }, + { ID_MONITOR_VIRTIO_BLOCK2, "ID_MONITOR_VIRTIO_BLOCK2" }, + { ID_MONITOR_VIRTIO_BLOCK3, "ID_MONITOR_VIRTIO_BLOCK3" }, + { ID_MONITOR_VIRTIO_BLOCK4, "ID_MONITOR_VIRTIO_BLOCK4" }, + { ID_MONITOR_VIRTIO_BLOCK5, "ID_MONITOR_VIRTIO_BLOCK5" }, + { ID_MONITOR_VIRTIO_BLOCK6, "ID_MONITOR_VIRTIO_BLOCK6" }, + { ID_MONITOR_VIRTIO_BLOCK7, "ID_MONITOR_VIRTIO_BLOCK7" }, + { ID_MONITOR_VIRTIO_ENTROPY, "ID_MONITOR_VIRTIO_ENTROPY" }, + { ID_MONITOR_VIRTIO_NET, "ID_MONITOR_VIRTIO_NET" }, { ID_MONITOR_WXHOSTINFO, "ID_MONITOR_WXHOSTINFO" }, { ID_SUBWIN_X68KIO, "ID_SUBWIN_X68KIO" }, { ID_MONITOR_XPMEMDUMP0, "ID_MONITOR_XPMEMDUMP0" },