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

state_save_register_item_* removal, part 2 of 3 (nw)

Browse Source
This commit is contained in:
Ivan Vangelista 2015-04-22 19:41:51 +02:00
parent 3b046e1070
commit 1e0f25f95a
12 changed files with 118 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mame/drivers/seattle.c
View File

@ -579,8 +579,8 @@ void seattle_state::machine_start()
save_item(NAME(m_galileo.pci_ide_regs));
for (index = 0; index < ARRAY_LENGTH(m_galileo.timer); index++)
{
state_save_register_item(machine(), "galileo", NULL, index, m_galileo.timer[index].count);
state_save_register_item(machine(), "galileo", NULL, index, m_galileo.timer[index].active);
save_item(NAME(m_galileo.timer[index].count), index);
save_item(NAME(m_galileo.timer[index].active), index);
}
save_item(NAME(m_widget.ethernet_addr));
save_item(NAME(m_widget.irq_num));

4
src/mame/drivers/taitoair.c
View File

@ -639,8 +639,8 @@ void taitoair_state::machine_start()
for (int i = 0; i < TAITOAIR_POLY_MAX_PT; i++)
{
state_save_register_item(machine(), "globals", NULL, i, m_q.p[i].x);
state_save_register_item(machine(), "globals", NULL, i, m_q.p[i].y);
save_item(NAME(m_q.p[i].x), i);
save_item(NAME(m_q.p[i].y), i);
}
}

16
src/mame/machine/balsente.c
View File

@ -84,14 +84,14 @@ void balsente_state::machine_start()
/* register for saving */
for (i = 0; i < 3; i++)
{
state_save_register_item(machine(), "8253counter", NULL, i, m_counter[i].timer_active);
state_save_register_item(machine(), "8253counter", NULL, i, m_counter[i].initial);
state_save_register_item(machine(), "8253counter", NULL, i, m_counter[i].count);
state_save_register_item(machine(), "8253counter", NULL, i, m_counter[i].gate);
state_save_register_item(machine(), "8253counter", NULL, i, m_counter[i].out);
state_save_register_item(machine(), "8253counter", NULL, i, m_counter[i].mode);
state_save_register_item(machine(), "8253counter", NULL, i, m_counter[i].readbyte);
state_save_register_item(machine(), "8253counter", NULL, i, m_counter[i].writebyte);
save_item(m_counter[i].timer_active, "8253counter[i].timer_active", i);
save_item(m_counter[i].initial, "8253counter[i].initial", i);
save_item(m_counter[i].count, "8253counter[i].count", i);
save_item(m_counter[i].gate, "8253counter[i].gate", i);
save_item(m_counter[i].out, "8253counter[i].out", i);
save_item(m_counter[i].mode, "8253counter[i].mode", i);
save_item(m_counter[i].readbyte, "8253counter[i].readbyte", i);
save_item(m_counter[i].writebyte, "8253counter[i].writebyte", i);
}
save_item(NAME(m_counter_control));

8
src/mame/machine/mcr68.c
View File

@ -57,10 +57,10 @@ MACHINE_START_MEMBER(mcr68_state,mcr68)
m6840->timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(mcr68_state::counter_fired_callback),this));
state_save_register_item(machine(), "m6840", NULL, i, m6840->control);
state_save_register_item(machine(), "m6840", NULL, i, m6840->latch);
state_save_register_item(machine(), "m6840", NULL, i, m6840->count);
state_save_register_item(machine(), "m6840", NULL, i, m6840->timer_active);
save_item(m6840->control, "m6840/control", i);
save_item(m6840->latch, "m6840/latch", i);
save_item(m6840->count, "m6840/count", i);
save_item(m6840->timer_active, "m6840/timer_active", i);
}
save_item(NAME(m_m6840_status));

22
src/mame/machine/mhavoc.c
View File

