diff --git a/src/emu/bus/gba/rom.c b/src/emu/bus/gba/rom.c index 19f08405259..556d55a63b1 100644 --- a/src/emu/bus/gba/rom.c +++ b/src/emu/bus/gba/rom.c @@ -253,12 +253,12 @@ gba_eeprom_device::gba_eeprom_device(running_machine &machine, UINT8 *eeprom, UI m_data_size = size; m_addr_bits = addr_bits; - state_save_register_item(machine, "GBA_EEPROM", NULL, 0, m_state); - state_save_register_item(machine, "GBA_EEPROM", NULL, 0, m_command); - state_save_register_item(machine, "GBA_EEPROM", NULL, 0, m_count); - state_save_register_item(machine, "GBA_EEPROM", NULL, 0, m_addr); - state_save_register_item(machine, "GBA_EEPROM", NULL, 0, m_bits); - state_save_register_item(machine, "GBA_EEPROM", NULL, 0, m_eep_data); + m_machine.save().save_item(m_state, "GBA_EEPROM/m_state"); + m_machine.save().save_item(m_command, "GBA_EEPROM/m_command"); + m_machine.save().save_item(m_count, "GBA_EEPROM/m_count"); + m_machine.save().save_item(m_addr, "GBA_EEPROM/m_addr"); + m_machine.save().save_item(m_bits, "GBA_EEPROM/m_bits"); + m_machine.save().save_item(m_eep_data, "GBA_EEPROM/m_eep_data"); } UINT32 gba_eeprom_device::read() diff --git a/src/emu/bus/megadrive/stm95.c b/src/emu/bus/megadrive/stm95.c index e403b22deb5..9fc24c1532b 100644 --- a/src/emu/bus/megadrive/stm95.c +++ b/src/emu/bus/megadrive/stm95.c @@ -22,13 +22,13 @@ stm95_eeprom_device::stm95_eeprom_device(running_machine &machine, UINT8 *eeprom m_machine(machine) { eeprom_data = eeprom; - state_save_register_item(machine, "STM95", NULL, 0, latch); - state_save_register_item(machine, "STM95", NULL, 0, reset_line); - state_save_register_item(machine, "STM95", NULL, 0, sck_line); - state_save_register_item(machine, "STM95", NULL, 0, WEL); - state_save_register_item(machine, "STM95", NULL, 0, stream_pos); - state_save_register_item(machine, "STM95", NULL, 0, stream_data); - state_save_register_item(machine, "STM95", NULL, 0, eeprom_addr); + m_machine.save().save_item(latch, "STM95/latch"); + m_machine.save().save_item(reset_line, "STM95/reset_line"); + m_machine.save().save_item(sck_line, "STM95/sck_line"); + m_machine.save().save_item(WEL, "STM95/WEL"); + m_machine.save().save_item(stream_pos, "STM95/stream_pos"); + m_machine.save().save_item(stream_data, "STM95/stream_data"); + m_machine.save().save_item(eeprom_addr, "STM95/eeprom_addr"); } void stm95_eeprom_device::set_cs_line(int state) diff --git a/src/emu/bus/snes/bsx.c b/src/emu/bus/snes/bsx.c index 6562793514a..5b4b7532325 100644 --- a/src/emu/bus/snes/bsx.c +++ b/src/emu/bus/snes/bsx.c @@ -116,10 +116,10 @@ void sns_rom_bsmempak_device::device_reset() BSX_base::BSX_base(running_machine &machine) : m_machine(machine) { - state_save_register_item(machine, "SNES_BSX", NULL, 0, regs); - state_save_register_item(machine, "SNES_BSX", NULL, 0, r2192_counter); - state_save_register_item(machine, "SNES_BSX", NULL, 0, r2192_hour); - state_save_register_item(machine, "SNES_BSX", NULL, 0, r2192_second); + m_machine.save().save_item(regs, "SNES_BSX/regs"); + m_machine.save().save_item(r2192_counter, "SNES_BSX/r2192_counter"); + m_machine.save().save_item(r2192_hour, "SNES_BSX/r2192_hour"); + m_machine.save().save_item(r2192_second, "SNES_BSX/r2192_second"); } void BSX_base::init() diff --git a/src/emu/bus/snes/spc7110.c b/src/emu/bus/snes/spc7110.c index ed7dccc247a..e9f156a6f39 100644 --- a/src/emu/bus/snes/spc7110.c +++ b/src/emu/bus/snes/spc7110.c @@ -319,49 +319,49 @@ SPC7110_Decomp::SPC7110_Decomp(running_machine &machine) #undef map } - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_decomp_mode); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_decomp_offset); - state_save_register_item_pointer(machine, "SNES_SPC7110", NULL, 0, m_decomp_buffer, SPC7110_DECOMP_BUFFER_SIZE); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_decomp_buffer_rdoffset); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_decomp_buffer_wroffset); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_decomp_buffer_length); + m_machine.save().save_item(m_decomp_mode, "SNES_SPC7110/m_decomp_mode"); + m_machine.save().save_item(m_decomp_offset, "SNES_SPC7110/m_decomp_offset"); + m_machine.save().save_pointer(m_decomp_buffer, "SNES_SPC7110/m_decomp_buffer", SPC7110_DECOMP_BUFFER_SIZE); + m_machine.save().save_item(m_decomp_buffer_rdoffset, "SNES_SPC7110/m_decomp_buffer_rdoffset"); + m_machine.save().save_item(m_decomp_buffer_wroffset, "SNES_SPC7110/m_decomp_buffer_wroffset"); + m_machine.save().save_item(m_decomp_buffer_length, "SNES_SPC7110/m_decomp_buffer_length"); for (int i = 0; i < 32; i++) { - state_save_register_item(machine, "SNES_SPC7110", NULL, i, m_context[i].index); - state_save_register_item(machine, "SNES_SPC7110", NULL, i, m_context[i].invert); + m_machine.save().save_item(m_context[i].index, "SNES_SPC7110/m_context[i].index", i); + m_machine.save().save_item(m_context[i].invert, "SNES_SPC7110/m_context[i].invert", i); } - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m0_val); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m0_in); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m0_span); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m0_out); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m0_inverts); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m0_lps); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m0_in_count); + m_machine.save().save_item(m_m0_val, "SNES_SPC7110/m_m0_val"); + m_machine.save().save_item(m_m0_in, "SNES_SPC7110/m_m0_in"); + m_machine.save().save_item(m_m0_span, "SNES_SPC7110/m_m0_span"); + m_machine.save().save_item(m_m0_out, "SNES_SPC7110/m_m0_out"); + m_machine.save().save_item(m_m0_inverts, "SNES_SPC7110/m_m0_inverts"); + m_machine.save().save_item(m_m0_lps, "SNES_SPC7110/m_m0_lps"); + m_machine.save().save_item(m_m0_in_count, "SNES_SPC7110/m_m0_in_count"); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m1_pixelorder); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m1_realorder); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m1_val); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m1_in); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m1_span); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m1_out); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m1_inverts); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m1_lps); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m1_in_count); + m_machine.save().save_item(m_m1_pixelorder, "SNES_SPC7110/m_m1_pixelorder"); + m_machine.save().save_item(m_m1_realorder, "SNES_SPC7110/m_m1_realorder"); + m_machine.save().save_item(m_m1_val, "SNES_SPC7110/m_m1_val"); + m_machine.save().save_item(m_m1_in, "SNES_SPC7110/m_m1_in"); + m_machine.save().save_item(m_m1_span, "SNES_SPC7110/m_m1_span"); + m_machine.save().save_item(m_m1_out, "SNES_SPC7110/m_m1_out"); + m_machine.save().save_item(m_m1_inverts, "SNES_SPC7110/m_m1_inverts"); + m_machine.save().save_item(m_m1_lps, "SNES_SPC7110/m_m1_lps"); + m_machine.save().save_item(m_m1_in_count, "SNES_SPC7110/m_m1_in_count"); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m2_pixelorder); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m2_realorder); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m2_bitplanebuffer); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m2_buffer_index); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m2_val); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m2_in); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m2_span); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m2_out0); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m2_out1); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m2_inverts); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m2_lps); - state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m2_in_count); + m_machine.save().save_item(m_m2_pixelorder, "SNES_SPC7110/m_m2_pixelorder"); + m_machine.save().save_item(m_m2_realorder, "SNES_SPC7110/m_m2_realorder"); + m_machine.save().save_item(m_m2_bitplanebuffer, "SNES_SPC7110/m_m2_bitplanebuffer"); + m_machine.save().save_item(m_m2_buffer_index, "SNES_SPC7110/m_m2_buffer_index"); + m_machine.save().save_item(m_m2_val, "SNES_SPC7110/m_m2_val"); + m_machine.save().save_item(m_m2_in, "SNES_SPC7110/m_m2_in"); + m_machine.save().save_item(m_m2_span, "SNES_SPC7110/m_m2_span"); + m_machine.save().save_item(m_m2_out0, "SNES_SPC7110/m_m2_out0"); + m_machine.save().save_item(m_m2_out1, "SNES_SPC7110/m_m2_out1"); + m_machine.save().save_item(m_m2_inverts, "SNES_SPC7110/m_m2_inverts"); + m_machine.save().save_item(m_m2_lps, "SNES_SPC7110/m_m2_lps"); + m_machine.save().save_item(m_m2_in_count, "SNES_SPC7110/m_m2_in_count"); } void SPC7110_Decomp::reset() diff --git a/src/emu/machine/bcreader.c b/src/emu/machine/bcreader.c index 954adfd5448..d8560ea600d 100644 --- a/src/emu/machine/bcreader.c +++ b/src/emu/machine/bcreader.c @@ -73,13 +73,13 @@ barcode_reader_device::barcode_reader_device(const machine_config &mconfig, cons void barcode_reader_device::device_start() { - state_save_register_item(machine(), "DATACH", this->tag(), 0, m_byte_data); - state_save_register_item(machine(), "DATACH", this->tag(), 0, m_pixel_data); - state_save_register_item(machine(), "DATACH", this->tag(), 0, m_byte_length); - state_save_register_item(machine(), "DATACH", this->tag(), 0, m_pixel_length); - state_save_register_item(machine(), "DATACH", this->tag(), 0, m_byte_count); - state_save_register_item(machine(), "DATACH", this->tag(), 0, m_pixel_count); - state_save_register_item(machine(), "DATACH", this->tag(), 0, m_new_code); + save_item(m_byte_data, "DATACH/m_byte_data"); + save_item(m_pixel_data, "DATACH/m_pixel_data"); + save_item(m_byte_length, "DATACH/m_byte_length"); + save_item(m_pixel_length, "DATACH/m_pixel_length"); + save_item(m_byte_count, "DATACH/m_byte_count"); + save_item(m_pixel_count, "DATACH/m_pixel_count"); + save_item(m_new_code, "DATACH/m_new_code"); } diff --git a/src/emu/save.h b/src/emu/save.h index e541514b2ee..c2d4e0bd6c1 100644 --- a/src/emu/save.h +++ b/src/emu/save.h @@ -54,17 +54,6 @@ typedef delegate save_prepost_delegate; template<> inline void save_manager::save_item(device_t *device, const char *module, const char *tag, int index, std::vector &value, const char *name) { save_memory(device, module, tag, index, name, &value[0], sizeof(TYPE), value.size()); } -// register items with explicit tags -#define state_save_register_item(_mach, _mod, _tag, _index, _val) \ - (_mach).save().save_item(NULL, _mod, _tag, _index, _val, #_val) - -#define state_save_register_item_pointer(_mach, _mod, _tag, _index, _val, _count) \ - (_mach).save().save_pointer(NULL, _mod, _tag, _index, _val, #_val, _count) - -#define state_save_register_item_array(_mach, _mod, _tag, _index, _val) \ - (_mach).save().save_item(NULL, _mod, _tag, _index, _val, #_val) - - //************************************************************************** // TYPE DEFINITIONS //**************************************************************************