--- nono/vm/tvram.h	2026/04/29 17:05:24	1.1.1.10
+++ nono/vm/tvram.h	2026/04/29 17:05:28	1.1.1.11
@@ -18,10 +18,10 @@ class TVRAMDevice : public PlaneVRAMDevi
 {
 	using inherited = PlaneVRAMDevice;
 
-	static const int baseaddr = 0xe00000;
+	static const uint32 baseaddr = 0xe00000;
 
 	// プレーン数は4枚固定
-	static const int NPLANE = 4;
+	static const uint NPLANE = 4;
 
 	struct tvram {
 		bool sa;				// 同時アクセス
@@ -37,12 +37,10 @@ class TVRAMDevice : public PlaneVRAMDevi
 
 	bool Init() 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;
-	bool Poke8(uint32 addr, uint32 data) override;
+	busdata Read(busaddr addr) override;
+	busdata Write(busaddr addr, uint32 data) override;
+	busdata Peek1(uint32 addr) override;
+	bool Poke1(uint32 addr, uint32 data) override;
 
 	void UpdateInfo(TextScreen&, int x, int y) const override;
 
@@ -50,12 +48,14 @@ class TVRAMDevice : public PlaneVRAMDevi
 	void SetAccessMask(uint16 data);
 	void SetScrollX(int x);
 	void SetScrollY(int y);
-	void RasterCopy(int src_ras, int dst_ras);
+	void RasterCopy(uint src_ras, uint dst_ras);
 
  private:
 	// アドレスデコーダ
 	uint32 Decoder(uint32 addr) const;
 
+	void Set8(uint32 offset, uint32 poffset, uint32 data, uint32 mask);
+	void Set16(uint32 offset, uint32 poffset, uint32 data, uint32 mask);
 	inline void SetDirty(uint32 offset);
 
 	// X 方向にはみ出したときに対応する仮想画面の Y 座標を返す。