@ -64,18 +64,18 @@ WRITE8_MEMBER(mhavoc_state::mhavoc_gamma_irq_ack_w)
void mhavoc_state::machine_start()
{
state_save_register_item(machine(), "misc", NULL, 0, m_alpha_data);
state_save_register_item(machine(), "misc", NULL, 0, m_alpha_rcvd);
state_save_register_item(machine(), "misc", NULL, 0, m_alpha_xmtd);
state_save_register_item(machine(), "misc", NULL, 0, m_gamma_data);
state_save_register_item(machine(), "misc", NULL, 0, m_gamma_rcvd);
state_save_register_item(machine(), "misc", NULL, 0, m_gamma_xmtd);
state_save_register_item(machine(), "misc", NULL, 0, m_player_1);
state_save_register_item(machine(), "misc", NULL, 0, m_alpha_irq_clock);
state_save_register_item(machine(), "misc", NULL, 0, m_alpha_irq_clock_enable);
state_save_register_item(machine(), "misc", NULL, 0, m_gamma_irq_clock);
save_item(NAME(m_alpha_data));
save_item(NAME(m_alpha_rcvd));
save_item(NAME(m_alpha_xmtd));
save_item(NAME(m_gamma_data));
save_item(NAME(m_gamma_rcvd));
save_item(NAME(m_gamma_xmtd));
save_item(NAME(m_player_1));
save_item(NAME(m_alpha_irq_clock));
save_item(NAME(m_alpha_irq_clock_enable));
save_item(NAME(m_gamma_irq_clock));
state_save_register_item(machine(), "misc", NULL, 0, m_speech_write_buffer);
save_item(NAME(m_speech_write_buffer));
}

4
src/mame/machine/rainbow.c
View File

@ -821,10 +821,10 @@ void rbisland_state::rbisland_cchip_init( int version )
{
m_CRAM[i] = auto_alloc_array(machine(), UINT8, 0x400);
state_save_register_item_pointer(machine(), "cchip", NULL, i, m_CRAM[i], 0x400);
save_pointer(m_CRAM[i], "cchip/m_CRAM[i]", 0x400, i);
}
state_save_register_item(machine(), "cchip", NULL, 0, m_current_bank);
save_item(m_current_bank, "cchip/m_current_bank");
machine().scheduler().timer_pulse(attotime::from_hz(60), timer_expired_delegate(FUNC(rbisland_state::cchip_timer),this));
}

4
src/mame/video/m92.c
View File

@ -278,8 +278,8 @@ VIDEO_START_MEMBER(m92_state,m92)
layer->tmap->set_transmask(2, 0x0001, (laynum == 2) ? 0xfffe : 0xffff);
layer->wide_tmap->set_transmask(2, 0x0001, (laynum == 2) ? 0xfffe : 0xffff);
state_save_register_item(machine(), "layer", NULL, laynum, layer->vram_base);
state_save_register_item_array(machine(), "layer", NULL, laynum, layer->control);
save_item(NAME(layer->vram_base), laynum);
save_item(NAME(layer->control), laynum);
}
m_paletteram.resize(m_palette->entries());

56
src/mame/video/vertigo.c
View File

@ -118,36 +118,36 @@ enum {
void vertigo_state::vertigo_vproc_init()
{
state_save_register_item_array(machine(), "vector_proc", NULL, 0, m_vs.sram);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vs.ramlatch);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vs.rom_adr);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vs.pc);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vs.ret);
save_item(m_vs.sram, "vector_proc/m_vs.sram");
save_item(m_vs.ramlatch, "vector_proc/m_vs.ramlatch");
save_item(m_vs.rom_adr, "vector_proc/m_vs.rom_adr");
save_item(m_vs.pc, "vector_proc/m_vs.pc");
save_item(m_vs.ret, "vector_proc/m_vs.ret");
state_save_register_item_array(machine(), "vector_proc", NULL, 0, m_bsp.ram);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_bsp.d);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_bsp.q);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_bsp.f);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_bsp.y);
save_item(m_bsp.ram, "vector_proc/m_bsp.ram");
save_item(m_bsp.d, "vector_proc/m_bsp.d");
save_item(m_bsp.q, "vector_proc/m_bsp.q");
save_item(m_bsp.f, "vector_proc/m_bsp.f");
save_item(m_bsp.y, "vector_proc/m_bsp.y");
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.sreg);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.l1);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.l2);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.c_v);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.c_h);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.c_l);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.adder_s);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.adder_a);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.color);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.intensity);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.brez);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.vfin);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.hud1);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.hud2);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.vud1);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.vud2);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.hc1);
state_save_register_item(machine(), "vector_proc", NULL, 0, m_vgen.ven);
save_item(m_vgen.sreg, "vector_proc/m_vgen.sreg");
save_item(m_vgen.l1, "vector_proc/m_vgen.l1");
save_item(m_vgen.l2, "vector_proc/m_vgen.l2");
save_item(m_vgen.c_v, "vector_proc/m_vgen.c_v");
save_item(m_vgen.c_h, "vector_proc/m_vgen.c_h");
save_item(m_vgen.c_l, "vector_proc/m_vgen.c_l");
save_item(m_vgen.adder_s, "vector_proc/m_vgen.adder_s");
save_item(m_vgen.adder_a, "vector_proc/m_vgen.adder_a");
save_item(m_vgen.color, "vector_proc/m_vgen.color");
save_item(m_vgen.intensity, "vector_proc/m_vgen.intensity");
save_item(m_vgen.brez, "vector_proc/m_vgen.brez");
save_item(m_vgen.vfin, "vector_proc/m_vgen.vfin");
save_item(m_vgen.hud1, "vector_proc/m_vgen.hud1");
save_item(m_vgen.hud2, "vector_proc/m_vgen.hud2");
save_item(m_vgen.vud1, "vector_proc/m_vgen.vud1");
save_item(m_vgen.vud2, "vector_proc/m_vgen.vud2");
save_item(m_vgen.hc1, "vector_proc/m_vgen.hc1");
save_item(m_vgen.ven, "vector_proc/m_vgen.ven");
}

