Don't forget to actually support expansion hardware

SolraBizna · Oct 5, 2017 · 7ef4234 · 7ef4234
1 parent 12fb420
commit 7ef4234
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/cartridge.cc b/src/cartridge.cc
@@ -3,6 +3,7 @@
 #include "cartridge.hh"
 #include "mappers.hh"
 #include "localquery.hh"
+#include "expansions.hh"
 
 using namespace ARS;
 
@@ -127,6 +128,7 @@ std::unique_ptr<Cartridge> Cartridge::load(GameFolder& gamefolder,
         throw sn.Get("BOARD_EXPANSION_ADDRESS_INVALID"_Key);
     }
     else addr = 0; // will be interpreted as "use default address"
+    ARS::map_expansion(addr, expansion.data());
   }
   // Mapper
   auto mapper_tag = *LocalizedQuery(board->query("mapper"));

diff --git a/src/expansions.cc b/src/expansions.cc
@@ -68,7 +68,7 @@ namespace {
 }
 
 void ARS::map_expansion(uint16_t addr, const std::string& type) {
-  if(addr < 0x240 || addr > 0x247)
+  if(addr != 0 && (addr < 0x240 || addr > 0x247))
     die("INTERNAL ERROR: Expansion IO address out of range");
   if(type == "debug") {
     if(addr == 0) addr = 0x247;