From 127a0328568a91cfa851ec080882406eee7e6318 Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Thu, 13 May 2021 18:28:14 +0200
Subject: [PATCH] ucom4d: changed to PAGED 8bits

---
 hash/saitek_kso.xml              |  2 +-
 src/devices/cpu/ucom4/ucom4d.cpp | 21 ---------------------
 src/devices/cpu/ucom4/ucom4d.h   |  7 +++----
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/hash/saitek_kso.xml b/hash/saitek_kso.xml
index 1dea4ad2bcd..2ce7799db65 100644
--- a/hash/saitek_kso.xml
+++ b/hash/saitek_kso.xml
@@ -7,7 +7,7 @@ license:CC0
 <softwarelist name="saitek_kso" description="Saitek KSO ROM">
 
 <!-- Extension ROM, sold separately, placed in ROM socket through hatch on top-right -->
-<!-- Used in: Superstar 36K, Turbostar chess computers -->
+<!-- Used in: Superstar 36K, Turbostar chess computers, also in Maestro A module -->
 
 	<software name="kso">
 		<description>Kasparov Selected Openings</description>
diff --git a/src/devices/cpu/ucom4/ucom4d.cpp b/src/devices/cpu/ucom4/ucom4d.cpp
index 678c1952dfc..82650cd7939 100644
--- a/src/devices/cpu/ucom4/ucom4d.cpp
+++ b/src/devices/cpu/ucom4/ucom4d.cpp
@@ -94,27 +94,6 @@ const u8 ucom4_disassembler::ucom4_mnemonic[0x100] =
 };
 
 
-u32 ucom4_disassembler::opcode_alignment() const
-{
-	return 1;
-}
-
-u32 ucom4_disassembler::interface_flags() const
-{
-	return PAGED2LEVEL;
-}
-
-u32 ucom4_disassembler::page_address_bits() const
-{
-	return 6;
-}
-
-u32 ucom4_disassembler::page2_address_bits() const
-{
-	return 2;
-}
-
-
 offs_t ucom4_disassembler::disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params)
 {
 	offs_t pos = pc;
diff --git a/src/devices/cpu/ucom4/ucom4d.h b/src/devices/cpu/ucom4/ucom4d.h
index 2dd3be4914b..6992c3d710d 100644
--- a/src/devices/cpu/ucom4/ucom4d.h
+++ b/src/devices/cpu/ucom4/ucom4d.h
@@ -18,10 +18,9 @@ public:
 	ucom4_disassembler() = default;
 	virtual ~ucom4_disassembler() = default;
 
-	virtual u32 opcode_alignment() const override;
-	virtual u32 interface_flags() const override;
-	virtual u32 page_address_bits() const override;
-	virtual u32 page2_address_bits() const override;
+	virtual u32 opcode_alignment() const override { return 1; }
+	virtual u32 interface_flags() const override { return PAGED; }
+	virtual u32 page_address_bits() const override { return 8; }
 
 	virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params) override;