76
src/mess/machine/apple2gs.c
View File

@ -1856,7 +1856,7 @@ void apple2gs_state::apple2gs_setup_memory()
/* allocate memory for E00000-E1FFFF */
m_slowmem = auto_alloc_array_clear(machine(), UINT8, 128*1024);
state_save_register_item_pointer(machine(), "APPLE2GS_SLOWMEM", NULL, 0, m_slowmem, 128*1024);
save_pointer(m_slowmem, "APPLE2GS_SLOWMEM", 128*1024);
// install expanded memory
// fair warning: other code assumes banks 0 and 1 are the first 128k of the RAM device, so you must install bank 1 at 0x10000
@ -2008,52 +2008,52 @@ MACHINE_START_MEMBER(apple2gs_state,apple2gscommon)
/* save state stuff. note that the driver takes care of docram. */
UINT8* ram = m_ram->pointer();
state_save_register_item_pointer(machine(), "APPLE2GS_RAM", NULL, 0, ram, m_ram->size());
save_pointer(ram, "APPLE2GS_RAM", m_ram->size());
state_save_register_item(machine(), "NEWVIDEO", NULL, 0, m_newvideo);
state_save_register_item(machine(), "BORDERCOLOR", NULL, 0, m_bordercolor);
state_save_register_item(machine(), "VGCINT", NULL,0, m_vgcint);
state_save_register_item(machine(), "LANGSEL", NULL,0, m_langsel);
state_save_register_item(machine(), "SLTROMSEL", NULL,0, m_sltromsel);
state_save_register_item(machine(), "CYAREG", NULL,0, m_cyareg);
state_save_register_item(machine(), "INTEN", NULL,0, m_inten);
state_save_register_item(machine(), "INTFLAG", NULL,0, m_intflag);
state_save_register_item(machine(), "SHADOW", NULL,0, m_shadow);
state_save_register_item(machine(), "PENDIRQ", NULL,0, m_pending_irqs);
state_save_register_item(machine(), "MX", NULL,0, m_mouse_x);
state_save_register_item(machine(), "MY", NULL,0, m_mouse_y);
state_save_register_item(machine(), "MDX", NULL,0, m_mouse_dx);
state_save_register_item(machine(), "MDY", NULL,0, m_mouse_dy);
save_item(m_newvideo, "NEWVIDEO");
save_item(m_bordercolor, "BORDERCOLOR");
save_item(m_vgcint, "VGCINT");
save_item(m_langsel, "LANGSEL");
save_item(m_sltromsel, "SLTROMSEL");
save_item(m_cyareg, "CYAREG");
save_item(m_inten, "INTEN");
save_item(m_intflag, "INTFLAG");
save_item(m_shadow, "SHADOW");
save_item(m_pending_irqs, "PENDIRQ");
save_item(m_mouse_x, "MX");
save_item(m_mouse_y, "MY");
save_item(m_mouse_dx, "MDX");
save_item(m_mouse_dy, "MDY");
state_save_register_item(machine(), "CLKDATA", NULL,0, m_clock_data);
state_save_register_item(machine(), "CLKCTRL", NULL,0, m_clock_control);
state_save_register_item(machine(), "CLKRD", NULL,0, m_clock_read);
state_save_register_item(machine(), "CLKREG1", NULL,0, m_clock_reg1);
state_save_register_item(machine(), "CLKCURTIME", NULL,0, m_clock_curtime);
state_save_register_item(machine(), "CLKCURTIMEINT", NULL,0, m_clock_curtime_interval);
// state_save_register_item(machine(), "CLKMODE", NULL,0, m_clock_mode);
save_item(m_clock_data, "CLKDATA");
save_item(m_clock_control, "CLKCTRL");
save_item(m_clock_read, "CLKRD");
save_item(m_clock_reg1, "CLKREG1");
save_item(m_clock_curtime, "CLKCURTIME");
save_item(m_clock_curtime_interval, "CLKCURTIMEINT");
// save_item(m_clock_mode, "CLKMODE");
save_item(NAME(m_clock_bram));
#if !RUN_ADB_MICRO
save_item(NAME(m_adb_memory));
save_item(NAME(m_adb_command_bytes));
save_item(NAME(m_adb_response_bytes));
// state_save_register_item(machine(), "ADB", NULL,0, m_adb_state);
state_save_register_item(machine(), "ADB", NULL,0, m_adb_command);
state_save_register_item(machine(), "ADB", NULL,0, m_adb_mode);
state_save_register_item(machine(), "ADB", NULL,0, m_adb_kmstatus);
state_save_register_item(machine(), "ADB", NULL,0, m_adb_latent_result);
state_save_register_item(machine(), "ADB", NULL,0, m_adb_command_length);
state_save_register_item(machine(), "ADB", NULL,0, m_adb_command_pos);
state_save_register_item(machine(), "ADB", NULL,0, m_adb_response_length);
state_save_register_item(machine(), "ADB", NULL,0, m_adb_response_pos);
state_save_register_item(machine(), "ADB", NULL,0, m_adb_address_keyboard);
state_save_register_item(machine(), "ADB", NULL,0, m_adb_address_mouse);
// save_item(m_adb_state, "ADB/m_adb_state");
save_item(m_adb_command, "ADB/m_adb_command");
save_item(m_adb_mode, "ADB/m_adb_mode");
save_item(m_adb_kmstatus, "ADB/m_adb_kmstatus");
save_item(m_adb_latent_result, "ADB/m_adb_latent_result");
save_item(m_adb_command_length, "ADB/m_adb_command_length");
save_item(m_adb_command_pos, "ADB/m_adb_command_pos");
save_item(m_adb_response_length, "ADB/m_adb_response_length");
save_item(m_adb_response_pos, "ADB/m_adb_response_pos");
save_item(m_adb_address_keyboard, "ADB/m_adb_address_keyboard");
save_item(m_adb_address_mouse, "ADB/m_adb_address_mouse");
#endif
state_save_register_item(machine(), "SNDGLUCTRL", NULL,0, m_sndglu_ctrl);
state_save_register_item(machine(), "SNDGLUADDR", NULL,0, m_sndglu_addr);
state_save_register_item(machine(), "SNDGLUDUMMYRD", NULL,0, m_sndglu_dummy_read);
save_item(m_sndglu_ctrl, "SNDGLUCTRL");
save_item(m_sndglu_addr, "SNDGLUADDR");
save_item(m_sndglu_dummy_read, "SNDGLUDUMMYRD");
state_save_register_item(machine(), "ECHOBANK", NULL,0, m_echo_bank);
save_item(m_echo_bank, "ECHOBANK");
m_clock_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(apple2gs_state::apple2gs_clock_tick),this));
m_clock_timer->adjust(attotime::from_seconds(1), 0, attotime::from_seconds(1));

