diff --git a/bsnes/snes/cartridge/cartridge.cpp b/bsnes/snes/cartridge/cartridge.cpp index 1b5e40de..c207e1df 100644 --- a/bsnes/snes/cartridge/cartridge.cpp +++ b/bsnes/snes/cartridge/cartridge.cpp @@ -58,7 +58,6 @@ void Cartridge::load(Mode cartridge_mode, const lstring &xml_list) { has_msu1 = false; has_serial = false; has_dos = false; - dos_mapped = false; parse_xml(xml_list); //print(xml_list[0], "\n\n"); diff --git a/bsnes/snes/cartridge/xml.cpp b/bsnes/snes/cartridge/xml.cpp index f1ec026f..4ed8a74d 100644 --- a/bsnes/snes/cartridge/xml.cpp +++ b/bsnes/snes/cartridge/xml.cpp @@ -53,14 +53,6 @@ void Cartridge::parse_xml_cartridge(const char *data) { } } } - - // set dos mapping here if no mapping given. Fix later? - if (!dos_mapped) { - has_dos = true; - dos_mapped = true; - bus.map(Bus::MapMode::Direct, 0x00, 0x3f, 0x5f00, 0x5fff, dos); - bus.map(Bus::MapMode::Direct, 0x80, 0xbf, 0x5f00, 0x5fff, dos); - } } void Cartridge::parse_xml_bsx(const char *data) { @@ -571,7 +563,6 @@ void Cartridge::xml_parse_dos(xml_element& root) { foreach(attr, node.attribute) { if (attr.name == "address") { xml_parse_address(m, attr.content); - dos_mapped = true; } } mapping.append(m); diff --git a/common/nall/snes/cartridge.hpp b/common/nall/snes/cartridge.hpp index 255a94ec..a1b48c8e 100644 --- a/common/nall/snes/cartridge.hpp +++ b/common/nall/snes/cartridge.hpp @@ -96,6 +96,7 @@ class SNESCartridge { bool has_st010; bool has_st011; bool has_st018; + bool has_dos; }; SNESCartridge::SNESCartridge(const uint8_t *data, unsigned size) { @@ -508,6 +509,15 @@ SNESCartridge::SNESCartridge(const uint8_t *data, unsigned size) { xml << " \n"; } + // always set dos default mapping if none applied + has_dos = true; + if (has_dos) { + xml << " \n"; + xml << " \n"; + xml << " \n"; + xml << " \n"; + } + xml << "\n"; xmlMemoryMap = xml; } @@ -532,6 +542,7 @@ void SNESCartridge::read_header(const uint8_t *data, unsigned size) { has_st010 = false; has_st011 = false; has_st018 = false; + has_dos = false; //===================== //detect Game Boy carts