Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

romload.cpp: Use std::string_view in determine_bios_rom

Browse Source
This commit is contained in:
AJR 2023-09-21 09:24:57 -04:00
parent 70eea7c3a5
commit 256ffc91a3
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/emu/romload.cpp
View File

@ -364,10 +364,11 @@ std::error_condition rom_load_manager::set_disk_handle(std::string_view region,
from SYSTEM_BIOS structure and OPTION_BIOS
-------------------------------------------------*/
void rom_load_manager::determine_bios_rom(device_t &device, const char *specbios)
void rom_load_manager::determine_bios_rom(device_t &device, std::string_view specbios)
{
// default is applied by the device at config complete time
if (specbios && *specbios && core_stricmp(specbios, "default"))
using namespace std::literals;
if (!specbios.empty() && !util::streqlower(specbios, "default"sv))
{
bool found(false);
for (const rom_entry &rom : device.rom_region_vector())
@ -376,11 +377,9 @@ void rom_load_manager::determine_bios_rom(device_t &device, const char *specbios
{
char const *const biosname = ROM_GETNAME(&rom);
int const bios_flags = ROM_GETBIOSFLAGS(&rom);
char bios_number[20];
// Allow '-bios n' to still be used
sprintf(bios_number, "%d", bios_flags - 1);
if (!core_stricmp(bios_number, specbios) || !core_stricmp(biosname, specbios))
if (specbios == std::to_string(bios_flags - 1) || util::streqlower(specbios, biosname))
{
found = true;
device.set_system_bios(bios_flags);
@ -1470,7 +1469,7 @@ rom_load_manager::rom_load_manager(running_machine &machine)
card_bios.erase(found);
}
}
determine_bios_rom(device, specbios.c_str());
determine_bios_rom(device, specbios);
}
}

2
src/emu/romload.h
View File

@ -432,7 +432,7 @@ public:
static std::error_condition open_disk_image(const emu_options &options, software_list_device &swlist, const software_info &swinfo, const rom_entry *romp, chd_file &image_chd);
private:
void determine_bios_rom(device_t &device, const char *specbios);
void determine_bios_rom(device_t &device, std::string_view specbios);
void count_roms();
void fill_random(u8 *base, u32 length);
void handle_missing_file(const rom_entry *romp, const std::vector<std::string> &tried_file_names, std::error_condition chderr);