From 196c4dcdd99628aa5a762bb3bc5b2e2e28ec1149 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Mon, 14 Jun 2021 21:17:09 -0400
Subject: [PATCH] Adds an appropriate ROM request.

---
 Machines/Enterprise/Enterprise.cpp | 11 ++++++++++-
 Machines/Utility/ROMCatalogue.cpp  |  5 +++++
 Machines/Utility/ROMCatalogue.hpp  |  3 +++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Machines/Enterprise/Enterprise.cpp b/Machines/Enterprise/Enterprise.cpp
index 50665c781..e24e582fb 100644
--- a/Machines/Enterprise/Enterprise.cpp
+++ b/Machines/Enterprise/Enterprise.cpp
@@ -24,10 +24,16 @@ class ConcreteMachine:
 	public MachineTypes::TimedMachine {
 	public:
 		ConcreteMachine(const Analyser::Static::Enterprise::Target &target, const ROMMachine::ROMFetcher &rom_fetcher) :
-			z80(*this) {
+			z80_(*this) {
 			// Request a clock of 4Mhz; this'll be mapped upwards for Nick and Dave elsewhere.
 			set_clock_rate(4'000'000);
 
+			const auto request = ROM::Request(ROM::Name::EnterpriseEXOS);
+			auto roms = rom_fetcher(request);
+			if(!request.validate(roms)) {
+				throw ROMMachine::Error::MissingROMs;
+			}
+
 			(void)target;
 			(void)rom_fetcher;
 		}
@@ -35,6 +41,9 @@ class ConcreteMachine:
 	private:
 		CPU::Z80::Processor<ConcreteMachine, false, false> z80_;
 
+		std::array<uint8_t, 32 * 1024> exos_;
+		std::array<uint8_t, 256 * 1024> ram_;
+
 		// MARK: - Z80::BusHandler.
 		forceinline HalfCycles perform_machine_cycle(const CPU::Z80::PartialMachineCycle &cycle) {
 			(void)cycle;
diff --git a/Machines/Utility/ROMCatalogue.cpp b/Machines/Utility/ROMCatalogue.cpp
index 7a12069ff..c0f25e6a2 100644
--- a/Machines/Utility/ROMCatalogue.cpp
+++ b/Machines/Utility/ROMCatalogue.cpp
@@ -404,6 +404,11 @@ Description::Description(Name name) {
 			*this = Description(name, "DiskII", "the Disk II 13-sector state machine ROM", "state-machine-13.rom", 256, 0x62e22620u);
 		break;
 
+		case Name::EnterpriseEXOS: {
+			const std::initializer_list<std::string> filenames = {"exos.bin", "Exos (198x)(Enterprise).bin"},
+			*this = Description(name, "Enterprise", "the Enterprise EXOS ROM", filenames, 32 * 1024, 0x30b26387u);
+		} break;
+
 		case Name::Macintosh128k:	*this = Description(name, "Macintosh", "the Macintosh 128k ROM", "mac128k.rom", 64*1024, 0x6d0c8a28u);	break;
 		case Name::Macintosh512k:	*this = Description(name, "Macintosh", "the Macintosh 512k ROM", "mac512k.rom", 64*1024, 0xcf759e0d);	break;
 		case Name::MacintoshPlus: {
diff --git a/Machines/Utility/ROMCatalogue.hpp b/Machines/Utility/ROMCatalogue.hpp
index 88ec7ca5b..a9f457b95 100644
--- a/Machines/Utility/ROMCatalogue.hpp
+++ b/Machines/Utility/ROMCatalogue.hpp
@@ -71,6 +71,9 @@ enum Name {
 	DiskIIStateMachine13Sector,
 	DiskIIBoot13Sector,
 
+	// Enterprise.
+	EnterpriseEXOS,
+
 	// Macintosh.
 	Macintosh128k,
 	Macintosh512k,