diff --git a/Machines/MasterSystem/MasterSystem.cpp b/Machines/MasterSystem/MasterSystem.cpp index 06859d6bd..d4750ea37 100644 --- a/Machines/MasterSystem/MasterSystem.cpp +++ b/Machines/MasterSystem/MasterSystem.cpp @@ -126,7 +126,6 @@ class ConcreteMachine: paging_registers_[1] = 1; paging_registers_[2] = 0; } - page_cartridge(); // Load the BIOS if relevant. if(has_bios()) { @@ -145,6 +144,7 @@ class ConcreteMachine: memcpy(&bios_, roms[0]->data(), roms[0]->size()); } } + page_cartridge(); // Map RAM. if(is_master_system(model_)) { diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme index 9a32a7574..702ed8cf3 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme +++ b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme @@ -70,7 +70,7 @@ + isEnabled = "NO"> + isEnabled = "YES"> + isEnabled = "NO"> #include #include +#include #include #include #include @@ -718,11 +719,18 @@ int main(int argc, char *argv[]) { std::cerr << "Could not find system ROMs; please install to /usr/local/share/CLK/ or /usr/share/CLK/, or provide a --rompath." << std::endl; std::cerr << "One or more of the following was needed but not found:" << std::endl; for(const auto &rom: requested_roms) { - std::cerr << rom.machine_name << '/' << rom.file_name; + std::cerr << rom.machine_name << '/' << rom.file_name << " ("; if(!rom.descriptive_name.empty()) { - std::cerr << " (" << rom.descriptive_name << ")"; + std::cerr << rom.descriptive_name << "; "; } - std::cerr << std::endl; + std::cerr << "accepted crc32s: "; + bool is_first = true; + for(const auto crc32: rom.crc32s) { + if(!is_first) std::cerr << ", "; + is_first = false; + std::cerr << std::hex << std::setfill('0') << std::setw(8) << crc32; + } + std::cerr << ")" << std::endl; } break; }