mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplified code for saving BIOS and VGABIOS image configuration.

Browse Source
This commit is contained in:
Volker Ruppert 2017-02-13 21:14:34 +00:00
parent 135d64cb1f
commit 756fde6267
2 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bochs/config.cc
View File

@ -698,7 +698,7 @@ void bx_init_options()
ram->set_options(ram->SERIES_ASK); ram->set_options(ram->SERIES_ASK);
path = new bx_param_filename_c(rom, path = new bx_param_filename_c(rom,
"path", "file",
"ROM BIOS image", "ROM BIOS image",
"Pathname of ROM image to load", "Pathname of ROM image to load",
"", BX_PATHNAME_LEN); "", BX_PATHNAME_LEN);
@ -706,18 +706,18 @@ void bx_init_options()
sprintf(name, "%s/BIOS-bochs-latest", (char *)get_builtin_variable("BXSHARE")); sprintf(name, "%s/BIOS-bochs-latest", (char *)get_builtin_variable("BXSHARE"));
path->set_initial_val(name); path->set_initial_val(name);
bx_param_num_c *romaddr = new bx_param_num_c(rom, bx_param_num_c *romaddr = new bx_param_num_c(rom,
"addr", "address",
"ROM BIOS address", "ROM BIOS address",
"The address at which the ROM image should be loaded", "The address at which the ROM image should be loaded",
0, BX_MAX_BIT32U, 0, BX_MAX_BIT32U,
0); 0);
romaddr->set_base(16); romaddr->set_base(16);
romaddr->set_format("0x%05x"); romaddr->set_format("0x%08x");
romaddr->set_long_format("ROM BIOS address: 0x%05x"); romaddr->set_long_format("ROM BIOS address: 0x%08x");
rom->set_options(rom->SERIES_ASK); rom->set_options(rom->SERIES_ASK);
path = new bx_param_filename_c(vgarom, path = new bx_param_filename_c(vgarom,
"path", "file",
"VGA BIOS image", "VGA BIOS image",
"Pathname of VGA ROM image to load", "Pathname of VGA ROM image to load",
"", BX_PATHNAME_LEN); "", BX_PATHNAME_LEN);
@ -772,7 +772,7 @@ void bx_init_options()
path->set_format(strdup(label)); path->set_format(strdup(label));
sprintf(descr, "The address at which the optional RAM image #%d should be loaded", i+1); sprintf(descr, "The address at which the optional RAM image #%d should be loaded", i+1);
optaddr = new bx_param_num_c(optnum2, optaddr = new bx_param_num_c(optnum2,
"addr", "address",
"Address", "Address",
descr, descr,
0, BX_MAX_BIT32U, 0, BX_MAX_BIT32U,
@ -3318,21 +3318,9 @@ int bx_write_configuration(const char *rc, int overwrite)
fprintf(fp, "\n"); fprintf(fp, "\n");
fprintf(fp, "memory: host=%d, guest=%d\n", SIM->get_param_num(BXPN_HOST_MEM_SIZE)->get(), fprintf(fp, "memory: host=%d, guest=%d\n", SIM->get_param_num(BXPN_HOST_MEM_SIZE)->get(),
SIM->get_param_num(BXPN_MEM_SIZE)->get()); SIM->get_param_num(BXPN_MEM_SIZE)->get());
sparam = SIM->get_param_string(BXPN_ROM_PATH);
if (!sparam->isempty()) { bx_write_param_list(fp, (bx_list_c*) SIM->get_param(BXPN_ROMIMAGE), "romimage", 0);
fprintf(fp, "romimage: file=\"%s\"", sparam->getptr()); bx_write_param_list(fp, (bx_list_c*) SIM->get_param(BXPN_VGA_ROMIMAGE), "vgaromimage", 0);
if (SIM->get_param_num(BXPN_ROM_ADDRESS)->get() != 0)
fprintf(fp, ", address=0x%08x\n", (unsigned int) SIM->get_param_num(BXPN_ROM_ADDRESS)->get());
else
fprintf(fp, "\n");
} else {
fprintf(fp, "# no romimage\n");
}
sparam = SIM->get_param_string(BXPN_VGA_ROM_PATH);
if (!sparam->isempty())
fprintf(fp, "vgaromimage: file=\"%s\"\n", sparam->getptr());
else
fprintf(fp, "# no vgaromimage\n");
fprintf(fp, "boot: %s", SIM->get_param_enum(BXPN_BOOTDRIVE1)->get_selected()); fprintf(fp, "boot: %s", SIM->get_param_enum(BXPN_BOOTDRIVE1)->get_selected());
for (i=1; i<3; i++) { for (i=1; i<3; i++) {
sprintf(tmppath, "boot_params.boot_drive%d", i+1); sprintf(tmppath, "boot_params.boot_drive%d", i+1);

10
bochs/param_names.h
View File

@ -2,7 +2,7 @@
// $Id$ // $Id$
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2009-2015 The Bochs Project // Copyright (C) 2009-2017 The Bochs Project
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -80,9 +80,11 @@
#define BXPN_CPUID_SMAP "cpuid.smap" #define BXPN_CPUID_SMAP "cpuid.smap"
#define BXPN_MEM_SIZE "memory.standard.ram.size" #define BXPN_MEM_SIZE "memory.standard.ram.size"
#define BXPN_HOST_MEM_SIZE "memory.standard.ram.host_size" #define BXPN_HOST_MEM_SIZE "memory.standard.ram.host_size"
#define BXPN_ROM_PATH "memory.standard.rom.path" #define BXPN_ROMIMAGE "memory.standard.rom"
#define BXPN_ROM_ADDRESS "memory.standard.rom.addr" #define BXPN_ROM_PATH "memory.standard.rom.file"
#define BXPN_VGA_ROM_PATH "memory.standard.vgarom.path" #define BXPN_ROM_ADDRESS "memory.standard.rom.address"
#define BXPN_VGA_ROMIMAGE "memory.standard.vgarom"
#define BXPN_VGA_ROM_PATH "memory.standard.vgarom.file"
#define BXPN_OPTROM1_PATH "memory.optrom.1.path" #define BXPN_OPTROM1_PATH "memory.optrom.1.path"
#define BXPN_OPTROM1_ADDRESS "memory.optrom.1.addr" #define BXPN_OPTROM1_ADDRESS "memory.optrom.1.addr"
#define BXPN_OPTROM2_PATH "memory.optrom.2.path" #define BXPN_OPTROM2_PATH "memory.optrom.2.path"