6
src/mess/machine/hp48.c
View File

@ -1130,9 +1130,9 @@ void hp48_state::hp48_machine_start( hp48_models model )
save_item(NAME(m_bank_switch) );
for ( i = 0; i < 6; i++ )
{
state_save_register_item(machine(), "globals", NULL, i, m_modules[i].state );
state_save_register_item(machine(), "globals", NULL, i, m_modules[i].base );
state_save_register_item(machine(), "globals", NULL, i, m_modules[i].mask );
save_item(m_modules[i].state, "globals/m_modules[i].state", i);
save_item(m_modules[i].base, "globals/m_modules[i].base", i);
save_item(m_modules[i].mask, "globals/m_modules[i].mask", i);
}
save_item(NAME(m_io) );
machine().save().register_postload( save_prepost_delegate(FUNC(hp48_state::hp48_update_annunciators), this ));

2
src/mess/video/apple2gs.c
View File

@ -19,7 +19,7 @@ VIDEO_START_MEMBER(apple2gs_state,apple2gs)
apple2_video_start(m_slowmem, m_slowmem+0x10000, 0, 8);
m_legacy_gfx = auto_bitmap_ind16_alloc(machine(), 560, 192);
state_save_register_item(machine(), "BORDERCLR", NULL, 0, m_bordercolor);
save_item(m_bordercolor, "BORDERCLR");
save_item(NAME(m_fgcolor));
save_item(NAME(m_bgcolor));
}

