Remove GEOS (#107)

indigodarkwolf · Jan 8, 2024 · 7156532 · 7156532
1 parent 3241ef7
commit 7156532
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 24 deletions.
diff --git a/src/hypercalls.cpp b/src/hypercalls.cpp
@@ -142,10 +142,6 @@ bool hypercalls_init()
 		Has_boot_tasks = true;
 	}
 
-	if (Options.run_geos) {
-		Has_boot_tasks = true;
-	}
-
 	if (Options.run_test) {
 		Has_boot_tasks = true;
 	}
@@ -326,10 +322,6 @@ void hypercalls_update()
 				}
 			}
 
-			if (Options.run_geos) {
-				keyboard_add_text("GEOS\r");
-			}
-
 			if (Options.run_test) {
 				char test_text[256];
 				sprintf(test_text, "TEST %d\r", Options.test_number);

diff --git a/src/main.cpp b/src/main.cpp
@@ -245,7 +245,6 @@ int main(int argc, char **argv)
 			symbols_load_file((Options.rom_path.parent_path() / "kernal.sym").generic_string(), 0);
 			symbols_load_file((Options.rom_path.parent_path() / "keymap.sym").generic_string(), 1);
 			symbols_load_file((Options.rom_path.parent_path() / "dos.sym").generic_string(), 2);
-			symbols_load_file((Options.rom_path.parent_path() / "geos.sym").generic_string(), 3);
 			symbols_load_file((Options.rom_path.parent_path() / "basic.sym").generic_string(), 4);
 			symbols_load_file((Options.rom_path.parent_path() / "monitor.sym").generic_string(), 5);
 			symbols_load_file((Options.rom_path.parent_path() / "charset.sym").generic_string(), 0);

diff --git a/src/options.cpp b/src/options.cpp
@@ -81,9 +81,6 @@ static void usage()
 	printf("-hypercall_path <path>\n");
 	printf("\tSet the base path for hypercalls (effectively, the current working directory when no SD card is attached).\n");
 
-	printf("-geos\n");
-	printf("\tLaunch GEOS at startup.\n");
-
 	printf("-gif <file.gif>[,wait]\n");
 	printf("\tRecord a gif for the video output.\n");
 	printf("\tUse ,wait to start paused.\n");
@@ -451,11 +448,6 @@ static void parse_cmdline(mINI::INIMap<std::string> &ini, int argc, char **argv)
 			argc--;
 			argv++;
 
-		} else if (!strcmp(argv[0], "-geos")) {
-			argc--;
-			argv++;
-			ini["geos"] = "true";
-
 		} else if (!strcmp(argv[0], "-gif")) {
 			argc--;
 			argv++;
@@ -902,10 +894,6 @@ static char const *set_options(options &opts, mINI::INIMap<std::string> &ini)
 		opts.bas_path = ini["bas"];
 	}
 
-	if (ini.has("geos") && ini["geos"] == "true") {
-		opts.run_geos = true;
-	}
-
 	if (ini.has("test")) {
 		opts.test_number = atoi(ini["test"].c_str());
 		opts.run_test    = opts.test_number >= 0;
@@ -1345,7 +1333,6 @@ static void set_ini_main(mINI::INIMap<std::string> &ini_main, bool all)
 	set_comma_option("prg", Options.prg_path, Default_options.prg_path, Options.prg_override_start, Default_options.prg_override_start);
 	set_option("run", Options.run_after_load, Default_options.run_after_load);
 	set_option("bas", Options.bas_path, Default_options.bas_path);
-	set_option("geos", Options.run_geos, Default_options.run_geos);
 	set_option("test", Options.test_number, Default_options.test_number);
 	set_option("nvram", Options.nvram_path, Default_options.nvram_path);
 	set_option("sdcard", Options.sdcard_path, Default_options.sdcard_path);

diff --git a/src/options.h b/src/options.h
@@ -61,7 +61,6 @@ struct options {
 	wav_recorder_start_t wav_start = wav_recorder_start_t::WAV_RECORDER_START_NOW;
 
 	bool run_after_load = false;
-	bool run_geos       = false;
 	bool run_test       = false;
 
 	bool load_standard_symbols = false;

diff --git a/src/overlay/options_menu.cpp b/src/overlay/options_menu.cpp
@@ -101,7 +101,6 @@ void draw_options_menu()
 	file_option("bas", Options.bas_path, "BAS path", "Text BAS file to automatically type into the console after boot, if any.\nCommand line: -bas <path>");
 
 	bool_option(Options.run_after_load, "Run after load", "If a PRG or BAS file is set to be loaded, run it immediately.\nCommand line: -run");
-	bool_option(Options.run_geos, "Run GEOS", "Run GEOS after boot.\nCommand line: -geos");
 	bool_option(Options.run_test, "Run tests", "Run tests after boot.\nCommand line: -test");
 	ImGui::InputInt("Test ID", &Options.test_number);
 	if (ImGui::IsItemHovered()) {