--- nono/vm/dmac.h	2026/04/29 17:05:25	1.1.1.13
+++ nono/vm/dmac.h	2026/04/29 17:06:01	1.1.1.19
@@ -13,14 +13,13 @@
 #include "device.h"
 #include "bus.h"
 #include "fixedqueue.h"
-#include "monitor.h"
-#include "event.h"
 #include <array>
 
 class ADPCMDevice;
 class FDCDevice;
 class InterruptDevice;
 class MainbusDevice;
+class Syncer;
 
 struct DMAC
 {
@@ -106,9 +105,10 @@ struct DMAC
 	static const uint32 SIZE_16BIT = 1;			// 16bit
 	static const uint32 SIZE_32BIT = 2;			// 32bit
 	static const uint32 SIZE_8BIT_UNPK = 3;		// 8bit UnPacked
-	static const uint32 CHAIN_NOCHAIN = 0;		// Chain operation is disabled
+	static const uint32 CHAIN_DISABLED = 0;		// Chain operation is disabled
+	static const uint32 CHAIN_reserved = 1;		// (Undefined, reserved)
 	static const uint32 CHAIN_ARRAY = 2;		// Array Chaining
-	static const uint32 CHAIN_LINK = 3;			// Linked Array Chaining
+	static const uint32 CHAIN_LINKARRAY = 3;	// Linked Array Chaining
 	static const uint32 REQG_AUTO_LIM = 0;		// Auto Request (Limited)
 	static const uint32 REQG_AUTO_MAX = 1;		// AUto Request (Max)
 	static const uint32 REQG_EXTERNAL = 2;		// External Request
@@ -146,9 +146,13 @@ struct DMAC
 };
 
 // 各チャンネル
-class DMACChan
+class DMACChan : public Device
 {
+	using inherited = Device;
  public:
+	DMACChan(int ch_, const char *desc_);
+	~DMACChan() override;
+
 	// 二次変数など
 	int ch;				// チャンネル番号
 	const char *desc;	// チャンネルの用途(モニタ表示用)
@@ -235,13 +239,13 @@ class DMACChan
 	void SetBFC(uint8);
 
 	// 転送シーケンス
-	std::vector<int> seq {};
+	std::vector<uint> seq {};
 	int seq_index {};
 
 	// 転送リトライカウンタ。
 	// 実際には (SPC からの) DTACK を待つのだが、
 	// 待つのは大変なのでこちらでポーリングしている。
-	int retry {};
+	uint retry {};
 
 	// 転送中データ
 	FixedQueue<uint8, 2> data;
@@ -251,7 +255,7 @@ class DMACDevice : public IODevice
 {
 	using inherited = IODevice;
 
-	static const int baseaddr = 0xe84000;
+	static const uint32 baseaddr = 0xe84000;
 
 	// 転送シーケンス
 	enum {
@@ -264,6 +268,7 @@ class DMACDevice : public IODevice
 		WR_M16,
 		WR_D8,
 		WR_D16,
+		SEQ_MAX,
 	};
 
  public:
@@ -273,15 +278,13 @@ class DMACDevice : public IODevice
 	bool Init() override;
 	void ResetHard(bool poweron) override;
 
-	busdata Read8(uint32 addr) override;
-	busdata Read16(uint32 addr) override;
-	busdata Write8(uint32 addr, uint32 data) override;
-	busdata Write16(uint32 addr, uint32 data) override;
-	busdata Peek8(uint32 addr) override;
+	busdata Read(busaddr addr) override;
+	busdata Write(busaddr addr, uint32 data) override;
+	busdata Peek1(uint32 addr) override;
 
 	// 外部デバイスが REQ 信号を操作する
-	void AssertREQ(int ch);
-	void NegateREQ(int ch);
+	void AssertREQ(uint ch);
+	void NegateREQ(uint ch);
 
 	// 割り込みアクノリッジ
 	busdata InterruptAcknowledge();
@@ -290,33 +293,41 @@ class DMACDevice : public IODevice
 	void SetUdevice(uint32 start, uint32 end, bool accessible);
 
  private:
-	DECLARE_MONITOR_CALLBACK(MonitorUpdate);
+	DECLARE_MONITOR_SCREEN(MonitorScreen);
 
 	void MonitorReg4(TextScreen&,
 		int x, int y, uint32 reg, const char * const *names);
 
+	busdata WriteByte(DMACChan *chan, uint32 n, uint32 data);
+	busdata WriteWord(DMACChan *chan, uint32 n, uint32 data);
+
 	// チャンネル操作
 	void WriteCSR(DMACChan *chan, uint32 data);
 	void WriteCCR(DMACChan *chan, uint32 data, uint8 up);
 	void WriteGCR(uint8 data);
 
+	// ACT ビットの状態を変更
+	void ChangeACT(DMACChan *, bool);
+
 	// 割り込み信号線の状態を変更
 	void ChangeInterrupt();
 
 	// 転送
 	void StartTransfer(DMACChan *chan);
 	void AbortTransfer(DMACChan *chan);
+	std::string MakeStartLog(DMACChan *chan);
+	bool LoadLinkArray(DMACChan *chan);
 	DMACChan *SelectChannel();
 
 	// 転送イベントコールバック
-	void StartCallback(Event& ev);
-	void TransferCallback(Event& ev);
+	void StartCallback(Event *);
+	void TransferCallback(Event *);
 
 	// ログ出力
-	void TransferLog(DMACChan *, int op, busaddr addr, busdata r, uint64 data);
+	void TransferLog(DMACChan *, uint op, busaddr addr, busdata r, uint64 data);
 
 	// 転送中エラー
-	void TransferError(DMACChan *, int op, busdata r, uint32 data);
+	void TransferError(DMACChan *, uint op, busdata r, uint32 data);
 
 	// エラー発生
 	void Error(DMACChan *chan, uint8 errcode);
@@ -324,8 +335,13 @@ class DMACDevice : public IODevice
 	void AssertACK(DMACChan *);
 	void NegateACK(DMACChan *);
 
+	// メインメモリアクセス
+	busdata ReadMem(busaddr addr);
+	busdata ReadMem4(busaddr addr);
+	busdata WriteMem(busaddr addr, uint32 data);
+
 	// レジスタ
-	std::array<DMACChan, 4> channel {};
+	std::array<std::unique_ptr<DMACChan>, 4> channels {};
 	uint8 gcr;
 
 	// ユーザ空間制御
@@ -335,14 +351,18 @@ class DMACDevice : public IODevice
 	FDCDevice *fdc {};
 	InterruptDevice *interrupt {};
 	MainbusDevice *mainbus {};
+	Syncer *syncer {};
 
-	Event event { this };
+	Event *event {};
 
-	Monitor monitor { this };
+	Monitor *monitor {};
 
 	static const char * const errnames[];
+	static const char * const regname1[0x40];
+	static const char * const regname2[0x20];
+	static const char * const seqname[SEQ_MAX];
 };
 
-static inline DMACDevice *GetDMACDevice() {
+inline DMACDevice *GetDMACDevice() {
 	return Object::GetObject<DMACDevice>(OBJ_DMAC);
 }