34
src/mess/video/stic.c
View File

@ -58,23 +58,23 @@ void stic_device::device_start()
save_item(NAME(m_backtab_buffer));
for (int sp = 0; sp < STIC_MOBS; sp++)
{
state_save_register_item(machine(), "STIC sprite", NULL, sp, m_sprite[sp].visible);
state_save_register_item(machine(), "STIC sprite", NULL, sp, m_sprite[sp].xpos);
state_save_register_item(machine(), "STIC sprite", NULL, sp, m_sprite[sp].ypos);
state_save_register_item(machine(), "STIC sprite", NULL, sp, m_sprite[sp].coll);
state_save_register_item(machine(), "STIC sprite", NULL, sp, m_sprite[sp].collision);
state_save_register_item(machine(), "STIC sprite", NULL, sp, m_sprite[sp].doublex);
state_save_register_item(machine(), "STIC sprite", NULL, sp, m_sprite[sp].doubley);
state_save_register_item(machine(), "STIC sprite", NULL, sp, m_sprite[sp].quady);
state_save_register_item(machine(), "STIC sprite", NULL, sp, m_sprite[sp].xflip);
state_save_register_item(machine(), "STIC sprite", NULL, sp, m_sprite[sp].yflip);
state_save_register_item(machine(), "STIC sprite", NULL, sp, m_sprite[sp].behind_foreground);
state_save_register_item(machine(), "STIC sprite", NULL, sp, m_sprite[sp].grom);
state_save_register_item(machine(), "STIC sprite", NULL, sp, m_sprite[sp].card);
state_save_register_item(machine(), "STIC sprite", NULL, sp, m_sprite[sp].color);
state_save_register_item(machine(), "STIC sprite", NULL, sp, m_sprite[sp].doubleyres);
state_save_register_item(machine(), "STIC sprite", NULL, sp, m_sprite[sp].dirty);
state_save_register_item(machine(), "STIC sprite", NULL, sp, m_sprite_buffers[sp]);
save_item(m_sprite[sp].visible, "STIC sprite/m_sprite[sp].visible", sp);
save_item(m_sprite[sp].xpos, "STIC sprite/m_sprite[sp].xpos", sp);
save_item(m_sprite[sp].ypos, "STIC sprite/m_sprite[sp].ypos", sp);
save_item(m_sprite[sp].coll, "STIC sprite/m_sprite[sp].coll", sp);
save_item(m_sprite[sp].collision, "STIC sprite/m_sprite[sp].collision", sp);
save_item(m_sprite[sp].doublex, "STIC sprite/m_sprite[sp].doublex", sp);
save_item(m_sprite[sp].doubley, "STIC sprite/m_sprite[sp].doubley", sp);
save_item(m_sprite[sp].quady, "STIC sprite/m_sprite[sp].quady", sp);
save_item(m_sprite[sp].xflip, "STIC sprite/m_sprite[sp].xflip", sp);
save_item(m_sprite[sp].yflip, "STIC sprite/m_sprite[sp].yflip", sp);
save_item(m_sprite[sp].behind_foreground, "STIC sprite/m_sprite[sp].behind_foreground", sp);
save_item(m_sprite[sp].grom, "STIC sprite/m_sprite[sp].grom", sp);
save_item(m_sprite[sp].card, "STIC sprite/m_sprite[sp].card", sp);
save_item(m_sprite[sp].color, "STIC sprite/m_sprite[sp].color", sp);
save_item(m_sprite[sp].doubleyres, "STIC sprite/m_sprite[sp].doubleyres", sp);
save_item(m_sprite[sp].dirty, "STIC sprite/m_sprite[sp].dirty", sp);
save_item(m_sprite_buffers[sp], "STIC sprite/m_sprite[sp].sprite_buffers", sp);
}
}