Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-25 23:35:26 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix NVRAM file naming.

Browse Source
This commit is contained in:
Aaron Giles 2012-01-26 20:06:30 +00:00
parent 6b857b37e0
commit bc6f400f27
1 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/emu/machine/generic.c
View File

@ -316,29 +316,21 @@ void coin_lockout_global_w(running_machine &machine, int on)
NVRAM depending of selected BIOS NVRAM depending of selected BIOS
-------------------------------------------------*/ -------------------------------------------------*/
static astring nvram_filename(running_machine &machine, astring &result) static astring &nvram_filename(astring &result, device_t &device)
{
if (rom_system_bios(machine) == 0 || rom_default_bios(machine) == rom_system_bios(machine)) {
result.printf("%s",machine.basename());
} else {
result.printf("%s_%d",machine.basename(),rom_system_bios(machine) - 1);
}
return result;
}
/*-------------------------------------------------
nvram_filename - returns filename of system's
NVRAM depending of selected BIOS
-------------------------------------------------*/
static astring nvram_filename(device_t &device, astring &result)
{ {
running_machine &machine = device.machine(); running_machine &machine = device.machine();
astring name = astring(device.tag()).replacechr(':','_');
if (rom_system_bios(machine) == 0 || rom_default_bios(machine) == rom_system_bios(machine)) { // start with either basename or basename_biosnum
result.printf("%s\\%s",machine.basename(),name.cstr()); result.cpy(machine.basename());
} else { if (rom_system_bios(machine) != 0 && rom_default_bios(machine) != rom_system_bios(machine))
result.printf("%s_%d\\%s",machine.basename(),rom_system_bios(machine) - 1,name.cstr()); result.catprintf("_%d", rom_system_bios(machine) - 1);
// device-based NVRAM gets its own name in a subdirectory
if (&device != &device.machine().root_device())
{
astring tag(device.tag());
tag.del(0, 1).replacechr(':', '_');
result.cat('\\').cat(tag);
} }
return result; return result;
} }
@ -353,7 +345,7 @@ void nvram_load(running_machine &machine)
{ {
astring filename; astring filename;
emu_file file(machine.options().nvram_directory(), OPEN_FLAG_READ); emu_file file(machine.options().nvram_directory(), OPEN_FLAG_READ);
if (file.open(nvram_filename(machine,filename),".nv") == FILERR_NONE) if (file.open(nvram_filename(filename, machine.root_device()), ".nv") == FILERR_NONE)
{ {
(*machine.config().m_nvram_handler)(machine, &file, FALSE); (*machine.config().m_nvram_handler)(machine, &file, FALSE);
file.close(); file.close();
@ -369,7 +361,7 @@ void nvram_load(running_machine &machine)
{ {
astring filename; astring filename;
emu_file file(machine.options().nvram_directory(), OPEN_FLAG_READ); emu_file file(machine.options().nvram_directory(), OPEN_FLAG_READ);
if (file.open(nvram_filename(nvram->device(),filename)) == FILERR_NONE) if (file.open(nvram_filename(filename, nvram->device())) == FILERR_NONE)
{ {
nvram->nvram_load(file); nvram->nvram_load(file);
file.close(); file.close();
@ -390,7 +382,7 @@ void nvram_save(running_machine &machine)
{ {
astring filename; astring filename;
emu_file file(machine.options().nvram_directory(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS); emu_file file(machine.options().nvram_directory(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS);
if (file.open(nvram_filename(machine,filename), ".nv") == FILERR_NONE) if (file.open(nvram_filename(filename, machine.root_device()), ".nv") == FILERR_NONE)
{ {
(*machine.config().m_nvram_handler)(machine, &file, TRUE); (*machine.config().m_nvram_handler)(machine, &file, TRUE);
file.close(); file.close();
@ -402,7 +394,7 @@ void nvram_save(running_machine &machine)
{ {
astring filename; astring filename;
emu_file file(machine.options().nvram_directory(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS); emu_file file(machine.options().nvram_directory(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS);
if (file.open(nvram_filename(nvram->device(),filename)) == FILERR_NONE) if (file.open(nvram_filename(filename, nvram->device())) == FILERR_NONE)
{ {
nvram->nvram_save(file); nvram->nvram_save(file);
file.close(); file.close();