From 2e44a5c8bf06d47ccc8b0c232aa959ca8a5fd716 Mon Sep 17 00:00:00 2001 From: Volker Ruppert Date: Fri, 19 Feb 2021 16:05:56 +0000 Subject: [PATCH] Changed type of VGA extension option to bx_param_enum_c. Additional choices are added from plugins list. --- bochs/config.cc | 64 ++++++++++++++++++++++------------ bochs/gui/siminterface.h | 7 ++++ bochs/iodev/devices.cc | 9 ++--- bochs/iodev/display/vga.cc | 2 +- bochs/iodev/display/vgacore.cc | 2 +- bochs/iodev/display/vgacore.h | 2 +- 6 files changed, 56 insertions(+), 30 deletions(-) diff --git a/bochs/config.cc b/bochs/config.cc index 970aa9123..2b55343ff 100644 --- a/bochs/config.cc +++ b/bochs/config.cc @@ -47,6 +47,7 @@ const char **display_library_list; +const char **vga_extension_list; int bochsrc_include_level = 0; #define LOG_THIS genlog-> @@ -62,12 +63,11 @@ static Bit64s bx_param_handler(bx_param_c *param, bool set, Bit64s val) { char pname[BX_PATHNAME_LEN]; Bit8u device; -//Bit8u channel; + Bit64s oldval; bx_list_c *base = (bx_list_c*) param->get_parent(); base->get_param_path(pname, BX_PATHNAME_LEN); if (!strncmp(pname, "ata.", 4)) { -// channel = pname[4] - '0'; if (!strcmp(base->get_name(), "master")) { device = 0; } else { @@ -90,7 +90,19 @@ static Bit64s bx_param_handler(bx_param_c *param, bool set, Bit64s val) } } else { param->get_param_path(pname, BX_PATHNAME_LEN); - if ((!strcmp(pname, BXPN_FLOPPYA_TYPE)) || + if (!strcmp(pname, BXPN_VGA_EXTENSION)) { + if (set) { + oldval = ((bx_param_enum_c*)param)->get(); + if (val != oldval) { + if (oldval >= BX_VGA_EXTENSION_OTHER) { + PLUG_unload_opt_plugin(((bx_param_enum_c*)param)->get_selected()); + } + if (val >= BX_VGA_EXTENSION_OTHER) { + PLUG_load_vga_plugin(((bx_param_enum_c*)param)->get_choice(val)); + } + } + } + } else if ((!strcmp(pname, BXPN_FLOPPYA_TYPE)) || (!strcmp(pname, BXPN_FLOPPYB_TYPE))) { if (set) { if (val == BX_FLOPPY_AUTO) { @@ -135,17 +147,6 @@ const char *bx_param_string_handler(bx_param_string_c *param, bool set, val = oldval; } } - } else if (!strcmp(pname, BXPN_VGA_EXTENSION)) { - if (set) { - if ((strlen(oldval) > 0) && (strcmp(oldval, "none") && strcmp(oldval, "vbe") && - strcmp(oldval, "cirrus"))) { - PLUG_unload_opt_plugin(oldval); - } - if ((strlen(val) > 0) && (strcmp(val, "none") && strcmp(val, "vbe") && - strcmp(val, "cirrus"))) { - PLUG_load_vga_plugin(val); - } - } } else { BX_PANIC(("bx_param_string_handler called with unknown parameter '%s'", pname)); } @@ -302,6 +303,21 @@ void bx_init_displaylib_list() } } +void bx_init_vgaext_list() +{ + Bit8u i, count = 0; + + count = PLUG_get_plugins_count(PLUGTYPE_VGA); + vga_extension_list = (const char**) malloc((count + 4) * sizeof(char*)); + vga_extension_list[0] = "none"; + vga_extension_list[1] = "vbe"; + vga_extension_list[2] = "cirrus"; + for (i = 0; i < count; i++) { + vga_extension_list[i + 3] = PLUG_get_plugin_name(PLUGTYPE_VGA, i); + } + vga_extension_list[count + 3] = NULL; +} + void bx_init_options() { int i; @@ -977,13 +993,15 @@ void bx_init_options() 5); vga_update_freq->set_ask_format ("Type a new value for VGA update frequency: [%d] "); - bx_param_string_c *vga_extension = new bx_param_string_c(display, - "vga_extension", - "VGA Extension", - "Name of the VGA extension", - "none", BX_PATHNAME_LEN); - vga_extension->set_handler(bx_param_string_handler); - vga_extension->set_initial_val("vbe"); + bx_init_vgaext_list(); + bx_param_enum_c *vga_extension = new bx_param_enum_c(display, + "vga_extension", + "VGA Extension", + "Name of the VGA extension", + vga_extension_list, + BX_VGA_EXTENSION_VBE, + BX_VGA_EXTENSION_NONE); + vga_extension->set_handler(bx_param_handler); display->set_options(display->SHOW_PARENT); static const char *ddc_mode_list[] = { @@ -2780,7 +2798,7 @@ static int parse_line_formatted(const char *context, int num_params, char *param } for (i=1; iget_param_string(BXPN_VGA_EXTENSION)->getptr(), + SIM->get_param_enum(BXPN_VGA_EXTENSION)->get_selected(), SIM->get_param_num(BXPN_VGA_UPDATE_FREQUENCY)->get(), SIM->get_param_bool(BXPN_VGA_REALTIME)->get(), SIM->get_param_enum(BXPN_DDC_MODE)->get_selected()); diff --git a/bochs/gui/siminterface.h b/bochs/gui/siminterface.h index 228ab8ff5..a35a04a69 100644 --- a/bochs/gui/siminterface.h +++ b/bochs/gui/siminterface.h @@ -459,6 +459,13 @@ enum { BX_RUN_START }; +enum { + BX_VGA_EXTENSION_NONE, + BX_VGA_EXTENSION_VBE, + BX_VGA_EXTENSION_CIRRUS, + BX_VGA_EXTENSION_OTHER +}; + enum { BX_DDC_MODE_DISABLED, BX_DDC_MODE_BUILTIN, diff --git a/bochs/iodev/devices.cc b/bochs/iodev/devices.cc index 4a8c1b73c..20c2d1653 100644 --- a/bochs/iodev/devices.cc +++ b/bochs/iodev/devices.cc @@ -111,8 +111,9 @@ void bx_devices_c::init(BX_MEM_C *newmem) unsigned max_pci_slots = BX_N_PCI_SLOTS; #endif unsigned i, argc; + Bit8u vga_ext_id; const char def_name[] = "Default"; - const char *vga_ext, *options; + const char *options; char *argv[16]; BX_DEBUG(("Init $Id$")); @@ -239,14 +240,14 @@ void bx_devices_c::init(BX_MEM_C *newmem) PLUG_load_plugin(dma, PLUGTYPE_CORE); PLUG_load_plugin(pic, PLUGTYPE_CORE); PLUG_load_plugin(pit, PLUGTYPE_CORE); - vga_ext = SIM->get_param_string(BXPN_VGA_EXTENSION)->getptr(); - if (!strcmp(vga_ext, "cirrus")) { + vga_ext_id = (Bit8u)SIM->get_param_enum(BXPN_VGA_EXTENSION)->get(); + if (vga_ext_id == BX_VGA_EXTENSION_CIRRUS) { #if BX_SUPPORT_CLGD54XX PLUG_load_plugin(svga_cirrus, PLUGTYPE_CORE); #else BX_PANIC(("Bochs is not compiled with Cirrus support")); #endif - } else if (!strcmp(vga_ext, "vbe") || !strcmp(vga_ext, "none")) { + } else if (vga_ext_id <= BX_VGA_EXTENSION_VBE) { PLUG_load_plugin(vga, PLUGTYPE_CORE); } else if (pluginVgaDevice == &stubVga) { BX_PANIC(("No VGA compatible display adapter present")); diff --git a/bochs/iodev/display/vga.cc b/bochs/iodev/display/vga.cc index da4d2c6de..cf89e7dfb 100644 --- a/bochs/iodev/display/vga.cc +++ b/bochs/iodev/display/vga.cc @@ -87,7 +87,7 @@ bool bx_vga_c::init_vga_extension(void) BX_VGA_THIS vbe.dac_8bit = 0; BX_VGA_THIS vbe.ddc_enabled = 0; BX_VGA_THIS vbe.base_address = 0x0000; - if (!strcmp(BX_VGA_THIS vgaext->getptr(), "vbe")) { + if (BX_VGA_THIS vga_ext_id == BX_VGA_EXTENSION_VBE) { BX_VGA_THIS put("BXVGA"); for (addr=VBE_DISPI_IOPORT_INDEX; addr<=VBE_DISPI_IOPORT_DATA; addr++) { DEV_register_ioread_handler(this, vbe_read_handler, addr, "vga video", 7); diff --git a/bochs/iodev/display/vgacore.cc b/bochs/iodev/display/vgacore.cc index 6d26a33a8..6b9e934de 100644 --- a/bochs/iodev/display/vgacore.cc +++ b/bochs/iodev/display/vgacore.cc @@ -85,7 +85,7 @@ void bx_vgacore_c::init(void) { unsigned x,y; - BX_VGA_THIS vgaext = SIM->get_param_string(BXPN_VGA_EXTENSION); + BX_VGA_THIS vga_ext_id = (Bit8u)SIM->get_param_enum(BXPN_VGA_EXTENSION)->get(); BX_VGA_THIS pci_enabled = 0; BX_VGA_THIS init_standard_vga(); diff --git a/bochs/iodev/display/vgacore.h b/bochs/iodev/display/vgacore.h index 52222bdc2..62767977e 100644 --- a/bochs/iodev/display/vgacore.h +++ b/bochs/iodev/display/vgacore.h @@ -266,7 +266,7 @@ protected: int timer_id; bool update_realtime; bool vsync_realtime; - bx_param_string_c *vgaext; + Bit8u vga_ext_id; bool pci_enabled; };