--- nono/hd64180/hd647180asci.h 2026/04/29 17:05:47 1.1.1.1 +++ nono/hd64180/hd647180asci.h 2026/04/29 17:06:01 1.1.1.3 @@ -11,7 +11,6 @@ #pragma once #include "device.h" -#include "event.h" #include "message.h" #include @@ -107,18 +106,18 @@ class HD647180ASCIDevice : public Device uint32 PeekRDR(uint n) const; private: - DECLARE_MONITOR_CALLBACK(MonitorUpdate); - void MonitorUpdateChan(TextScreen&, int y, int n) const; + DECLARE_MONITOR_SCREEN(MonitorScreen); + void MonitorScreenChan(TextScreen&, int y, int n) const; void ChangeInterrupt(uint n); void ChangeBaudRate(uint n); - void TxCallback(Event&); + void TxCallback(Event *); // 受信側 void HostRxCallback(uint32); void RxMessage(MessageID, uint32); - void RxCallback(Event&); + void RxCallback(Event *); bool Rx(uint n, uint32 data); // 入力クロックを 160分周した基本周波数とでもいうべきもの、 @@ -132,8 +131,8 @@ class HD647180ASCIDevice : public Device bool nRTS0 {}; bool nDCD0 {}; - std::array txevent {}; - std::array rxevent {}; + std::array txevent {}; + std::array rxevent {}; std::array, 2> hostcom /*{}*/;