diff --git a/src/devices/bus/einstein/pipe/silicon_disc.cpp b/src/devices/bus/einstein/pipe/silicon_disc.cpp index ec8924a9002..b9017cd6e56 100644 --- a/src/devices/bus/einstein/pipe/silicon_disc.cpp +++ b/src/devices/bus/einstein/pipe/silicon_disc.cpp @@ -69,7 +69,7 @@ void einstein_silicon_disc_device::device_start() memset(m_ram.get(), 0xff, 0x40000); // register for save states - save_pointer(NAME(m_ram.get()), 0x40000); + save_pointer(NAME(m_ram), 0x40000); save_item(NAME(m_sector)); } diff --git a/src/devices/bus/einstein/pipe/speculator.cpp b/src/devices/bus/einstein/pipe/speculator.cpp index 8334f2d3f65..50f3458b947 100644 --- a/src/devices/bus/einstein/pipe/speculator.cpp +++ b/src/devices/bus/einstein/pipe/speculator.cpp @@ -84,7 +84,7 @@ void einstein_speculator_device::device_start() memset(m_ram.get(), 0xff, 0x800); // register for save states - save_pointer(NAME(m_ram.get()), 0x800); + save_pointer(NAME(m_ram), 0x800); save_item(NAME(m_nmisel)); } diff --git a/src/devices/bus/einstein/pipe/tk02.cpp b/src/devices/bus/einstein/pipe/tk02.cpp index a40def814f4..048cd0680ee 100644 --- a/src/devices/bus/einstein/pipe/tk02.cpp +++ b/src/devices/bus/einstein/pipe/tk02.cpp @@ -146,7 +146,7 @@ void tk02_device::device_start() memset(m_ram.get(), 0xff, 0x800); // register for save states - save_pointer(NAME(m_ram.get()), 0x800); + save_pointer(NAME(m_ram), 0x800); save_item(NAME(m_de)); } diff --git a/src/devices/bus/intellec4/insdatastor.cpp b/src/devices/bus/intellec4/insdatastor.cpp index f036bf6e7b5..f271ef4b91f 100644 --- a/src/devices/bus/intellec4/insdatastor.cpp +++ b/src/devices/bus/intellec4/insdatastor.cpp @@ -80,7 +80,7 @@ void imm4_22_device::device_start() save_item(NAME(m_rom_mirror)); save_item(NAME(m_memory)); save_item(NAME(m_status)); - save_pointer(NAME(m_prom.get()), 1024U); + save_pointer(NAME(m_prom), 1024U); } void imm4_22_device::device_reset() diff --git a/src/devices/bus/intellec4/prommemory.cpp b/src/devices/bus/intellec4/prommemory.cpp index d3d1629ca1f..0eab857a72f 100644 --- a/src/devices/bus/intellec4/prommemory.cpp +++ b/src/devices/bus/intellec4/prommemory.cpp @@ -45,7 +45,7 @@ void imm6_26_device::device_start() { allocate(); - save_pointer(NAME(m_data.get()), 4096U); + save_pointer(NAME(m_data), 4096U); } diff --git a/src/devices/bus/interpro/sr/gt.cpp b/src/devices/bus/interpro/sr/gt.cpp index e840f973ed9..409ddcd18f8 100644 --- a/src/devices/bus/interpro/sr/gt.cpp +++ b/src/devices/bus/interpro/sr/gt.cpp @@ -409,8 +409,8 @@ void gt_device_base::device_start() gt.buffer.reset(new u8[GT_BUFFER_SIZE * 2]); gt.mask.reset(new u8[GT_BUFFER_SIZE * 2]); - save_pointer(gt.buffer.get(), util::string_format("buffer%i", i).c_str(), GT_BUFFER_SIZE * 2); - save_pointer(gt.mask.get(), util::string_format("mask%i", i).c_str(), GT_BUFFER_SIZE * 2); + save_pointer(NAME(gt.buffer), GT_BUFFER_SIZE * 2, i); + save_pointer(NAME(gt.mask), GT_BUFFER_SIZE * 2, i); } // allocate timers diff --git a/src/devices/bus/s100/seals8k.cpp b/src/devices/bus/s100/seals8k.cpp index 354832766f3..79e90a29d4f 100644 --- a/src/devices/bus/s100/seals8k.cpp +++ b/src/devices/bus/s100/seals8k.cpp @@ -154,7 +154,7 @@ ioport_constructor s100_8k_sc_device::device_input_ports() const void s100_8k_sc_device::device_start() { m_ram = make_unique_clear(0x2000); - save_pointer(NAME(m_ram.get()), 0x2000); + save_pointer(NAME(m_ram), 0x2000); } diff --git a/src/devices/bus/snes/sdd1.cpp b/src/devices/bus/snes/sdd1.cpp index e6f0ee179d2..6d13fcd97a8 100644 --- a/src/devices/bus/snes/sdd1.cpp +++ b/src/devices/bus/snes/sdd1.cpp @@ -441,7 +441,7 @@ void sns_rom_sdd1_device::device_start() save_item(NAME(m_dma[i].size), i); } - save_pointer(NAME(m_buffer.data.get()), 0x10000); + save_pointer(NAME(m_buffer.data), 0x10000); save_item(NAME(m_buffer.offset)); save_item(NAME(m_buffer.size)); save_item(NAME(m_buffer.ready)); diff --git a/src/devices/bus/svi3x8/slot/sv803.cpp b/src/devices/bus/svi3x8/slot/sv803.cpp index c5e53572d30..db79801530c 100644 --- a/src/devices/bus/svi3x8/slot/sv803.cpp +++ b/src/devices/bus/svi3x8/slot/sv803.cpp @@ -40,7 +40,7 @@ sv803_device::sv803_device(const machine_config &mconfig, const char *tag, devic void sv803_device::device_start() { // register for savestates - save_pointer(NAME(m_ram.get()), 0x4000); + save_pointer(NAME(m_ram), 0x4000); } //------------------------------------------------- diff --git a/src/devices/bus/svi3x8/slot/sv806.cpp b/src/devices/bus/svi3x8/slot/sv806.cpp index d9eb77e9f9c..833bcc546be 100644 --- a/src/devices/bus/svi3x8/slot/sv806.cpp +++ b/src/devices/bus/svi3x8/slot/sv806.cpp @@ -81,7 +81,7 @@ void sv806_device::device_start() { // register for savestates save_item(NAME(m_ram_enabled)); - save_pointer(NAME(m_ram.get()), 0x800); + save_pointer(NAME(m_ram), 0x800); } diff --git a/src/devices/bus/svi3x8/slot/sv807.cpp b/src/devices/bus/svi3x8/slot/sv807.cpp index 565154a6e7d..6ea6a77a6bc 100644 --- a/src/devices/bus/svi3x8/slot/sv807.cpp +++ b/src/devices/bus/svi3x8/slot/sv807.cpp @@ -99,8 +99,8 @@ void sv807_device::device_start() save_item(NAME(m_bk22)); save_item(NAME(m_bk31)); save_item(NAME(m_bk32)); - save_pointer(NAME(m_ram_bank1.get()), 0x8000); - save_pointer(NAME(m_ram_bank2.get()), 0x8000); + save_pointer(NAME(m_ram_bank1), 0x8000); + save_pointer(NAME(m_ram_bank2), 0x8000); } //------------------------------------------------- diff --git a/src/devices/bus/ti8x/graphlinkhle.cpp b/src/devices/bus/ti8x/graphlinkhle.cpp index 4e364f644ed..1b2cc9c2465 100644 --- a/src/devices/bus/ti8x/graphlinkhle.cpp +++ b/src/devices/bus/ti8x/graphlinkhle.cpp @@ -32,7 +32,7 @@ void graph_link_hle_device::device_start() { m_buffer = std::make_unique(BUFLEN); - save_pointer(NAME(m_buffer.get()), BUFLEN); + save_pointer(NAME(m_buffer), BUFLEN); } diff --git a/src/devices/cpu/es5510/es5510.cpp b/src/devices/cpu/es5510/es5510.cpp index d461645dec8..2349b789646 100644 --- a/src/devices/cpu/es5510/es5510.cpp +++ b/src/devices/cpu/es5510/es5510.cpp @@ -586,9 +586,9 @@ void es5510_device::device_start() { save_item(NAME(dol)); save_item(NAME(dol_count)); - save_pointer(NAME(gpr.get()), 0xc0); - save_pointer(NAME(instr.get()), 160); - save_pointer(NAME(dram.get()), DRAM_SIZE); + save_pointer(NAME(gpr), 0xc0); + save_pointer(NAME(instr), 160); + save_pointer(NAME(dram), DRAM_SIZE); save_item(NAME(dol_latch)); save_item(NAME(dil_latch)); diff --git a/src/devices/cpu/mcs40/mcs40.cpp b/src/devices/cpu/mcs40/mcs40.cpp index 19f4cbbdf4a..fa70e9d389e 100644 --- a/src/devices/cpu/mcs40/mcs40.cpp +++ b/src/devices/cpu/mcs40/mcs40.cpp @@ -229,9 +229,9 @@ void mcs40_cpu_device_base::device_start() save_item(NAME(m_4289_first)); save_item(NAME(m_a)); save_item(NAME(m_c)); - save_pointer(NAME(m_addr_stack.get()), m_stack_ptr_mask + 1); + save_pointer(NAME(m_addr_stack), m_stack_ptr_mask + 1); save_item(NAME(m_stack_ptr)); - save_pointer(NAME(m_index_regs.get()), m_index_reg_cnt >> 1); + save_pointer(NAME(m_index_regs), m_index_reg_cnt >> 1); save_item(NAME(m_index_reg_bank)); save_item(NAME(m_cr)); save_item(NAME(m_pending_cr3)); diff --git a/src/devices/machine/28fxxx.cpp b/src/devices/machine/28fxxx.cpp index 9ef279dcd44..3d9bdeb639b 100644 --- a/src/devices/machine/28fxxx.cpp +++ b/src/devices/machine/28fxxx.cpp @@ -75,7 +75,7 @@ void base_28fxxx_device::device_start() m_data = std::make_unique(m_size); save_item(NAME(m_program_power)); - save_pointer(NAME(m_data.get()), m_size); + save_pointer(NAME(m_data), m_size); save_item(NAME(m_state)); save_item(NAME(m_address_latch)); diff --git a/src/devices/machine/6850acia.cpp b/src/devices/machine/6850acia.cpp index 0671dd04ecc..6527608bf0f 100644 --- a/src/devices/machine/6850acia.cpp +++ b/src/devices/machine/6850acia.cpp @@ -16,7 +16,7 @@ MACROS ***************************************************************************/ -//#define VERBOSE 1 +#define VERBOSE 1 //#define LOG_OUTPUT_STREAM std::cout #include "logmacro.h" @@ -582,15 +582,20 @@ void acia6850_device::output_irq(int irq) { m_irq = irq; - if (irq) - { - m_status &= ~SR_IRQ; - } - else - { - m_status |= SR_IRQ; - } - - m_irq_handler(!m_irq); + machine().scheduler().synchronize(timer_expired_delegate(FUNC(acia6850_device::delayed_output_irq), this), irq); } } + +TIMER_CALLBACK_MEMBER(acia6850_device::delayed_output_irq) +{ + if (m_irq) + { + m_status &= ~SR_IRQ; + } + else + { + m_status |= SR_IRQ; + } + + m_irq_handler(!m_irq); +} diff --git a/src/devices/machine/6850acia.h b/src/devices/machine/6850acia.h index 5f78bc932b3..1dc975911d8 100644 --- a/src/devices/machine/6850acia.h +++ b/src/devices/machine/6850acia.h @@ -63,6 +63,8 @@ private: void output_rts(int txd); void output_irq(int irq); + TIMER_CALLBACK_MEMBER(delayed_output_irq); + enum { SR_RDRF = 0x01, diff --git a/src/devices/machine/eeprom.cpp b/src/devices/machine/eeprom.cpp index 02ec231478a..86e6c749ff1 100644 --- a/src/devices/machine/eeprom.cpp +++ b/src/devices/machine/eeprom.cpp @@ -181,7 +181,7 @@ void eeprom_base_device::device_start() // save states save_item(NAME(m_completion_time)); - save_pointer(m_data.get(), "m_data", size); + save_pointer(NAME(m_data), size); } diff --git a/src/devices/machine/er1400.cpp b/src/devices/machine/er1400.cpp index d9378bf4997..763e80af58f 100644 --- a/src/devices/machine/er1400.cpp +++ b/src/devices/machine/er1400.cpp @@ -72,7 +72,7 @@ void er1400_device::device_start() save_item(NAME(m_address_register)); m_data_array = std::make_unique(100); - save_pointer(m_data_array.get(), "m_data_array", 100); + save_pointer(NAME(m_data_array), 100); m_data_propagation_timer = timer_alloc(PROPAGATION_TIMER); } diff --git a/src/devices/machine/mb8421.cpp b/src/devices/machine/mb8421.cpp index 89a18d60d6d..ceb3b843577 100644 --- a/src/devices/machine/mb8421.cpp +++ b/src/devices/machine/mb8421.cpp @@ -65,7 +65,7 @@ void mb8421_device::device_start() m_ram = make_unique_clear(0x800); // state save - save_pointer(NAME(m_ram.get()), 0x800); + save_pointer(NAME(m_ram), 0x800); } void mb8421_mb8431_16_device::device_start() @@ -75,7 +75,7 @@ void mb8421_mb8431_16_device::device_start() m_ram = make_unique_clear(0x800); // state save - save_pointer(NAME(m_ram.get()), 0x800); + save_pointer(NAME(m_ram), 0x800); } //------------------------------------------------- diff --git a/src/devices/machine/ram.cpp b/src/devices/machine/ram.cpp index 7ae8b6d8682..2a074e7cee3 100644 --- a/src/devices/machine/ram.cpp +++ b/src/devices/machine/ram.cpp @@ -167,7 +167,7 @@ void ram_device::device_start() // register for state saving save_item(NAME(m_size)); - save_pointer(NAME(m_pointer.get()), m_size); + save_pointer(NAME(m_pointer), m_size); } diff --git a/src/devices/machine/sdlc.cpp b/src/devices/machine/sdlc.cpp index 870f8aba4e3..7a7303b9e73 100644 --- a/src/devices/machine/sdlc.cpp +++ b/src/devices/machine/sdlc.cpp @@ -166,7 +166,7 @@ void sdlc_logger_device::device_start() save_item(NAME(m_current_clock)); save_item(NAME(m_frame_bits)); save_item(NAME(m_expected_fcs)); - save_pointer(NAME(m_buffer.get()), BUFFER_BYTES); + save_pointer(NAME(m_buffer), BUFFER_BYTES); } void sdlc_logger_device::device_reset() diff --git a/src/devices/machine/terminal.cpp b/src/devices/machine/terminal.cpp index be8876c892c..2d18fd50a90 100644 --- a/src/devices/machine/terminal.cpp +++ b/src/devices/machine/terminal.cpp @@ -347,7 +347,7 @@ void generic_terminal_device::device_start() m_buffer = std::make_unique(m_width * m_height); m_bell_timer = timer_alloc(BELL_TIMER_ID); m_keyboard_cb.bind_relative_to(*owner()); - save_pointer(NAME(m_buffer.get()), m_width * m_height); + save_pointer(NAME(m_buffer), m_width * m_height); save_item(NAME(m_x_pos)); save_item(NAME(m_framecnt)); save_item(NAME(m_y_pos)); diff --git a/src/devices/machine/x2212.cpp b/src/devices/machine/x2212.cpp index c9738d69aa1..1871d03c4da 100644 --- a/src/devices/machine/x2212.cpp +++ b/src/devices/machine/x2212.cpp @@ -53,8 +53,8 @@ void x2212_device::device_start() save_item(NAME(m_store)); save_item(NAME(m_array_recall)); - save_pointer(NAME(m_sram.get()), m_size_data); - save_pointer(NAME(m_e2prom.get()), m_size_data); + save_pointer(NAME(m_sram), m_size_data); + save_pointer(NAME(m_e2prom), m_size_data); } diff --git a/src/devices/sound/cdda.cpp b/src/devices/sound/cdda.cpp index a0902789386..1b2d766493e 100644 --- a/src/devices/sound/cdda.cpp +++ b/src/devices/sound/cdda.cpp @@ -47,7 +47,7 @@ void cdda_device::device_start() save_item( NAME(m_audio_ended_normally) ); save_item( NAME(m_audio_lba) ); save_item( NAME(m_audio_length) ); - save_pointer( NAME(m_audio_cache.get()), CD_MAX_SECTOR_DATA * MAX_SECTORS ); + save_pointer( NAME(m_audio_cache), CD_MAX_SECTOR_DATA * MAX_SECTORS ); save_item( NAME(m_audio_samples) ); save_item( NAME(m_audio_bptr) ); } diff --git a/src/devices/sound/dmadac.cpp b/src/devices/sound/dmadac.cpp index 8493747b1b6..59fe5b15546 100644 --- a/src/devices/sound/dmadac.cpp +++ b/src/devices/sound/dmadac.cpp @@ -53,7 +53,7 @@ void dmadac_sound_device::device_start() save_item(NAME(m_volume)); save_item(NAME(m_enabled)); save_item(NAME(m_frequency)); - save_pointer(NAME(m_buffer.get()), BUFFER_SIZE); + save_pointer(NAME(m_buffer), BUFFER_SIZE); } diff --git a/src/devices/sound/es5506.cpp b/src/devices/sound/es5506.cpp index 4a00a38741e..01ef0f580eb 100644 --- a/src/devices/sound/es5506.cpp +++ b/src/devices/sound/es5506.cpp @@ -269,7 +269,7 @@ void es5506_device::device_start() save_item(NAME(m_lrend)); save_item(NAME(m_irqv)); - save_pointer(NAME(m_scratch.get()), 2 * MAX_SAMPLE_CHUNK); + save_pointer(NAME(m_scratch), 2 * MAX_SAMPLE_CHUNK); for (j = 0; j < 32; j++) { @@ -401,7 +401,7 @@ void es5505_device::device_start() save_item(NAME(m_lrend)); save_item(NAME(m_irqv)); - save_pointer(NAME(m_scratch.get()), 2 * MAX_SAMPLE_CHUNK); + save_pointer(NAME(m_scratch), 2 * MAX_SAMPLE_CHUNK); for (j = 0; j < 32; j++) { diff --git a/src/devices/sound/k054539.cpp b/src/devices/sound/k054539.cpp index a7f10d51217..862f8e2f175 100644 --- a/src/devices/sound/k054539.cpp +++ b/src/devices/sound/k054539.cpp @@ -329,7 +329,7 @@ void k054539_device::init_chip() save_item(NAME(flags)); save_item(NAME(regs)); - save_pointer(NAME(ram.get()), 0x4000); + save_pointer(NAME(ram), 0x4000); save_item(NAME(reverb_pos)); save_item(NAME(cur_ptr)); save_item(NAME(cur_limit)); diff --git a/src/devices/sound/segapcm.cpp b/src/devices/sound/segapcm.cpp index 919726a26c4..6daa0339de2 100644 --- a/src/devices/sound/segapcm.cpp +++ b/src/devices/sound/segapcm.cpp @@ -42,7 +42,7 @@ void segapcm_device::device_start() m_stream = stream_alloc(0, 2, clock() / 128); save_item(NAME(m_low)); - save_pointer(NAME(m_ram.get()), 0x800); + save_pointer(NAME(m_ram), 0x800); } diff --git a/src/devices/sound/sp0256.cpp b/src/devices/sound/sp0256.cpp index 0dfe8194cc7..78f77da29ba 100644 --- a/src/devices/sound/sp0256.cpp +++ b/src/devices/sound/sp0256.cpp @@ -85,7 +85,7 @@ void sp0256_device::device_start() /* Allocate a scratch buffer for generating ~10kHz samples. */ /* -------------------------------------------------------------------- */ m_scratch = std::make_unique(SCBUF_SIZE); - save_pointer(NAME(m_scratch.get()), SCBUF_SIZE); + save_pointer(NAME(m_scratch), SCBUF_SIZE); m_sc_head = m_sc_tail = 0; diff --git a/src/devices/sound/zsg2.cpp b/src/devices/sound/zsg2.cpp index 6300f02b84e..7a06ac072ef 100644 --- a/src/devices/sound/zsg2.cpp +++ b/src/devices/sound/zsg2.cpp @@ -92,8 +92,8 @@ void zsg2_device::device_start() m_full_samples = make_unique_clear(m_mem_blocks * 4 + 4); // +4 is for empty block // register for savestates - save_pointer(NAME(m_mem_copy.get()), m_mem_blocks / sizeof(uint32_t)); - save_pointer(NAME(m_full_samples.get()), (m_mem_blocks * 4 + 4) / sizeof(int16_t)); + save_pointer(NAME(m_mem_copy), m_mem_blocks / sizeof(uint32_t)); + save_pointer(NAME(m_full_samples), (m_mem_blocks * 4 + 4) / sizeof(int16_t)); save_item(NAME(m_read_address)); for (int ch = 0; ch < 48; ch++) diff --git a/src/devices/video/315_5313.cpp b/src/devices/video/315_5313.cpp index cbcf44ca3a0..6c33332b23c 100644 --- a/src/devices/video/315_5313.cpp +++ b/src/devices/video/315_5313.cpp @@ -253,11 +253,11 @@ void sega315_5313_device::device_start() memset(m_internal_sprite_attribute_table.get(), 0x00, 0x400); - save_pointer(NAME(m_vram.get()), 0x10000/2); - save_pointer(NAME(m_cram.get()), 0x80/2); - save_pointer(NAME(m_vsram.get()), 0x80/2); - save_pointer(NAME(m_regs.get()), 0x40/2); - save_pointer(NAME(m_internal_sprite_attribute_table.get()), 0x400/2); + save_pointer(NAME(m_vram), 0x10000/2); + save_pointer(NAME(m_cram), 0x80/2); + save_pointer(NAME(m_vsram), 0x80/2); + save_pointer(NAME(m_regs), 0x40/2); + save_pointer(NAME(m_internal_sprite_attribute_table), 0x400/2); save_item(NAME(m_command_pending)); save_item(NAME(m_command_part1)); @@ -305,16 +305,16 @@ void sega315_5313_device::device_start() // FIXME: are these all needed? I'm pretty sure some of these (most?) are just helpers which don't need to be saved, // but better safe than sorry... - save_pointer(NAME(m_sprite_renderline.get()), 1024); - save_pointer(NAME(m_highpri_renderline.get()), 320); - save_pointer(NAME(m_video_renderline.get()), 320/4); - save_pointer(NAME(m_palette_lookup.get()), 0x40); - save_pointer(NAME(m_palette_lookup_sprite.get()), 0x40); - save_pointer(NAME(m_palette_lookup_shadow.get()), 0x40); - save_pointer(NAME(m_palette_lookup_highlight.get()), 0x40); - save_pointer(NAME(m_render_line_raw.get()), 320/2); + save_pointer(NAME(m_sprite_renderline), 1024); + save_pointer(NAME(m_highpri_renderline), 320); + save_pointer(NAME(m_video_renderline), 320/4); + save_pointer(NAME(m_palette_lookup), 0x40); + save_pointer(NAME(m_palette_lookup_sprite), 0x40); + save_pointer(NAME(m_palette_lookup_shadow), 0x40); + save_pointer(NAME(m_palette_lookup_highlight), 0x40); + save_pointer(NAME(m_render_line_raw), 320/2); if (m_use_alt_timing) - save_pointer(NAME(m_render_line.get()), 320/2); + save_pointer(NAME(m_render_line), 320/2); m_irq6_on_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(sega315_5313_device::irq6_on_timer_callback), this)); m_irq4_on_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(sega315_5313_device::irq4_on_timer_callback), this)); diff --git a/src/devices/video/bt45x.cpp b/src/devices/video/bt45x.cpp index 81723eeda99..f1176ee5f77 100644 --- a/src/devices/video/bt45x.cpp +++ b/src/devices/video/bt45x.cpp @@ -146,7 +146,7 @@ void bt45x_rgb_device_base::device_start() m_color_ram = std::make_unique[]>(m_palette_colors + m_overlay_colors); - //save_pointer(NAME(m_color_ram.get()), m_palette_colors + m_overlay_colors); + //save_pointer(NAME(m_color_ram), m_palette_colors + m_overlay_colors); } void bt45x_mono_device_base::device_start() @@ -155,7 +155,7 @@ void bt45x_mono_device_base::device_start() m_color_ram = std::make_unique(m_palette_colors + m_overlay_colors); - save_pointer(NAME(m_color_ram.get()), m_palette_colors + m_overlay_colors); + save_pointer(NAME(m_color_ram), m_palette_colors + m_overlay_colors); } void bt45x_device_base::device_reset() diff --git a/src/devices/video/epic12.cpp b/src/devices/video/epic12.cpp index 71fbe5b80a6..9d3d4de0ae3 100644 --- a/src/devices/video/epic12.cpp +++ b/src/devices/video/epic12.cpp @@ -61,7 +61,7 @@ void epic12_device::device_start() save_item(NAME(m_gfx_scroll_0_y_shadowcopy)); save_item(NAME(m_gfx_scroll_1_x_shadowcopy)); save_item(NAME(m_gfx_scroll_1_y_shadowcopy)); - save_pointer(NAME(m_ram16_copy.get()), m_main_ramsize/2); + save_pointer(NAME(m_ram16_copy), m_main_ramsize/2); save_item(NAME(*m_bitmaps)); } diff --git a/src/devices/video/gb_lcd.cpp b/src/devices/video/gb_lcd.cpp index 68aff2d35ec..019ba778144 100644 --- a/src/devices/video/gb_lcd.cpp +++ b/src/devices/video/gb_lcd.cpp @@ -369,8 +369,8 @@ void dmg_ppu_device::common_start() m_program_space = &m_lr35902->space(AS_PROGRAM); - save_pointer(NAME(m_oam.get()), m_oam_size); - save_pointer(NAME(m_vram.get()), m_vram_size); + save_pointer(NAME(m_oam), m_oam_size); + save_pointer(NAME(m_vram), m_vram_size); save_item(NAME(m_window_lines_drawn)); save_item(NAME(m_vid_regs)); save_item(NAME(m_bg_zbuf)); @@ -515,7 +515,7 @@ void sgb_ppu_device::device_start() common_start(); m_sgb_tile_data = make_unique_clear(0x2000); - save_pointer(NAME(m_sgb_tile_data.get()), 0x2000); + save_pointer(NAME(m_sgb_tile_data), 0x2000); memset(m_sgb_tile_map, 0, sizeof(m_sgb_tile_map)); diff --git a/src/devices/video/gba_lcd.cpp b/src/devices/video/gba_lcd.cpp index 0829d70a044..f72bef022f5 100644 --- a/src/devices/video/gba_lcd.cpp +++ b/src/devices/video/gba_lcd.cpp @@ -1772,9 +1772,9 @@ void gba_lcd_device::device_start() save_item(NAME(m_regs)); - save_pointer(NAME(m_pram.get()), 0x400 / 4); - save_pointer(NAME(m_vram.get()), 0x18000 / 4); - save_pointer(NAME(m_oam.get()), 0x400 / 4); + save_pointer(NAME(m_pram), 0x400 / 4); + save_pointer(NAME(m_vram), 0x18000 / 4); + save_pointer(NAME(m_oam), 0x400 / 4); save_item(NAME(m_bg2x.status)); save_item(NAME(m_bg2x.update)); diff --git a/src/devices/video/gf4500.cpp b/src/devices/video/gf4500.cpp index 4f48a14b9ef..b03fa40d3fc 100644 --- a/src/devices/video/gf4500.cpp +++ b/src/devices/video/gf4500.cpp @@ -48,7 +48,7 @@ void gf4500_device::device_start() { m_data = make_unique_clear(0x140000/4); - save_pointer(NAME(m_data.get()), 0x140000/4); + save_pointer(NAME(m_data), 0x140000/4); save_item(NAME(m_screen_x)); save_item(NAME(m_screen_y)); save_item(NAME(m_screen_x_max)); diff --git a/src/devices/video/huc6270.cpp b/src/devices/video/huc6270.cpp index 38c379d1a80..0c6fa5b2fc1 100644 --- a/src/devices/video/huc6270.cpp +++ b/src/devices/video/huc6270.cpp @@ -842,7 +842,7 @@ void huc6270_device::device_start() m_vram = make_unique_clear(m_vram_size/sizeof(uint16_t)); m_vram_mask = (m_vram_size >> 1) - 1; - save_pointer(NAME(m_vram.get()), m_vram_size/sizeof(uint16_t)); + save_pointer(NAME(m_vram), m_vram_size/sizeof(uint16_t)); save_item(NAME(m_register_index)); save_item(NAME(m_mawr)); diff --git a/src/devices/video/mb_vcu.cpp b/src/devices/video/mb_vcu.cpp index d0c385f94dd..8d0f921be12 100644 --- a/src/devices/video/mb_vcu.cpp +++ b/src/devices/video/mb_vcu.cpp @@ -186,8 +186,8 @@ void mb_vcu_device::device_start() } save_item(NAME(m_status)); - save_pointer(NAME(m_ram.get()), 0x800); - save_pointer(NAME(m_palram.get()), 0x100); + save_pointer(NAME(m_ram), 0x800); + save_pointer(NAME(m_palram), 0x100); save_item(NAME(m_param_offset_latch)); save_item(NAME(m_xpos)); save_item(NAME(m_ypos)); diff --git a/src/devices/video/ppu2c0x.cpp b/src/devices/video/ppu2c0x.cpp index 579805ee447..341271ed6bf 100644 --- a/src/devices/video/ppu2c0x.cpp +++ b/src/devices/video/ppu2c0x.cpp @@ -270,9 +270,9 @@ void ppu2c0x_device::device_start() save_item(NAME(m_palette_ram)); save_item(NAME(m_draw_phase)); save_item(NAME(m_tilecount)); - save_pointer(NAME(m_spriteram.get()), SPRITERAM_SIZE); - save_pointer(NAME(m_colortable.get()), ARRAY_LENGTH(default_colortable)); - save_pointer(NAME(m_colortable_mono.get()), ARRAY_LENGTH(default_colortable_mono)); + save_pointer(NAME(m_spriteram), SPRITERAM_SIZE); + save_pointer(NAME(m_colortable), ARRAY_LENGTH(default_colortable)); + save_pointer(NAME(m_colortable_mono), ARRAY_LENGTH(default_colortable_mono)); save_item(NAME(*m_bitmap)); } diff --git a/src/devices/video/ppu2c0x_vt.cpp b/src/devices/video/ppu2c0x_vt.cpp index 1fab5cba1f3..ba268bc811c 100644 --- a/src/devices/video/ppu2c0x_vt.cpp +++ b/src/devices/video/ppu2c0x_vt.cpp @@ -154,7 +154,7 @@ void ppu_vt03_device::device_start() ppu2c0x_device::device_start(); m_newpal = std::make_unique(0x100); - save_pointer(&m_newpal[0], "m_newpal", 0x100); + save_pointer(NAME(m_newpal), 0x100); save_item(NAME(m_201x_regs)); } diff --git a/src/devices/video/psx.cpp b/src/devices/video/psx.cpp index 431ed9537c0..c10c7def37c 100644 --- a/src/devices/video/psx.cpp +++ b/src/devices/video/psx.cpp @@ -570,7 +570,7 @@ void psxgpu_device::psx_gpu_init( int n_gputype ) // icky!!! machine().save().save_memory( this, "globals", nullptr, 0, "m_packet", (uint8_t *)&m_packet, 1, sizeof( m_packet ) ); - save_pointer(NAME(p_vram.get()), width * height ); + save_pointer(NAME(p_vram), width * height ); save_item(NAME(n_gpu_buffer_offset)); save_item(NAME(n_vramx)); save_item(NAME(n_vramy)); diff --git a/src/devices/video/snes_ppu.cpp b/src/devices/video/snes_ppu.cpp index 76bc3d54cd3..f4c8c1000e6 100644 --- a/src/devices/video/snes_ppu.cpp +++ b/src/devices/video/snes_ppu.cpp @@ -360,9 +360,9 @@ void snes_ppu_device::device_start() save_item(NAME(m_regs)); - save_pointer(NAME(m_vram.get()), SNES_VRAM_SIZE); - save_pointer(NAME(m_cgram.get()), SNES_CGRAM_SIZE/2); - save_pointer(NAME(m_oam_ram.get()), SNES_OAM_SIZE/2); + save_pointer(NAME(m_vram), SNES_VRAM_SIZE); + save_pointer(NAME(m_cgram), SNES_CGRAM_SIZE/2); + save_pointer(NAME(m_oam_ram), SNES_OAM_SIZE/2); } void snes_ppu_device::device_reset() diff --git a/src/devices/video/stvvdp1.cpp b/src/devices/video/stvvdp1.cpp index 3bd956600f7..9cc412b3999 100644 --- a/src/devices/video/stvvdp1.cpp +++ b/src/devices/video/stvvdp1.cpp @@ -2217,8 +2217,8 @@ int saturn_state::stv_vdp1_start ( void ) m_vdp1.user_cliprect.set(0, 512, 0, 256); // save state - save_pointer(NAME(m_vdp1_regs.get()), 0x020/2); - save_pointer(NAME(m_vdp1_vram.get()), 0x100000/4); + save_pointer(NAME(m_vdp1_regs), 0x020/2); + save_pointer(NAME(m_vdp1_vram), 0x100000/4); save_item(NAME(m_vdp1.fbcr_accessed)); save_item(NAME(m_vdp1.framebuffer_current_display)); save_item(NAME(m_vdp1.framebuffer_current_draw)); diff --git a/src/devices/video/stvvdp2.cpp b/src/devices/video/stvvdp2.cpp index 14d9d05dd1c..cc1da5b39d3 100644 --- a/src/devices/video/stvvdp2.cpp +++ b/src/devices/video/stvvdp2.cpp @@ -6350,9 +6350,9 @@ int saturn_state::stv_vdp2_start ( void ) stv_rbg_cache_data.is_cache_dirty = 3; memset( &stv_vdp2_layer_data_placement, 0, sizeof(stv_vdp2_layer_data_placement)); - save_pointer(NAME(m_vdp2_regs.get()), 0x040000/2); - save_pointer(NAME(m_vdp2_vram.get()), 0x100000/4); - save_pointer(NAME(m_vdp2_cram.get()), 0x080000/4); + save_pointer(NAME(m_vdp2_regs), 0x040000/2); + save_pointer(NAME(m_vdp2_vram), 0x100000/4); + save_pointer(NAME(m_vdp2_cram), 0x080000/4); machine().save().register_postload(save_prepost_delegate(FUNC(saturn_state::stv_vdp2_state_save_postload), this)); return 0; diff --git a/src/devices/video/tlc34076.cpp b/src/devices/video/tlc34076.cpp index a5374b3f5a3..c33b302a3b8 100644 --- a/src/devices/video/tlc34076.cpp +++ b/src/devices/video/tlc34076.cpp @@ -57,7 +57,7 @@ void tlc34076_device::device_start() for (int i = 0; i < 3; i++) { m_local_paletteram[i] = std::make_unique(0x100); - save_pointer(NAME(m_local_paletteram[i].get()), 0x100, i); + save_pointer(NAME(m_local_paletteram[i]), 0x100, i); } save_item(NAME(m_regs)); diff --git a/src/devices/video/zeus2.cpp b/src/devices/video/zeus2.cpp index ceddd4bd567..971b676374a 100644 --- a/src/devices/video/zeus2.cpp +++ b/src/devices/video/zeus2.cpp @@ -117,8 +117,8 @@ void zeus2_device::device_start() save_item(NAME(zeus_quad_size)); save_item(NAME(m_useZOffset)); save_pointer(NAME(waveram), WAVERAM0_WIDTH * WAVERAM0_HEIGHT * 8 / 4); - save_pointer(NAME(m_frameColor.get()), WAVERAM1_WIDTH * WAVERAM1_HEIGHT * 2); - save_pointer(NAME(m_frameDepth.get()), WAVERAM1_WIDTH * WAVERAM1_HEIGHT * 2); + save_pointer(NAME(m_frameColor), WAVERAM1_WIDTH * WAVERAM1_HEIGHT * 2); + save_pointer(NAME(m_frameDepth), WAVERAM1_WIDTH * WAVERAM1_HEIGHT * 2); save_item(NAME(m_pal_table)); // m_ucode save_item(NAME(m_curUCodeSrc)); diff --git a/src/emu/device.h b/src/emu/device.h index 91e3ecca1d3..8b3b2c94574 100644 --- a/src/emu/device.h +++ b/src/emu/device.h @@ -571,9 +571,9 @@ public: // state saving interfaces template - void ATTR_COLD save_item(ItemType &value, const char *valname, int index = 0) { assert(m_save != nullptr); m_save->save_item(this, name(), tag(), index, value, valname); } + void ATTR_COLD save_item(ItemType &&value, const char *valname, int index = 0) { assert(m_save != nullptr); m_save->save_item(this, name(), tag(), index, std::forward(value), valname); } template - void ATTR_COLD save_pointer(ItemType *value, const char *valname, u32 count, int index = 0) { assert(m_save != nullptr); m_save->save_pointer(this, name(), tag(), index, value, valname, count); } + void ATTR_COLD save_pointer(ItemType &&value, const char *valname, u32 count, int index = 0) { assert(m_save != nullptr); m_save->save_pointer(this, name(), tag(), index, std::forward(value), valname, count); } // debugging device_debug *debug() const { return m_debug.get(); } diff --git a/src/emu/save.h b/src/emu/save.h index baf18258d09..4559d230b96 100644 --- a/src/emu/save.h +++ b/src/emu/save.h @@ -87,8 +87,8 @@ class rewinder; class save_manager { // type_checker is a set of templates to identify valid save types - template struct type_checker { static const bool is_atom = false; static const bool is_pointer = false; }; - template struct type_checker<_ItemType*> { static const bool is_atom = false; static const bool is_pointer = true; }; + template struct type_checker { static const bool is_atom = false; static const bool is_pointer = false; }; + template struct type_checker { static const bool is_atom = false; static const bool is_pointer = true; }; friend class ram_state; friend class rewinder; @@ -119,43 +119,51 @@ public: void save_memory(device_t *device, const char *module, const char *tag, u32 index, const char *name, void *val, u32 valsize, u32 valcount = 1); // templatized wrapper for general objects - template - void save_item(device_t *device, const char *module, const char *tag, int index, _ItemType &value, const char *valname) + template + void save_item(device_t *device, const char *module, const char *tag, int index, ItemType &value, const char *valname) { - if (type_checker<_ItemType>::is_pointer) throw emu_fatalerror("Called save_item on a pointer with no count!"); - if (!type_checker<_ItemType>::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); - save_memory(device, module, tag, index, valname, &value, sizeof(value)); + if (type_checker::is_pointer) throw emu_fatalerror("Called save_item on a pointer with no count!"); + if (!type_checker::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); + save_memory(device, module, tag, index, valname, &value, sizeof(ItemType)); } // templatized wrapper for 1-dimensional arrays - template - void save_item(device_t *device, const char *module, const char *tag, int index, _ItemType (&value)[N], const char *valname) + template + void save_item(device_t *device, const char *module, const char *tag, int index, ItemType (&value)[N], const char *valname) { - if (!type_checker<_ItemType>::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); - save_memory(device, module, tag, index, valname, &value[0], sizeof(value[0]), N); + if (!type_checker::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); + save_memory(device, module, tag, index, valname, &value[0], sizeof(ItemType), N); } // templatized wrapper for 2-dimensional arrays - template - void save_item(device_t *device, const char *module, const char *tag, int index, _ItemType (&value)[M][N], const char *valname) + template + void save_item(device_t *device, const char *module, const char *tag, int index, ItemType (&value)[M][N], const char *valname) { - if (!type_checker<_ItemType>::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); - save_memory(device, module, tag, index, valname, &value[0][0], sizeof(value[0][0]), M * N); + if (!type_checker::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); + save_memory(device, module, tag, index, valname, &value[0][0], sizeof(ItemType), M * N); } // templatized wrapper for pointers - template - void save_pointer(device_t *device, const char *module, const char *tag, int index, _ItemType *value, const char *valname, u32 count) + template + void save_pointer(device_t *device, const char *module, const char *tag, int index, ItemType *value, const char *valname, u32 count) { - if (!type_checker<_ItemType>::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); - save_memory(device, module, tag, index, valname, value, sizeof(*value), count); + if (!type_checker::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); + save_memory(device, module, tag, index, valname, value, sizeof(ItemType), count); + } + + // templatized wrapper for std::unique_ptr + template + void save_pointer(device_t *device, const char *module, const char *tag, int index, std::unique_ptr &value, const char *valname, u32 count) + { + if (!type_checker::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); + save_memory(device, module, tag, index, valname, value.get(), sizeof(ItemType), count); } // global memory registration - template - void save_item(_ItemType &value, const char *valname, int index = 0) { save_item(nullptr, "global", nullptr, index, value, valname); } - template - void save_pointer(_ItemType *value, const char *valname, u32 count, int index = 0) { save_pointer(nullptr, "global", nullptr, index, value, valname, count); } + template + void save_item(ItemType &value, const char *valname, int index = 0) { save_item(nullptr, "global", nullptr, index, value, valname); } + template + void save_pointer(ItemType *value, const char *valname, u32 count, int index = 0) { save_pointer(nullptr, "global", nullptr, index, value, valname, count); } // file processing static save_error check_file(running_machine &machine, emu_file &file, const char *gamename, void (CLIB_DECL *errormsg)(const char *fmt, ...)); diff --git a/src/mame/audio/cclimber.cpp b/src/mame/audio/cclimber.cpp index b7e17987e71..f61d22e2d6c 100644 --- a/src/mame/audio/cclimber.cpp +++ b/src/mame/audio/cclimber.cpp @@ -16,7 +16,7 @@ SAMPLES_START_CB_MEMBER( cclimber_audio_device::sh_start ) if (m_samples_region) { m_sample_buf = std::make_unique(2 * m_samples_region.bytes()); - save_pointer(NAME(m_sample_buf.get()), 2 * m_samples_region.bytes()); + save_pointer(NAME(m_sample_buf), 2 * m_samples_region.bytes()); } } diff --git a/src/mame/audio/phoenix.cpp b/src/mame/audio/phoenix.cpp index f77a26717f7..b7788a218a3 100644 --- a/src/mame/audio/phoenix.cpp +++ b/src/mame/audio/phoenix.cpp @@ -101,7 +101,7 @@ void phoenix_sound_device::device_start() save_item(NAME(m_noise_state.polyoffs)); save_item(NAME(m_noise_state.lowpass_counter)); save_item(NAME(m_noise_state.lowpass_polybit)); - save_pointer(NAME(m_poly18.get()), (1ul << (18-5))); + save_pointer(NAME(m_poly18), (1ul << (18-5))); } int phoenix_sound_device::update_c24(int samplerate) diff --git a/src/mame/audio/pleiads.cpp b/src/mame/audio/pleiads.cpp index 50b9a0f57ee..4cc3f58b38a 100644 --- a/src/mame/audio/pleiads.cpp +++ b/src/mame/audio/pleiads.cpp @@ -684,7 +684,7 @@ void pleiads_sound_device::common_start() save_item(NAME(m_noise.counter)); save_item(NAME(m_noise.polyoffs)); save_item(NAME(m_noise.freq)); - save_pointer(NAME(m_poly18.get()), (1ul << (18-5))); + save_pointer(NAME(m_poly18), (1ul << (18-5))); } //------------------------------------------------- diff --git a/src/mame/audio/snes_snd.cpp b/src/mame/audio/snes_snd.cpp index 04a51c592e8..0365c65d608 100644 --- a/src/mame/audio/snes_snd.cpp +++ b/src/mame/audio/snes_snd.cpp @@ -171,7 +171,7 @@ void snes_sound_device::device_start() m_tick_timer = timer_alloc(TIMER_TICK_ID); state_register(); - save_pointer(NAME(m_ram.get()), SNES_SPCRAM_SIZE); + save_pointer(NAME(m_ram), SNES_SPCRAM_SIZE); } //------------------------------------------------- diff --git a/src/mame/audio/taito_zm.cpp b/src/mame/audio/taito_zm.cpp index 2419cc05f3d..5813d5ec30b 100644 --- a/src/mame/audio/taito_zm.cpp +++ b/src/mame/audio/taito_zm.cpp @@ -59,7 +59,7 @@ void taito_zoom_device::device_start() // register for savestates save_item(NAME(m_reg_address)); save_item(NAME(m_tms_ctrl)); - save_pointer(NAME(m_snd_shared_ram.get()), 0x100); + save_pointer(NAME(m_snd_shared_ram), 0x100); } //------------------------------------------------- diff --git a/src/mame/drivers/20pacgal.cpp b/src/mame/drivers/20pacgal.cpp index 368cbd06099..802435b8be4 100644 --- a/src/mame/drivers/20pacgal.cpp +++ b/src/mame/drivers/20pacgal.cpp @@ -368,7 +368,7 @@ void _20pacgal_state::common_save_state() m_ram_48000 = make_unique_clear(0x2000); save_item(NAME(m_game_selected)); - save_pointer(NAME(m_ram_48000.get()), 0x2000); + save_pointer(NAME(m_ram_48000), 0x2000); save_item(NAME(m_irq_mask)); } diff --git a/src/mame/drivers/ampex.cpp b/src/mame/drivers/ampex.cpp index 19aabb9c571..a30a05a8449 100644 --- a/src/mame/drivers/ampex.cpp +++ b/src/mame/drivers/ampex.cpp @@ -202,7 +202,7 @@ void ampex_state::machine_start() save_item(NAME(m_attr)); save_item(NAME(m_attr_readback)); save_item(NAME(m_uart_loopback)); - save_pointer(NAME(m_paged_ram.get()), 0x1800 * 4); + save_pointer(NAME(m_paged_ram), 0x1800 * 4); } MACHINE_CONFIG_START(ampex_state::ampex) diff --git a/src/mame/drivers/amusco.cpp b/src/mame/drivers/amusco.cpp index 5c0640ca17f..f0fd89b7edf 100644 --- a/src/mame/drivers/amusco.cpp +++ b/src/mame/drivers/amusco.cpp @@ -195,7 +195,7 @@ void amusco_state::video_start() m_videoram = std::make_unique(videoram_size); std::fill_n(m_videoram.get(), videoram_size, 0); - save_pointer(NAME(m_videoram.get()), videoram_size); + save_pointer(NAME(m_videoram), videoram_size); } void amusco_state::machine_start() diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp index 38526f33537..f7a629bdd20 100644 --- a/src/mame/drivers/aristmk4.cpp +++ b/src/mame/drivers/aristmk4.cpp @@ -1722,7 +1722,7 @@ void aristmk4_state::init_aristmk4() void aristmk4_state::machine_start() { - save_pointer(NAME(m_nvram.get()), 0x1000); // m_nvram + save_pointer(NAME(m_nvram), 0x1000); // m_nvram m_credit_spend_meter.resolve(); m_credit_out_meter.resolve(); m_hopper_motor_out.resolve(); diff --git a/src/mame/drivers/astinvad.cpp b/src/mame/drivers/astinvad.cpp index d074b6fb240..c365d9ca08b 100644 --- a/src/mame/drivers/astinvad.cpp +++ b/src/mame/drivers/astinvad.cpp @@ -136,7 +136,7 @@ VIDEO_START_MEMBER(astinvad_state,spaceint) m_colorram = std::make_unique(m_videoram.bytes()); save_item(NAME(m_color_latch)); - save_pointer(NAME(m_colorram.get()), m_videoram.bytes()); + save_pointer(NAME(m_colorram), m_videoram.bytes()); } diff --git a/src/mame/drivers/astrof.cpp b/src/mame/drivers/astrof.cpp index 6d5e0c52024..c6f3f85802b 100644 --- a/src/mame/drivers/astrof.cpp +++ b/src/mame/drivers/astrof.cpp @@ -171,7 +171,7 @@ void astrof_state::video_start() { /* allocate the color RAM -- half the size of the video RAM as A0 is not connected */ m_colorram = std::make_unique(m_videoram.bytes() / 2); - save_pointer(NAME(m_colorram.get()), m_videoram.bytes() / 2); + save_pointer(NAME(m_colorram), m_videoram.bytes() / 2); } diff --git a/src/mame/drivers/backfire.cpp b/src/mame/drivers/backfire.cpp index ec4e7b3dd35..73bea29b348 100644 --- a/src/mame/drivers/backfire.cpp +++ b/src/mame/drivers/backfire.cpp @@ -128,8 +128,8 @@ void backfire_state::video_start() m_left = std::make_unique(80*8, 32*8); m_right = std::make_unique(80*8, 32*8); - save_pointer(NAME(m_spriteram_1.get()), 0x2000/2); - save_pointer(NAME(m_spriteram_2.get()), 0x2000/2); + save_pointer(NAME(m_spriteram_1), 0x2000/2); + save_pointer(NAME(m_spriteram_2), 0x2000/2); save_item(NAME(*m_left)); save_item(NAME(*m_right)); diff --git a/src/mame/drivers/bfcobra.cpp b/src/mame/drivers/bfcobra.cpp index 7ceaf5e0a22..0215b85ce1c 100644 --- a/src/mame/drivers/bfcobra.cpp +++ b/src/mame/drivers/bfcobra.cpp @@ -1621,8 +1621,8 @@ void bfcobra_state::init_bfcobra() save_item(NAME(m_z80_int)); save_item(NAME(m_z80_inten)); save_item(NAME(m_bank_data)); - save_pointer(NAME(m_work_ram.get()), 0xc0000); - save_pointer(NAME(m_video_ram.get()), 0x20000); + save_pointer(NAME(m_work_ram), 0xc0000); + save_pointer(NAME(m_video_ram), 0x20000); } /* TODO */ diff --git a/src/mame/drivers/cc40.cpp b/src/mame/drivers/cc40.cpp index d6bffdb6b5a..68e8d95451b 100644 --- a/src/mame/drivers/cc40.cpp +++ b/src/mame/drivers/cc40.cpp @@ -527,7 +527,7 @@ void cc40_state::init_sysram(int chip, u16 size) { // init to largest possible m_sysram[chip] = std::make_unique(0x2000); - save_pointer(NAME(m_sysram[chip].get()), 0x2000, chip); + save_pointer(NAME(m_sysram[chip]), 0x2000, chip); save_item(NAME(m_sysram_size[chip]), chip); save_item(NAME(m_sysram_end[chip]), chip); diff --git a/src/mame/drivers/cocoloco.cpp b/src/mame/drivers/cocoloco.cpp index e2a960167a2..eb1f1d53d47 100644 --- a/src/mame/drivers/cocoloco.cpp +++ b/src/mame/drivers/cocoloco.cpp @@ -304,7 +304,7 @@ void cocoloco_state::video_start() { m_videoram = std::make_unique(0x2000 * 8); - save_pointer(NAME(m_videoram.get()), 0x2000 * 8); + save_pointer(NAME(m_videoram), 0x2000 * 8); save_item(NAME(m_videobank)); } diff --git a/src/mame/drivers/coolridr.cpp b/src/mame/drivers/coolridr.cpp index a154666ebf9..013cd3e77e6 100644 --- a/src/mame/drivers/coolridr.cpp +++ b/src/mame/drivers/coolridr.cpp @@ -3227,9 +3227,9 @@ void coolridr_state::machine_start() decode[1].current_object = 0; debug_randompal = 9; - save_pointer(NAME(m_h1_vram.get()), VRAM_SIZE); - save_pointer(NAME(m_h1_pcg.get()), VRAM_SIZE); - save_pointer(NAME(m_h1_pal.get()), VRAM_SIZE); + save_pointer(NAME(m_h1_vram), VRAM_SIZE); + save_pointer(NAME(m_h1_pcg), VRAM_SIZE); + save_pointer(NAME(m_h1_pal), VRAM_SIZE); } void coolridr_state::machine_reset() diff --git a/src/mame/drivers/cps2.cpp b/src/mame/drivers/cps2.cpp index 548debedf02..ad887e5fce1 100644 --- a/src/mame/drivers/cps2.cpp +++ b/src/mame/drivers/cps2.cpp @@ -9931,7 +9931,7 @@ void cps2_state::init_gigaman2() init_cps2nc(); m_gigaman2_dummyqsound_ram = std::make_unique(0x20000 / 2); - save_pointer(NAME(m_gigaman2_dummyqsound_ram.get()), 0x20000 / 2); + save_pointer(NAME(m_gigaman2_dummyqsound_ram), 0x20000 / 2); space.install_readwrite_handler(0x618000, 0x619fff, read16_delegate(FUNC(cps2_state::gigaman2_dummyqsound_r),this), write16_delegate(FUNC(cps2_state::gigaman2_dummyqsound_w), this)); // no qsound.. diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp index d088e45a3c3..5f5ece2d0b9 100644 --- a/src/mame/drivers/cps3.cpp +++ b/src/mame/drivers/cps3.cpp @@ -900,11 +900,11 @@ void cps3_state::video_start() { m_ss_ram = std::make_unique(0x10000/4); memset(m_ss_ram.get(), 0x00, 0x10000); - save_pointer(NAME(m_ss_ram.get()), 0x10000/4); + save_pointer(NAME(m_ss_ram), 0x10000/4); m_char_ram = std::make_unique(0x800000/4); memset(m_char_ram.get(), 0x00, 0x800000); - save_pointer(NAME(m_char_ram.get()), 0x800000 /4); + save_pointer(NAME(m_char_ram), 0x800000 /4); /* create the char set (gfx will then be updated dynamically from RAM) */ m_gfxdecode->set_gfx(0, std::make_unique(m_palette, cps3_tiles8x8_layout, (uint8_t *)m_ss_ram.get(), 0, m_palette->entries() / 16, 0)); diff --git a/src/mame/drivers/dblcrown.cpp b/src/mame/drivers/dblcrown.cpp index 091397b5d83..4c1f547f54f 100644 --- a/src/mame/drivers/dblcrown.cpp +++ b/src/mame/drivers/dblcrown.cpp @@ -127,7 +127,7 @@ void dblcrown_state::video_start() m_pal_ram = std::make_unique(0x200 * 2); m_vram = std::make_unique(0x1000 * 0x10); - save_pointer(NAME(m_vram.get()), 0x1000 * 0x10); + save_pointer(NAME(m_vram), 0x1000 * 0x10); } uint32_t dblcrown_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp index d12325cf3d5..3667bc3c2ac 100644 --- a/src/mame/drivers/ddenlovr.cpp +++ b/src/mame/drivers/ddenlovr.cpp @@ -624,14 +624,14 @@ VIDEO_START_MEMBER(ddenlovr_state,ddenlovr) save_item(NAME(m_ddenlovr_blit_pen_mask)); save_item(NAME(m_ddenlovr_blit_regs)); - save_pointer(NAME(m_ddenlovr_pixmap[0].get()), 512 * 512); - save_pointer(NAME(m_ddenlovr_pixmap[1].get()), 512 * 512); - save_pointer(NAME(m_ddenlovr_pixmap[2].get()), 512 * 512); - save_pointer(NAME(m_ddenlovr_pixmap[3].get()), 512 * 512); - save_pointer(NAME(m_ddenlovr_pixmap[4].get()), 512 * 512); - save_pointer(NAME(m_ddenlovr_pixmap[5].get()), 512 * 512); - save_pointer(NAME(m_ddenlovr_pixmap[6].get()), 512 * 512); - save_pointer(NAME(m_ddenlovr_pixmap[7].get()), 512 * 512); + save_pointer(NAME(m_ddenlovr_pixmap[0]), 512 * 512); + save_pointer(NAME(m_ddenlovr_pixmap[1]), 512 * 512); + save_pointer(NAME(m_ddenlovr_pixmap[2]), 512 * 512); + save_pointer(NAME(m_ddenlovr_pixmap[3]), 512 * 512); + save_pointer(NAME(m_ddenlovr_pixmap[4]), 512 * 512); + save_pointer(NAME(m_ddenlovr_pixmap[5]), 512 * 512); + save_pointer(NAME(m_ddenlovr_pixmap[6]), 512 * 512); + save_pointer(NAME(m_ddenlovr_pixmap[7]), 512 * 512); } VIDEO_START_MEMBER(ddenlovr_state,mmpanic) diff --git a/src/mame/drivers/deco156.cpp b/src/mame/drivers/deco156.cpp index a9b7ac8ca32..878c21d1285 100644 --- a/src/mame/drivers/deco156.cpp +++ b/src/mame/drivers/deco156.cpp @@ -87,7 +87,7 @@ void deco156_state::video_start() /* and register the allocated ram so that save states still work */ save_item(NAME(m_pf1_rowscroll)); save_item(NAME(m_pf2_rowscroll)); - save_pointer(NAME(m_spriteram.get()), 0x2000/2); + save_pointer(NAME(m_spriteram), 0x2000/2); } diff --git a/src/mame/drivers/dgpix.cpp b/src/mame/drivers/dgpix.cpp index 513a17dd9e0..dbd18df8213 100644 --- a/src/mame/drivers/dgpix.cpp +++ b/src/mame/drivers/dgpix.cpp @@ -385,7 +385,7 @@ void dgpix_state::video_start() { m_vram = std::make_unique(0x40000*2/4); - save_pointer(NAME(m_vram.get()), 0x40000*2/4); + save_pointer(NAME(m_vram), 0x40000*2/4); } uint32_t dgpix_state::screen_update_dgpix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp index bb3e4eddf96..148e828b8c5 100644 --- a/src/mame/drivers/dooyong.cpp +++ b/src/mame/drivers/dooyong.cpp @@ -207,7 +207,7 @@ protected: DECLARE_VIDEO_START(flytiger) { m_paletteram_flytiger = make_unique_clear(0x1000); - save_pointer(NAME(m_paletteram_flytiger.get()), 0x1000); + save_pointer(NAME(m_paletteram_flytiger), 0x1000); m_palette_bank = 0; @@ -279,7 +279,7 @@ protected: DECLARE_VIDEO_START(pollux) { m_paletteram_flytiger = make_unique_clear(0x1000); - save_pointer(NAME(m_paletteram_flytiger.get()), 0x1000); + save_pointer(NAME(m_paletteram_flytiger), 0x1000); m_palette_bank = 0; diff --git a/src/mame/drivers/dreamwld.cpp b/src/mame/drivers/dreamwld.cpp index 5fded03d121..c9d1689802f 100644 --- a/src/mame/drivers/dreamwld.cpp +++ b/src/mame/drivers/dreamwld.cpp @@ -284,9 +284,9 @@ void dreamwld_state::video_start() m_spritebuf[1] = std::make_unique(0x2000 / 4); m_lineram16 = make_unique_clear(0x400 / 2); - save_pointer(NAME(m_spritebuf[0].get()), 0x2000 / 4, 0); - save_pointer(NAME(m_spritebuf[1].get()), 0x2000 / 4, 1); - save_pointer(NAME(m_lineram16.get()), 0x400/2); + save_pointer(NAME(m_spritebuf[0]), 0x2000 / 4, 0); + save_pointer(NAME(m_spritebuf[1]), 0x2000 / 4, 1); + save_pointer(NAME(m_lineram16), 0x400/2); } diff --git a/src/mame/drivers/esripsys.cpp b/src/mame/drivers/esripsys.cpp index 407b76969f9..a5ebe4c3ac6 100644 --- a/src/mame/drivers/esripsys.cpp +++ b/src/mame/drivers/esripsys.cpp @@ -635,9 +635,9 @@ void esripsys_state::init_esripsys() membank("bank4")->set_base(&rom[0x8000]); /* Register stuff for state saving */ - save_pointer(NAME(m_fdt_a.get()), FDT_RAM_SIZE); - save_pointer(NAME(m_fdt_b.get()), FDT_RAM_SIZE); - save_pointer(NAME(m_cmos_ram.get()), CMOS_RAM_SIZE); + save_pointer(NAME(m_fdt_a), FDT_RAM_SIZE); + save_pointer(NAME(m_fdt_b), FDT_RAM_SIZE); + save_pointer(NAME(m_cmos_ram), CMOS_RAM_SIZE); save_item(NAME(m_g_iodata)); save_item(NAME(m_g_ioaddr)); diff --git a/src/mame/drivers/fromanc2.cpp b/src/mame/drivers/fromanc2.cpp index 2ca182bca15..4a8c9e32343 100644 --- a/src/mame/drivers/fromanc2.cpp +++ b/src/mame/drivers/fromanc2.cpp @@ -490,7 +490,7 @@ MACHINE_START_MEMBER(fromanc2_state,fromanc2) save_item(NAME(m_subcpu_int_flag)); save_item(NAME(m_subcpu_nmi_flag)); - save_pointer(NAME(m_bankedram.get()), 0x4000 * 3); + save_pointer(NAME(m_bankedram), 0x4000 * 3); } void fromanc2_state::machine_reset() diff --git a/src/mame/drivers/galpani3.cpp b/src/mame/drivers/galpani3.cpp index 4d49ef158f9..eb7057827fb 100644 --- a/src/mame/drivers/galpani3.cpp +++ b/src/mame/drivers/galpani3.cpp @@ -157,8 +157,8 @@ void galpani3_state::video_start() save_item(NAME(m_priority_buffer_scrollx)); save_item(NAME(m_priority_buffer_scrolly)); - save_pointer(NAME(m_spriteram32.get()), 0x4000/4); - save_pointer(NAME(m_spc_regs.get()), 0x40/4); + save_pointer(NAME(m_spriteram32), 0x4000/4); + save_pointer(NAME(m_spc_regs), 0x40/4); } #define SPRITE_DRAW_PIXEL(_pri) \ diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp index b9ec037e753..6cc219e056c 100644 --- a/src/mame/drivers/gottlieb.cpp +++ b/src/mame/drivers/gottlieb.cpp @@ -249,7 +249,7 @@ void gottlieb_state::machine_start() save_item(NAME(m_laserdisc_status)); save_item(NAME(m_laserdisc_philips_code)); - save_pointer(NAME(m_laserdisc_audio_buffer.get()), AUDIORAM_SIZE); + save_pointer(NAME(m_laserdisc_audio_buffer), AUDIORAM_SIZE); save_item(NAME(m_laserdisc_audio_address)); save_item(NAME(m_laserdisc_last_samples)); save_item(NAME(m_laserdisc_last_time)); diff --git a/src/mame/drivers/gunpey.cpp b/src/mame/drivers/gunpey.cpp index 9bdf8e250be..0a9c36ff275 100644 --- a/src/mame/drivers/gunpey.cpp +++ b/src/mame/drivers/gunpey.cpp @@ -290,7 +290,7 @@ void gunpey_state::video_start() m_vram = std::make_unique(0x400000); std::fill_n(&m_vram[0], 0x400000, 0xff); m_blitter_end_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gunpey_state::blitter_end), this)); - save_pointer(NAME(m_vram.get()), 0x400000); + save_pointer(NAME(m_vram), 0x400000); } uint8_t gunpey_state::draw_gfx(bitmap_ind16 &bitmap,const rectangle &cliprect,int count,uint8_t scene_gradient) diff --git a/src/mame/drivers/harriet.cpp b/src/mame/drivers/harriet.cpp index 4e2b1abec85..02f2abd3a71 100644 --- a/src/mame/drivers/harriet.cpp +++ b/src/mame/drivers/harriet.cpp @@ -72,7 +72,7 @@ void harriet_state::machine_start() { m_zpram_data = std::make_unique(0x800); subdevice("zpram")->set_base(m_zpram_data.get(), 0x800); - save_pointer(NAME(m_zpram_data.get()), 0x800); + save_pointer(NAME(m_zpram_data), 0x800); } void harriet_state::machine_reset() diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp index 654e7bafb46..e734b1fa901 100644 --- a/src/mame/drivers/hornet.cpp +++ b/src/mame/drivers/hornet.cpp @@ -1022,7 +1022,7 @@ void hornet_state::machine_start() save_item(NAME(m_led_reg0)); save_item(NAME(m_led_reg1)); - save_pointer(NAME(m_jvs_sdata.get()), 1024); + save_pointer(NAME(m_jvs_sdata), 1024); save_item(NAME(m_jvs_sdata_ptr)); m_sound_irq_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(hornet_state::sound_irq), this)); diff --git a/src/mame/drivers/igs011.cpp b/src/mame/drivers/igs011.cpp index 4a382113070..4b36416def4 100644 --- a/src/mame/drivers/igs011.cpp +++ b/src/mame/drivers/igs011.cpp @@ -324,7 +324,7 @@ void igs011_state::video_start() for (int i = 0; i < 8; i++) { m_layer[i] = std::make_unique(512 * 256); - save_pointer(NAME(m_layer[i].get()), 512 * 256, i); + save_pointer(NAME(m_layer[i]), 512 * 256, i); } m_lhb2_pen_hi = 0; diff --git a/src/mame/drivers/jchan.cpp b/src/mame/drivers/jchan.cpp index ae3b659e137..becc0b404d7 100644 --- a/src/mame/drivers/jchan.cpp +++ b/src/mame/drivers/jchan.cpp @@ -273,10 +273,10 @@ void jchan_state::video_start() m_spritegen[1]->skns_sprite_kludge(0,0); save_item(NAME(m_irq_sub_enable)); - save_pointer(NAME(m_sprite_ram32[0].get()), 0x4000/4); - save_pointer(NAME(m_sprite_ram32[1].get()), 0x4000/4); - save_pointer(NAME(m_sprite_regs32[0].get()), 0x40/4); - save_pointer(NAME(m_sprite_regs32[1].get()), 0x40/4); + save_pointer(NAME(m_sprite_ram32[0]), 0x4000/4); + save_pointer(NAME(m_sprite_ram32[1]), 0x4000/4); + save_pointer(NAME(m_sprite_regs32[0]), 0x40/4); + save_pointer(NAME(m_sprite_regs32[1]), 0x40/4); } diff --git a/src/mame/drivers/jtc.cpp b/src/mame/drivers/jtc.cpp index fb681ec4882..3b44b08f64d 100644 --- a/src/mame/drivers/jtc.cpp +++ b/src/mame/drivers/jtc.cpp @@ -652,9 +652,9 @@ void jtces40_state::video_start() /* register for state saving */ save_item(NAME(m_video_bank)); save_pointer(NAME(m_video_ram.target()), JTC_ES40_VIDEORAM_SIZE); - save_pointer(NAME(m_color_ram_r.get()), JTC_ES40_VIDEORAM_SIZE); - save_pointer(NAME(m_color_ram_g.get()), JTC_ES40_VIDEORAM_SIZE); - save_pointer(NAME(m_color_ram_b.get()), JTC_ES40_VIDEORAM_SIZE); + save_pointer(NAME(m_color_ram_r), JTC_ES40_VIDEORAM_SIZE); + save_pointer(NAME(m_color_ram_g), JTC_ES40_VIDEORAM_SIZE); + save_pointer(NAME(m_color_ram_b), JTC_ES40_VIDEORAM_SIZE); save_item(NAME(m_centronics_busy)); } diff --git a/src/mame/drivers/kdt6.cpp b/src/mame/drivers/kdt6.cpp index da9c4a8574b..33b90dd6c0d 100644 --- a/src/mame/drivers/kdt6.cpp +++ b/src/mame/drivers/kdt6.cpp @@ -583,8 +583,8 @@ void kdt6_state::machine_start() m_floppy1->get_device()->setup_led_cb(floppy_image_device::led_cb(&kdt6_state::drive1_led_cb, this)); // register for save states - save_pointer(NAME(m_ram.get()), 0x40000); - save_pointer(NAME(m_vram.get()), 0x10000); + save_pointer(NAME(m_ram), 0x40000); + save_pointer(NAME(m_vram), 0x10000); save_item(NAME(m_sasi_dma)); save_item(NAME(m_dma_map)); save_item(NAME(m_status0)); diff --git a/src/mame/drivers/m63.cpp b/src/mame/drivers/m63.cpp index 234c3f9a323..b8b278a1aca 100644 --- a/src/mame/drivers/m63.cpp +++ b/src/mame/drivers/m63.cpp @@ -712,7 +712,7 @@ SAMPLES_START_CB_MEMBER(m63_state::fghtbskt_sh_start) uint8_t *ROM = memregion("samples")->base(); m_samplebuf = std::make_unique(len); - save_pointer(NAME(m_samplebuf.get()), len); + save_pointer(NAME(m_samplebuf), len); for(i = 0; i < len; i++) m_samplebuf[i] = ((int8_t)(ROM[i] ^ 0x80)) * 256; diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp index 43e389ce46d..1f9613cf1c4 100644 --- a/src/mame/drivers/m72.cpp +++ b/src/mame/drivers/m72.cpp @@ -436,7 +436,7 @@ void m72_state::init_m72_8751() program.install_write_handler(0xb0000, 0xb0fff, write16_delegate(FUNC(m72_state::main_mcu_w),this)); membank("bank1")->configure_entry(0, m_protection_ram.get()); - save_pointer(NAME(m_protection_ram.get()), 0x10000/2); + save_pointer(NAME(m_protection_ram), 0x10000/2); save_item(NAME(m_mcu_sample_latch)); save_item(NAME(m_mcu_sample_addr)); save_item(NAME(m_mcu_snd_cmd_latch)); @@ -784,7 +784,7 @@ void m72_state::install_protection_handler(const uint8_t *code,const uint8_t *cr m_maincpu->space(AS_PROGRAM).install_write_handler(0xb0000, 0xb0fff, write16_delegate(FUNC(m72_state::protection_w),this)); membank("bank1")->configure_entry(0, m_protection_ram.get()); - save_pointer(NAME(m_protection_ram.get()), 0x1000/2); + save_pointer(NAME(m_protection_ram), 0x1000/2); } void m72_state::init_bchopper() diff --git a/src/mame/drivers/maygayv1.cpp b/src/mame/drivers/maygayv1.cpp index 1afcd41f612..33e88077d62 100644 --- a/src/mame/drivers/maygayv1.cpp +++ b/src/mame/drivers/maygayv1.cpp @@ -865,7 +865,7 @@ void maygayv1_state::machine_start() i82716.dram = std::make_unique(0x80000/2); // ??? i82716.line_buf = std::make_unique(512); - save_pointer(NAME(i82716.dram.get()), 0x40000); + save_pointer(NAME(i82716.dram), 0x40000); } void maygayv1_state::machine_reset() diff --git a/src/mame/drivers/mc1000.cpp b/src/mame/drivers/mc1000.cpp index 5ca29a1a040..f63ccddbdb6 100644 --- a/src/mame/drivers/mc1000.cpp +++ b/src/mame/drivers/mc1000.cpp @@ -474,7 +474,7 @@ void mc1000_state::machine_start() bankswitch(); /* register for state saving */ - save_pointer(NAME(m_banked_ram.get()), 0xc000); + save_pointer(NAME(m_banked_ram), 0xc000); save_item(NAME(m_rom0000)); save_item(NAME(m_mc6845_bank)); save_item(NAME(m_mc6847_bank)); diff --git a/src/mame/drivers/merit.cpp b/src/mame/drivers/merit.cpp index f3aab85ca2c..4b8c22f01b6 100644 --- a/src/mame/drivers/merit.cpp +++ b/src/mame/drivers/merit.cpp @@ -173,7 +173,7 @@ void merit_state::machine_start() m_question_address = 0; m_ram_palette = std::make_unique(RAM_PALETTE_SIZE); - save_pointer(NAME(m_ram_palette.get()), RAM_PALETTE_SIZE); + save_pointer(NAME(m_ram_palette), RAM_PALETTE_SIZE); save_item(NAME(m_lscnblk)); save_item(NAME(m_extra_video_bank_bit)); save_item(NAME(m_question_address)); diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp index 739e6ca8af9..05a6222e8da 100644 --- a/src/mame/drivers/meritm.cpp +++ b/src/mame/drivers/meritm.cpp @@ -1083,7 +1083,7 @@ MACHINE_START_MEMBER(meritm_state, crt260) MACHINE_START_CALL_MEMBER(common); save_item(NAME(m_bank)); save_item(NAME(m_psd_a15)); - save_pointer(NAME(m_ram.get()), 0x8000); + save_pointer(NAME(m_ram), 0x8000); } TIMER_DEVICE_CALLBACK_MEMBER(meritm_state::vblank_start_tick) diff --git a/src/mame/drivers/mlanding.cpp b/src/mame/drivers/mlanding.cpp index 2b6f07ac1c5..c5394f0d52a 100644 --- a/src/mame/drivers/mlanding.cpp +++ b/src/mame/drivers/mlanding.cpp @@ -192,7 +192,7 @@ void mlanding_state::machine_start() m_dma_bank->configure_entries(0, 2, m_dma_ram.get(), c_dma_bank_words * 2); // Register state for saving - save_pointer(NAME(m_dma_ram.get()), c_dma_bank_words * 2); + save_pointer(NAME(m_dma_ram), c_dma_bank_words * 2); save_item(NAME(m_dma_cpu_bank)); save_item(NAME(m_dma_busy)); save_item(NAME(m_dsp_hold_signal)); diff --git a/src/mame/drivers/monzagp.cpp b/src/mame/drivers/monzagp.cpp index 15329e6b238..5fbcc2e5d75 100644 --- a/src/mame/drivers/monzagp.cpp +++ b/src/mame/drivers/monzagp.cpp @@ -156,8 +156,8 @@ void monzagp_state::machine_start() m_mycar_pos = 0; m_collisions_ff = 0; m_collisions_clk = 0; - save_pointer(NAME(m_vram.get()), 0x800); - save_pointer(NAME(m_score_ram.get()), 0x100); + save_pointer(NAME(m_vram), 0x800); + save_pointer(NAME(m_score_ram), 0x100); m_nvram->set_base(m_score_ram.get(), 0x100); diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp index 63ad04bc1cb..5410880e641 100644 --- a/src/mame/drivers/mz2500.cpp +++ b/src/mame/drivers/mz2500.cpp @@ -1776,9 +1776,9 @@ void mz2500_state::machine_start() m_phone_rom = memregion("phone")->base(); m_iplpro_rom = memregion("iplpro")->base(); - save_pointer(NAME(m_main_ram.get()), 0x80000); - save_pointer(NAME(m_pcg_ram.get()), 0x2000); - save_pointer(NAME(m_emm_ram.get()), 0x100000); + save_pointer(NAME(m_main_ram), 0x80000); + save_pointer(NAME(m_pcg_ram), 0x2000); + save_pointer(NAME(m_emm_ram), 0x100000); /* TODO: gfx[4] crashes as per now */ m_gfxdecode->set_gfx(3, std::make_unique(m_palette, mz2500_pcg_layout_1bpp, m_pcg_ram.get(), 0, 0x10, 0)); diff --git a/src/mame/drivers/namcofl.cpp b/src/mame/drivers/namcofl.cpp index c3804e9cfaf..8f2349c5060 100644 --- a/src/mame/drivers/namcofl.cpp +++ b/src/mame/drivers/namcofl.cpp @@ -795,7 +795,7 @@ ROM_END void namcofl_state::common_init() { m_workram = std::make_unique(0x100000/4); - save_pointer(NAME(m_workram.get()), 0x100000/4), + save_pointer(NAME(m_workram), 0x100000/4), save_item(NAME(m_mcu_port6)); save_item(NAME(m_sprbank)); diff --git a/src/mame/drivers/neogeocd.cpp b/src/mame/drivers/neogeocd.cpp index cb1de917b6d..fc807da9b08 100644 --- a/src/mame/drivers/neogeocd.cpp +++ b/src/mame/drivers/neogeocd.cpp @@ -848,7 +848,7 @@ void ngcd_state::machine_start() // NeoCD doesn't have memcard slots, rather, it has a larger internal memory which works the same m_meminternal_data = make_unique_clear(0x2000); subdevice("saveram")->set_base(m_meminternal_data.get(), 0x2000); - save_pointer(NAME(m_meminternal_data.get()), 0x2000); + save_pointer(NAME(m_meminternal_data), 0x2000); m_tempcdc->reset_cd(); } diff --git a/src/mame/drivers/nes.cpp b/src/mame/drivers/nes.cpp index 14625188a34..d7f787efb32 100644 --- a/src/mame/drivers/nes.cpp +++ b/src/mame/drivers/nes.cpp @@ -201,7 +201,7 @@ MACHINE_START_MEMBER( nes_state, fds ) // register saves save_item(NAME(m_last_frame_flip)); - save_pointer(NAME(m_ciram.get()), 0x800); + save_pointer(NAME(m_ciram), 0x800); } MACHINE_RESET_MEMBER( nes_state, fds ) diff --git a/src/mame/drivers/nes_vt.cpp b/src/mame/drivers/nes_vt.cpp index fe6a7a5b000..9d727f07b61 100644 --- a/src/mame/drivers/nes_vt.cpp +++ b/src/mame/drivers/nes_vt.cpp @@ -692,10 +692,10 @@ void nes_vt_state::machine_start() save_item(NAME(m_timer_val)); m_ntram = std::make_unique(0x2000); - save_pointer(NAME(m_ntram.get()), 0x2000); + save_pointer(NAME(m_ntram), 0x2000); m_chrram = std::make_unique(0x2000); - save_pointer(NAME(m_chrram.get()), 0x2000); + save_pointer(NAME(m_chrram), 0x2000); m_ppu->set_scanline_callback(ppu2c0x_device::scanline_delegate(FUNC(nes_vt_state::scanline_irq),this)); m_ppu->set_hblank_callback(ppu2c0x_device::scanline_delegate(FUNC(nes_vt_state::hblank_irq),this)); diff --git a/src/mame/drivers/pasha2.cpp b/src/mame/drivers/pasha2.cpp index 87c5868a3cf..daad8a548ff 100644 --- a/src/mame/drivers/pasha2.cpp +++ b/src/mame/drivers/pasha2.cpp @@ -346,8 +346,8 @@ void pasha2_state::video_start() { m_bitmap0[i] = make_unique_clear(0x20000); m_bitmap1[i] = make_unique_clear(0x20000); - save_pointer(NAME(m_bitmap0[i].get()), 0x20000, i); - save_pointer(NAME(m_bitmap1[i].get()), 0x20000, i); + save_pointer(NAME(m_bitmap0[i]), 0x20000, i); + save_pointer(NAME(m_bitmap1[i]), 0x20000, i); } } diff --git a/src/mame/drivers/pc8801.cpp b/src/mame/drivers/pc8801.cpp index 25cf279b3c4..3e3995ac065 100644 --- a/src/mame/drivers/pc8801.cpp +++ b/src/mame/drivers/pc8801.cpp @@ -2424,10 +2424,10 @@ void pc8801_state::machine_start() m_kanji_rom = memregion("kanji")->base(); m_cg_rom = memregion("cgrom")->base(); - save_pointer(NAME(m_work_ram.get()), 0x10000); - save_pointer(NAME(m_hi_work_ram.get()), 0x1000); - save_pointer(NAME(m_ext_work_ram.get()), 0x8000*0x100); - save_pointer(NAME(m_gvram.get()), 0xc000); + save_pointer(NAME(m_work_ram), 0x10000); + save_pointer(NAME(m_hi_work_ram), 0x1000); + save_pointer(NAME(m_ext_work_ram), 0x8000*0x100); + save_pointer(NAME(m_gvram), 0xc000); } void pc8801_state::machine_reset() diff --git a/src/mame/drivers/pipeline.cpp b/src/mame/drivers/pipeline.cpp index 2bd4052a03d..aa422005c29 100644 --- a/src/mame/drivers/pipeline.cpp +++ b/src/mame/drivers/pipeline.cpp @@ -167,7 +167,7 @@ void pipeline_state::video_start() m_tilemap2->set_transparent_pen(0); save_item(NAME(m_vidctrl)); - save_pointer(NAME(m_palram.get()), 0x1000); + save_pointer(NAME(m_palram), 0x1000); } u32 pipeline_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/progolf.cpp b/src/mame/drivers/progolf.cpp index 7f2414a8c3f..52f3aa4fc35 100644 --- a/src/mame/drivers/progolf.cpp +++ b/src/mame/drivers/progolf.cpp @@ -126,7 +126,7 @@ void progolf_state::video_start() save_item(NAME(m_char_pen)); save_item(NAME(m_char_pen_vreg)); - save_pointer(NAME(m_fg_fb.get()), 0x2000*8); + save_pointer(NAME(m_fg_fb), 0x2000*8); save_item(NAME(m_scrollx_hi)); save_item(NAME(m_scrollx_lo)); save_item(NAME(m_gfx_switch)); diff --git a/src/mame/drivers/psion.cpp b/src/mame/drivers/psion.cpp index a5e54bdc46e..32ab1d2737f 100644 --- a/src/mame/drivers/psion.cpp +++ b/src/mame/drivers/psion.cpp @@ -504,7 +504,7 @@ void psion_state::machine_start() save_item(NAME(m_port2)); save_item(NAME(m_port6_ddr)); save_item(NAME(m_port6)); - save_pointer(NAME(m_paged_ram.get()), m_ram_bank_count * 0x4000); + save_pointer(NAME(m_paged_ram), m_ram_bank_count * 0x4000); } void psion_state::machine_reset() diff --git a/src/mame/drivers/quizo.cpp b/src/mame/drivers/quizo.cpp index f11604b9013..6ab56471666 100644 --- a/src/mame/drivers/quizo.cpp +++ b/src/mame/drivers/quizo.cpp @@ -279,7 +279,7 @@ void quizo_state::init_quizo() m_videoram=std::make_unique(0x4000*2); membank("bank1")->configure_entries(0, 6, memregion("user1")->base(), 0x4000); - save_pointer(NAME(m_videoram.get()), 0x4000*2); + save_pointer(NAME(m_videoram), 0x4000*2); //save_item(NAME(m_port60)); save_item(NAME(m_port70)); } diff --git a/src/mame/drivers/rabbit.cpp b/src/mame/drivers/rabbit.cpp index 6f5a02873a0..2f1a9b3ea1c 100644 --- a/src/mame/drivers/rabbit.cpp +++ b/src/mame/drivers/rabbit.cpp @@ -444,10 +444,10 @@ void rabbit_state::video_start() m_blit_done_timer = timer_alloc(TIMER_BLIT_DONE); - save_pointer(NAME(m_tilemap_ram[0].get()), 0x20000/4); - save_pointer(NAME(m_tilemap_ram[1].get()), 0x20000/4); - save_pointer(NAME(m_tilemap_ram[2].get()), 0x20000/4); - save_pointer(NAME(m_tilemap_ram[3].get()), 0x20000/4); + save_pointer(NAME(m_tilemap_ram[0]), 0x20000/4); + save_pointer(NAME(m_tilemap_ram[1]), 0x20000/4); + save_pointer(NAME(m_tilemap_ram[2]), 0x20000/4); + save_pointer(NAME(m_tilemap_ram[3]), 0x20000/4); } /* diff --git a/src/mame/drivers/raiden2.cpp b/src/mame/drivers/raiden2.cpp index 4b47914c972..c2b0071e51d 100644 --- a/src/mame/drivers/raiden2.cpp +++ b/src/mame/drivers/raiden2.cpp @@ -531,11 +531,11 @@ VIDEO_START_MEMBER(raiden2_state,raiden2) m_palette_data = make_unique_clear(0x1000/2); m_palette->basemem().set(m_palette_data.get(), 0x1000/2 * sizeof(uint16_t), 16, ENDIANNESS_LITTLE, 2); - save_pointer(NAME(m_back_data.get()), 0x800/2); - save_pointer(NAME(m_fore_data.get()), 0x800/2); - save_pointer(NAME(m_mid_data.get()), 0x800/2); - save_pointer(NAME(m_text_data.get()), 0x1000/2); - save_pointer(NAME(m_palette_data.get()), 0x1000/2); + save_pointer(NAME(m_back_data), 0x800/2); + save_pointer(NAME(m_fore_data), 0x800/2); + save_pointer(NAME(m_mid_data), 0x800/2); + save_pointer(NAME(m_text_data), 0x1000/2); + save_pointer(NAME(m_palette_data), 0x1000/2); text_layer = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(raiden2_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64,32 ); background_layer = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(raiden2_state::get_back_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,32 ); diff --git a/src/mame/drivers/roul.cpp b/src/mame/drivers/roul.cpp index ce47ca5cf15..c3ac6616a4d 100644 --- a/src/mame/drivers/roul.cpp +++ b/src/mame/drivers/roul.cpp @@ -248,7 +248,7 @@ void roul_state::video_start() m_videobuf = make_unique_clear(VIDEOBUF_SIZE); save_item(NAME(m_reg)); - save_pointer(NAME(m_videobuf.get()), VIDEOBUF_SIZE); + save_pointer(NAME(m_videobuf), VIDEOBUF_SIZE); save_item(NAME(m_lamp_old)); } diff --git a/src/mame/drivers/safarir.cpp b/src/mame/drivers/safarir.cpp index e2994aee3fe..80c047e4cfd 100644 --- a/src/mame/drivers/safarir.cpp +++ b/src/mame/drivers/safarir.cpp @@ -328,8 +328,8 @@ void safarir_state::machine_start() m_port_last2 = 0; /* setup for save states */ - save_pointer(NAME(m_ram_1.get()), m_ram.bytes()); - save_pointer(NAME(m_ram_2.get()), m_ram.bytes()); + save_pointer(NAME(m_ram_1), m_ram.bytes()); + save_pointer(NAME(m_ram_2), m_ram.bytes()); save_item(NAME(m_ram_bank)); save_item(NAME(m_port_last)); save_item(NAME(m_port_last2)); diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp index f34c0d71ecf..d1251985327 100644 --- a/src/mame/drivers/saturn.cpp +++ b/src/mame/drivers/saturn.cpp @@ -652,7 +652,7 @@ MACHINE_START_MEMBER(sat_console_state, saturn) } // save states -// save_pointer(NAME(m_scu_regs.get()), 0x100/4); +// save_pointer(NAME(m_scu_regs), 0x100/4); save_item(NAME(m_en_68k)); save_item(NAME(m_scsp_last_line)); save_item(NAME(m_vdp2.odd)); diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index 41ba1384311..dd81bc1c926 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -11903,7 +11903,7 @@ void seta_state::init_downtown() init_bank6502(); m_downtown_protection = make_unique_clear(0x200/2); - save_pointer(NAME(m_downtown_protection.get()),0x200/2); + save_pointer(NAME(m_downtown_protection),0x200/2); m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x200000, 0x2001ff, read16_delegate(FUNC(seta_state::downtown_protection_r),this), write16_delegate(FUNC(seta_state::downtown_protection_w),this)); } @@ -12013,8 +12013,8 @@ void seta_state::init_pairlove() { m_pairslove_protram = make_unique_clear(0x200/2); m_pairslove_protram_old = make_unique_clear(0x200/2); - save_pointer(NAME(m_pairslove_protram.get()), 0x200/2); - save_pointer(NAME(m_pairslove_protram_old.get()), 0x200/2); + save_pointer(NAME(m_pairslove_protram), 0x200/2); + save_pointer(NAME(m_pairslove_protram_old), 0x200/2); } void seta_state::init_wiggie() diff --git a/src/mame/drivers/sfbonus.cpp b/src/mame/drivers/sfbonus.cpp index 7b9abef4a61..2937453cc1d 100644 --- a/src/mame/drivers/sfbonus.cpp +++ b/src/mame/drivers/sfbonus.cpp @@ -5864,29 +5864,29 @@ void sfbonus_state::init_sfbonus_common() { m_tilemap_ram = std::make_unique(0x4000); memset(m_tilemap_ram.get(), 0xff, 0x4000); - save_pointer(NAME(m_tilemap_ram.get()), 0x4000); + save_pointer(NAME(m_tilemap_ram), 0x4000); m_reel_ram = std::make_unique(0x0800); memset(m_reel_ram.get(), 0xff ,0x0800); - save_pointer(NAME(m_reel_ram.get()), 0x0800); + save_pointer(NAME(m_reel_ram), 0x0800); m_reel2_ram = std::make_unique(0x0800); memset(m_reel2_ram.get(), 0xff, 0x0800); - save_pointer(NAME(m_reel2_ram.get()), 0x0800); + save_pointer(NAME(m_reel2_ram), 0x0800); m_reel3_ram = std::make_unique(0x0800); memset(m_reel3_ram.get(), 0xff, 0x0800); - save_pointer(NAME(m_reel3_ram.get()), 0x0800); + save_pointer(NAME(m_reel3_ram), 0x0800); m_reel4_ram = std::make_unique(0x0800); memset(m_reel4_ram.get(), 0xff, 0x0800); - save_pointer(NAME(m_reel4_ram.get()), 0x0800); + save_pointer(NAME(m_reel4_ram), 0x0800); m_videoram = std::make_unique(0x10000); memset(m_videoram.get(), 0xff, 0x10000); - save_pointer(NAME(m_videoram.get()), 0x10000); + save_pointer(NAME(m_videoram), 0x10000); } void sfbonus_state::sfbonus_bitswap( diff --git a/src/mame/drivers/slotcarn.cpp b/src/mame/drivers/slotcarn.cpp index 32d9c603615..5d8720a3031 100644 --- a/src/mame/drivers/slotcarn.cpp +++ b/src/mame/drivers/slotcarn.cpp @@ -534,7 +534,7 @@ GFXDECODE_END void slotcarn_state::machine_start() { m_ram_palette = std::make_unique(RAM_PALETTE_SIZE); - save_pointer(NAME(m_ram_palette.get()), RAM_PALETTE_SIZE); + save_pointer(NAME(m_ram_palette), RAM_PALETTE_SIZE); } /*********************************** diff --git a/src/mame/drivers/smc777.cpp b/src/mame/drivers/smc777.cpp index d4c43c9a3b9..d86c6e1b1ad 100644 --- a/src/mame/drivers/smc777.cpp +++ b/src/mame/drivers/smc777.cpp @@ -971,11 +971,11 @@ void smc777_state::machine_start() m_gvram = make_unique_clear(0x8000); m_pcg = make_unique_clear(0x800); - save_pointer(NAME(m_work_ram.get()), 0x10000); - save_pointer(NAME(m_vram.get()), 0x800); - save_pointer(NAME(m_attr.get()), 0x800); - save_pointer(NAME(m_gvram.get()), 0x8000); - save_pointer(NAME(m_pcg.get()), 0x800); + save_pointer(NAME(m_work_ram), 0x10000); + save_pointer(NAME(m_vram), 0x800); + save_pointer(NAME(m_attr), 0x800); + save_pointer(NAME(m_gvram), 0x8000); + save_pointer(NAME(m_pcg), 0x800); m_gfxdecode->set_gfx(0, std::make_unique(m_palette, smc777_charlayout, m_pcg.get(), 0, 8, 0)); } diff --git a/src/mame/drivers/srmp5.cpp b/src/mame/drivers/srmp5.cpp index 44df7621cd2..b5e42364fcc 100644 --- a/src/mame/drivers/srmp5.cpp +++ b/src/mame/drivers/srmp5.cpp @@ -256,10 +256,10 @@ void srmp5_state::machine_start() save_item(NAME(m_cmd2)); save_item(NAME(m_cmd_stat)); save_item(NAME(m_chrbank)); - save_pointer(NAME(m_tileram.get()), 0x100000/2); - save_pointer(NAME(m_sprram.get()), 0x80000/2); + save_pointer(NAME(m_tileram), 0x100000/2); + save_pointer(NAME(m_sprram), 0x80000/2); #ifdef DEBUG_CHAR - save_pointer(NAME(m_tileduty.get()), 0x2000); + save_pointer(NAME(m_tileduty), 0x2000); #endif save_item(NAME(m_vidregs)); } diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index cb044277fd7..5821fbfddff 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -1287,7 +1287,7 @@ MACHINE_START_MEMBER(stv_state, stv) m_scsp->set_ram_base(m_sound_ram); // save states -// save_pointer(NAME(m_scu_regs.get()), 0x100/4); +// save_pointer(NAME(m_scu_regs), 0x100/4); save_item(NAME(m_en_68k)); save_item(NAME(m_prev_gamebank_select)); save_item(NAME(m_port_sel)); diff --git a/src/mame/drivers/subsino.cpp b/src/mame/drivers/subsino.cpp index a22379aed57..b54f6ab1d91 100644 --- a/src/mame/drivers/subsino.cpp +++ b/src/mame/drivers/subsino.cpp @@ -3804,7 +3804,7 @@ void subsino_state::init_stbsub() m_reel_attr[reel] = std::make_unique(0x200); - save_pointer(NAME(m_reel_attr[reel].get()), 0x200, reel); + save_pointer(NAME(m_reel_attr[reel]), 0x200, reel); } } @@ -3820,7 +3820,7 @@ void subsino_state::init_stisub() m_reel_attr[reel] = std::make_unique(0x200); - save_pointer(NAME(m_reel_attr[reel].get()), 0x200, reel); + save_pointer(NAME(m_reel_attr[reel]), 0x200, reel); } } @@ -3840,7 +3840,7 @@ void subsino_state::init_tesorone() m_reel_attr[reel] = std::make_unique(0x200); - save_pointer(NAME(m_reel_attr[reel].get()), 0x200, reel); + save_pointer(NAME(m_reel_attr[reel]), 0x200, reel); } } @@ -3860,7 +3860,7 @@ void subsino_state::init_tesorone230() m_reel_attr[reel] = std::make_unique(0x200); - save_pointer(NAME(m_reel_attr[reel].get()), 0x200, reel); + save_pointer(NAME(m_reel_attr[reel]), 0x200, reel); } } @@ -3873,7 +3873,7 @@ void subsino_state::init_mtrainnv() m_reel_attr[reel] = std::make_unique(0x200); - save_pointer(NAME(m_reel_attr[reel].get()), 0x200, reel); + save_pointer(NAME(m_reel_attr[reel]), 0x200, reel); } } diff --git a/src/mame/drivers/suprgolf.cpp b/src/mame/drivers/suprgolf.cpp index 0fcda6f05ba..97f52d0dabd 100644 --- a/src/mame/drivers/suprgolf.cpp +++ b/src/mame/drivers/suprgolf.cpp @@ -123,10 +123,10 @@ void suprgolf_state::video_start() save_item(NAME(m_vreg_pen)); save_item(NAME(m_palette_switch)); save_item(NAME(m_bg_vreg_test)); - save_pointer(NAME(m_paletteram.get()), 0x1000); - save_pointer(NAME(m_bg_vram.get()), 0x2000*0x20); - save_pointer(NAME(m_bg_fb.get()), 0x2000*0x20); - save_pointer(NAME(m_fg_fb.get()), 0x2000*0x20); + save_pointer(NAME(m_paletteram), 0x1000); + save_pointer(NAME(m_bg_vram), 0x2000*0x20); + save_pointer(NAME(m_bg_fb), 0x2000*0x20); + save_pointer(NAME(m_fg_fb), 0x2000*0x20); } uint32_t suprgolf_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/tmmjprd.cpp b/src/mame/drivers/tmmjprd.cpp index 596f8da2567..2649958eff9 100644 --- a/src/mame/drivers/tmmjprd.cpp +++ b/src/mame/drivers/tmmjprd.cpp @@ -374,10 +374,10 @@ void tmmjprd_state::video_start() m_tilemap_ram[3] = make_unique_clear(0x8000); - save_pointer(NAME(m_tilemap_ram[0].get()), 0x8000); - save_pointer(NAME(m_tilemap_ram[1].get()), 0x8000); - save_pointer(NAME(m_tilemap_ram[2].get()), 0x8000); - save_pointer(NAME(m_tilemap_ram[3].get()), 0x8000); + save_pointer(NAME(m_tilemap_ram[0]), 0x8000); + save_pointer(NAME(m_tilemap_ram[1]), 0x8000); + save_pointer(NAME(m_tilemap_ram[2]), 0x8000); + save_pointer(NAME(m_tilemap_ram[3]), 0x8000); save_item(NAME(m_old_brt1)); save_item(NAME(m_old_brt2)); diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp index 945e0306045..0f66129a94d 100644 --- a/src/mame/drivers/ts803.cpp +++ b/src/mame/drivers/ts803.cpp @@ -374,8 +374,8 @@ Bit 2 = 0 alpha memory access (round off) void ts803_state::machine_start() { //save these 2 so we can examine them in the debugger - save_pointer(NAME(m_videoram.get()), 0x8000); - save_pointer(NAME(m_56kram.get()), 0xc000); + save_pointer(NAME(m_videoram), 0x8000); + save_pointer(NAME(m_56kram), 0xc000); } void ts803_state::machine_reset() diff --git a/src/mame/drivers/turrett.cpp b/src/mame/drivers/turrett.cpp index e419dfa3f3c..38d3e8d548d 100644 --- a/src/mame/drivers/turrett.cpp +++ b/src/mame/drivers/turrett.cpp @@ -42,8 +42,8 @@ void turrett_state::machine_start() m_video_ram[1] = std::make_unique(VRAM_BANK_WORDS); // Register our state for saving - save_pointer(NAME(m_video_ram[0].get()), VRAM_BANK_WORDS); - save_pointer(NAME(m_video_ram[1].get()), VRAM_BANK_WORDS); + save_pointer(NAME(m_video_ram[0]), VRAM_BANK_WORDS); + save_pointer(NAME(m_video_ram[1]), VRAM_BANK_WORDS); save_item(NAME(m_inputs_active)); save_item(NAME(m_last_pixel)); save_item(NAME(m_video_ctrl)); diff --git a/src/mame/drivers/tv912.cpp b/src/mame/drivers/tv912.cpp index e529798cc1d..5a482dd8909 100644 --- a/src/mame/drivers/tv912.cpp +++ b/src/mame/drivers/tv912.cpp @@ -338,7 +338,7 @@ void tv912_state::machine_start() save_item(NAME(m_lpt_select)); save_item(NAME(m_4hz_flasher)); save_item(NAME(m_keyboard_scan)); - save_pointer(NAME(m_dispram.get()), 0x1000); + save_pointer(NAME(m_dispram), 0x1000); } void tv912_state::machine_reset() diff --git a/src/mame/drivers/ultrsprt.cpp b/src/mame/drivers/ultrsprt.cpp index 4fe8401c9fb..d7b54ae27f4 100644 --- a/src/mame/drivers/ultrsprt.cpp +++ b/src/mame/drivers/ultrsprt.cpp @@ -220,7 +220,7 @@ void ultrsprt_state::machine_start() membank("vram")->configure_entries(0, VRAM_PAGES, m_vram.get(), VRAM_PAGE_BYTES); - save_pointer(NAME(m_vram.get()), VRAM_PAGE_BYTES * VRAM_PAGES); + save_pointer(NAME(m_vram), VRAM_PAGE_BYTES * VRAM_PAGES); save_item(NAME(m_cpu_vram_page)); } diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp index 878ca065b4d..14966c10682 100644 --- a/src/mame/drivers/univac.cpp +++ b/src/mame/drivers/univac.cpp @@ -223,7 +223,7 @@ void univac_state::machine_start() m_p_parity.reset(new u8[parity_bytes]); std::fill_n(m_p_parity.get(), parity_bytes, 0); - save_pointer(NAME(m_p_parity.get()), parity_bytes); + save_pointer(NAME(m_p_parity), parity_bytes); save_item(NAME(m_bank_mask)); save_item(NAME(m_parity_check)); save_item(NAME(m_parity_poison)); diff --git a/src/mame/drivers/unkhorse.cpp b/src/mame/drivers/unkhorse.cpp index 52ac1ad2b68..e8fad15fce1 100644 --- a/src/mame/drivers/unkhorse.cpp +++ b/src/mame/drivers/unkhorse.cpp @@ -62,7 +62,7 @@ public: void horse_state::machine_start() { m_colorram = std::make_unique(0x200); - save_pointer(NAME(m_colorram.get()), 0x200); + save_pointer(NAME(m_colorram), 0x200); save_item(NAME(m_output)); } diff --git a/src/mame/drivers/vamphalf.cpp b/src/mame/drivers/vamphalf.cpp index 16f3497ac0a..145483ad75b 100644 --- a/src/mame/drivers/vamphalf.cpp +++ b/src/mame/drivers/vamphalf.cpp @@ -3438,7 +3438,7 @@ void vamphalf_nvram_state::init_finalgdr() m_semicom_prot_data[1] = 3; save_item(NAME(m_finalgdr_backupram_bank)); - save_pointer(NAME(m_finalgdr_backupram.get()), 0x80*0x100); + save_pointer(NAME(m_finalgdr_backupram), 0x80*0x100); save_item(NAME(m_semicom_prot_idx)); save_item(NAME(m_semicom_prot_which)); } diff --git a/src/mame/drivers/vegaeo.cpp b/src/mame/drivers/vegaeo.cpp index 74e5821fa88..e51dde24ed0 100644 --- a/src/mame/drivers/vegaeo.cpp +++ b/src/mame/drivers/vegaeo.cpp @@ -153,7 +153,7 @@ INPUT_PORTS_END VIDEO_START_MEMBER(vegaeo_state,vega) { m_vram = std::make_unique(0x14000*2); - save_pointer(NAME(m_vram.get()), 0x14000*2); + save_pointer(NAME(m_vram), 0x14000*2); save_item(NAME(m_vbuffer)); } diff --git a/src/mame/drivers/wyvernf0.cpp b/src/mame/drivers/wyvernf0.cpp index afbe35f28f4..7ac83574179 100644 --- a/src/mame/drivers/wyvernf0.cpp +++ b/src/mame/drivers/wyvernf0.cpp @@ -622,7 +622,7 @@ MACHINE_START_MEMBER(wyvernf0_state,wyvernf0) // sprite codes lookup in banked RAM m_objram = std::make_unique(0x1000 * 2); - save_pointer(NAME(m_objram.get()), 0x1000 * 2); + save_pointer(NAME(m_objram), 0x1000 * 2); membank("rambank")->configure_entries(0, 2, m_objram.get(), 0x1000); save_item(NAME(m_sound_nmi_enable)); diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp index 9b32fd9da65..039f7c90770 100644 --- a/src/mame/drivers/x1.cpp +++ b/src/mame/drivers/x1.cpp @@ -2175,9 +2175,9 @@ MACHINE_START_MEMBER(x1_state,x1) m_emm_ram = make_unique_clear(0x1000000); m_pcg_ram = make_unique_clear(0x1800); - save_pointer(NAME(m_work_ram.get()), 0x10000*0x10); - save_pointer(NAME(m_emm_ram.get()), 0x1000000); - save_pointer(NAME(m_pcg_ram.get()), 0x1800); + save_pointer(NAME(m_work_ram), 0x10000*0x10); + save_pointer(NAME(m_emm_ram), 0x1000000); + save_pointer(NAME(m_pcg_ram), 0x1800); m_gfxdecode->set_gfx(3, std::make_unique(m_palette, x1_pcg_8x8, m_pcg_ram.get(), 0, 1, 0)); } diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp index e5168c86aa0..a5fc27eeca3 100644 --- a/src/mame/drivers/zn.cpp +++ b/src/mame/drivers/zn.cpp @@ -1185,7 +1185,7 @@ void zn_state::init_coh1000tb() m_fx1b_fram = std::make_unique(0x200); subdevice("fm1208s")->set_base(m_fx1b_fram.get(), 0x200); - save_pointer(NAME(m_fx1b_fram.get()), 0x200); + save_pointer(NAME(m_fx1b_fram), 0x200); } MACHINE_CONFIG_START(zn_state::coh1000tb) @@ -2149,7 +2149,7 @@ void zn_state::init_nbajamex() m_nbajamex_sram = std::make_unique(0x8000); subdevice("71256")->set_base(m_nbajamex_sram.get(), 0x8000); - save_pointer(NAME(m_nbajamex_sram.get()), 0x8000); + save_pointer(NAME(m_nbajamex_sram), 0x8000); save_item(NAME(m_nbajamex_rombank)); } diff --git a/src/mame/drivers/zwackery.cpp b/src/mame/drivers/zwackery.cpp index eb3ebd7e331..b21ef46f52b 100644 --- a/src/mame/drivers/zwackery.cpp +++ b/src/mame/drivers/zwackery.cpp @@ -485,7 +485,7 @@ void zwackery_state::machine_start() m_spriteram = std::make_unique(0x800); // register for save states - save_pointer(NAME(m_spriteram.get()), 0x800); + save_pointer(NAME(m_spriteram), 0x800); } diff --git a/src/mame/machine/315-5881_crypt.cpp b/src/mame/machine/315-5881_crypt.cpp index 49bbb102790..d536fb6c2ac 100644 --- a/src/mame/machine/315-5881_crypt.cpp +++ b/src/mame/machine/315-5881_crypt.cpp @@ -58,9 +58,9 @@ void sega_315_5881_crypt_device::device_start() m_read.bind_relative_to(*owner()); - save_pointer(NAME(buffer.get()), BUFFER_SIZE); - save_pointer(NAME(line_buffer.get()), LINE_SIZE); - save_pointer(NAME(line_buffer_prev.get()), LINE_SIZE); + save_pointer(NAME(buffer), BUFFER_SIZE); + save_pointer(NAME(line_buffer), LINE_SIZE); + save_pointer(NAME(line_buffer_prev), LINE_SIZE); save_item(NAME(prot_cur_address)); save_item(NAME(subkey)); save_item(NAME(enc_ready)); diff --git a/src/mame/machine/3do.cpp b/src/mame/machine/3do.cpp index 42772a69940..f2e91396a90 100644 --- a/src/mame/machine/3do.cpp +++ b/src/mame/machine/3do.cpp @@ -1116,15 +1116,11 @@ void _3do_state::m_clio_init() m_clio.revision = 0x02022000 /* 0x04000000 */; m_clio.unclerev = 0x03800000; m_clio.expctl = 0x80; /* ARM has the expansion bus */ - m_dspp.N = std::make_unique(0x800 ); - m_dspp.EI = std::make_unique(0x400 ); - m_dspp.EO = std::make_unique(0x400 ); + m_dspp.N = make_unique_clear(0x800); + m_dspp.EI = make_unique_clear(0x400); + m_dspp.EO = make_unique_clear(0x400); - memset(m_dspp.N.get(), 0, sizeof(uint16_t) * 0x400); - memset(m_dspp.EI.get(), 0, sizeof(uint16_t) * 0x400); - memset(m_dspp.EO.get(), 0, sizeof(uint16_t) * 0x400); - - save_pointer(NAME(m_dspp.N.get()), 0x800); - save_pointer(NAME(m_dspp.EI.get()), 0x400); - save_pointer(NAME(m_dspp.EO.get()), 0x400); + save_pointer(NAME(m_dspp.N), 0x800); + save_pointer(NAME(m_dspp.EI), 0x400); + save_pointer(NAME(m_dspp.EO), 0x400); } diff --git a/src/mame/machine/alpha8201.cpp b/src/mame/machine/alpha8201.cpp index fea973fb9e5..53cc7fec7b7 100644 --- a/src/mame/machine/alpha8201.cpp +++ b/src/mame/machine/alpha8201.cpp @@ -305,7 +305,7 @@ void alpha_8201_device::device_start() memset(m_mcu_r, 0, sizeof(m_mcu_r)); // register for savestates - save_pointer(NAME(m_shared_ram.get()), 0x400); + save_pointer(NAME(m_shared_ram), 0x400); save_item(NAME(m_bus)); save_item(NAME(m_mcu_address)); save_item(NAME(m_mcu_d)); diff --git a/src/mame/machine/apple2gs.cpp b/src/mame/machine/apple2gs.cpp index e678f61adf8..5ac18a3d759 100644 --- a/src/mame/machine/apple2gs.cpp +++ b/src/mame/machine/apple2gs.cpp @@ -1837,7 +1837,7 @@ void apple2gs_state::apple2gs_setup_memory() /* allocate memory for E00000-E1FFFF */ m_slowmem = make_unique_clear(128*1024); - save_pointer(m_slowmem.get(), "APPLE2GS_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 diff --git a/src/mame/machine/atarixga.cpp b/src/mame/machine/atarixga.cpp index d3858fcce86..968abee4048 100644 --- a/src/mame/machine/atarixga.cpp +++ b/src/mame/machine/atarixga.cpp @@ -74,7 +74,7 @@ void atari_136094_0072_device::device_start() { m_ram = std::make_unique(RAM_WORDS); - save_pointer(NAME(m_ram.get()), RAM_WORDS * sizeof(uint16_t)); + save_pointer(NAME(m_ram), RAM_WORDS * sizeof(uint16_t)); save_item(NAME(m_address)); save_item(NAME(m_ciphertext)); } @@ -293,7 +293,7 @@ atari_136095_0072_device::atari_136095_0072_device(const machine_config &mconfig void atari_136095_0072_device::device_start() { m_ram = std::make_unique(RAM_WORDS); - save_pointer(NAME(m_ram.get()), RAM_WORDS * sizeof(uint16_t)); + save_pointer(NAME(m_ram), RAM_WORDS * sizeof(uint16_t)); save_item(NAME(m_update.addr)); save_item(NAME(m_update.data)); diff --git a/src/mame/machine/docg3.cpp b/src/mame/machine/docg3.cpp index 717a3178734..5c582fc92d9 100644 --- a/src/mame/machine/docg3.cpp +++ b/src/mame/machine/docg3.cpp @@ -777,23 +777,20 @@ void diskonchip_g3_device::device_start() memset(m_sec_2, 0, sizeof(m_sec_2)); - m_data[0] = std::make_unique(m_data_size[0]); - memset(m_data[0].get(), 0, sizeof(uint8_t) * m_data_size[0]); - m_data[1] = std::make_unique(m_data_size[1]); - memset(m_data[1].get(), 0, sizeof(uint8_t) * m_data_size[1]); - m_data[2] = std::make_unique(m_data_size[2]); - memset(m_data[2].get(), 0, sizeof(uint8_t) * m_data_size[2]); + m_data[0] = make_unique_clear(m_data_size[0]); + m_data[1] = make_unique_clear(m_data_size[1]); + m_data[2] = make_unique_clear(m_data_size[2]); // diskonchip_load( device, "diskonchip"); - save_item( NAME(m_planes)); - save_item( NAME(m_blocks)); - save_item( NAME(m_pages)); - save_item( NAME(m_user_data_size)); - save_item( NAME(m_extra_area_size)); - save_pointer( NAME(m_data[0].get()), m_data_size[0]); - save_pointer( NAME(m_data[1].get()), m_data_size[1]); - save_pointer( NAME(m_data[2].get()), m_data_size[2]); + save_item(NAME(m_planes)); + save_item(NAME(m_blocks)); + save_item(NAME(m_pages)); + save_item(NAME(m_user_data_size)); + save_item(NAME(m_extra_area_size)); + save_pointer(NAME(m_data[0]), m_data_size[0]); + save_pointer(NAME(m_data[1]), m_data_size[1]); + save_pointer(NAME(m_data[2]), m_data_size[2]); } //------------------------------------------------- diff --git a/src/mame/machine/k573dio.cpp b/src/mame/machine/k573dio.cpp index 84e8e79d1d3..a83edb91e3e 100644 --- a/src/mame/machine/k573dio.cpp +++ b/src/mame/machine/k573dio.cpp @@ -113,7 +113,7 @@ void k573dio_device::device_start() { output_cb.resolve_safe(); ram = std::make_unique(12 * 1024 * 1024 ); - save_pointer( NAME(ram.get()), 12 * 1024 * 1024 ); + save_pointer(NAME(ram), 12 * 1024 * 1024 ); } void k573dio_device::device_reset() diff --git a/src/mame/machine/konppc.cpp b/src/mame/machine/konppc.cpp index 866e8eee884..78a1bcc394c 100644 --- a/src/mame/machine/konppc.cpp +++ b/src/mame/machine/konppc.cpp @@ -49,13 +49,13 @@ void konppc_device::device_start() save_item(NAME(dsp_comm_ppc[i]), i); save_item(NAME(dsp_comm_sharc[i]), i); save_item(NAME(dsp_shared_ram_bank[i]), i); - save_pointer(NAME(dsp_shared_ram[i].get()), DSP_BANK_SIZE * 2 / sizeof(dsp_shared_ram[i][0]), i); + save_pointer(NAME(dsp_shared_ram[i]), DSP_BANK_SIZE * 2 / sizeof(dsp_shared_ram[i][0]), i); save_item(NAME(dsp_state[i]), i); save_item(NAME(nwk_device_sel[i]), i); save_item(NAME(nwk_fifo_read_ptr[i]), i); save_item(NAME(nwk_fifo_write_ptr[i]), i); - save_pointer(NAME(nwk_fifo[i].get()), 0x800, i); - save_pointer(NAME(nwk_ram[i].get()), 0x2000, i); + save_pointer(NAME(nwk_fifo[i]), 0x800, i); + save_pointer(NAME(nwk_ram[i]), 0x2000, i); } save_item(NAME(cgboard_id)); diff --git a/src/mame/machine/leland.cpp b/src/mame/machine/leland.cpp index 2db7de56531..59434792ff0 100644 --- a/src/mame/machine/leland.cpp +++ b/src/mame/machine/leland.cpp @@ -378,7 +378,7 @@ void ataxx_state::machine_start() save_item(NAME(m_xrom1_addr)); save_item(NAME(m_xrom2_addr)); save_item(NAME(m_battery_ram_enable)); - save_pointer(NAME(m_extra_tram.get()), ATAXX_EXTRA_TRAM_SIZE); + save_pointer(NAME(m_extra_tram), ATAXX_EXTRA_TRAM_SIZE); } diff --git a/src/mame/machine/megadriv.cpp b/src/mame/machine/megadriv.cpp index dab896511d9..07beee6f97e 100644 --- a/src/mame/machine/megadriv.cpp +++ b/src/mame/machine/megadriv.cpp @@ -997,7 +997,7 @@ void md_base_state::megadriv_init_common() save_item(NAME(m_genz80.z80_is_reset)); save_item(NAME(m_genz80.z80_has_bus)); save_item(NAME(m_genz80.z80_bank_addr)); - save_pointer(NAME(m_genz80.z80_prgram.get()), 0x2000); + save_pointer(NAME(m_genz80.z80_prgram), 0x2000); } m_maincpu->set_tas_write_callback(write8_delegate(FUNC(md_base_state::megadriv_tas_callback),this)); diff --git a/src/mame/machine/model1.cpp b/src/mame/machine/model1.cpp index 42329be3d31..c02b21d71ca 100644 --- a/src/mame/machine/model1.cpp +++ b/src/mame/machine/model1.cpp @@ -1728,7 +1728,7 @@ MACHINE_START_MEMBER(model1_state,model1) m_digits.resolve(); m_copro_ram_data = std::make_unique(0x8000); - save_pointer(NAME(m_copro_ram_data.get()), 0x8000); + save_pointer(NAME(m_copro_ram_data), 0x8000); save_item(NAME(m_v60_copro_ram_adr)); save_item(NAME(m_copro_hle_ram_scan_adr)); save_item(NAME(m_v60_copro_ram_latch)); diff --git a/src/mame/machine/namcoic.cpp b/src/mame/machine/namcoic.cpp index e5469defe3e..40f6f2809e2 100644 --- a/src/mame/machine/namcoic.cpp +++ b/src/mame/machine/namcoic.cpp @@ -58,7 +58,7 @@ void namcos2_shared_state::c123_tilemap_init( int gfxbank, void *maskBaseAddr, c } save_item(NAME(m_c123_TilemapInfo.control)); - save_pointer(NAME(m_c123_TilemapInfo.videoram.get()), 0x10000); + save_pointer(NAME(m_c123_TilemapInfo.videoram), 0x10000); } void namcos2_shared_state::c123_tilemap_draw( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ) diff --git a/src/mame/machine/naomim1.cpp b/src/mame/machine/naomim1.cpp index 5cc4170f072..8e91c5b7cf9 100644 --- a/src/mame/machine/naomim1.cpp +++ b/src/mame/machine/naomim1.cpp @@ -47,7 +47,7 @@ void naomi_m1_board::device_start() buffer = std::make_unique(BUFFER_SIZE); - save_pointer(NAME(buffer.get()), BUFFER_SIZE); + save_pointer(NAME(buffer), BUFFER_SIZE); save_item(NAME(dict)); save_item(NAME(hist)); save_item(NAME(rom_cur_address)); diff --git a/src/mame/machine/naomim2.cpp b/src/mame/machine/naomim2.cpp index 16123db826f..39e7b56c4fe 100644 --- a/src/mame/machine/naomim2.cpp +++ b/src/mame/machine/naomim2.cpp @@ -125,7 +125,7 @@ void naomi_m2_board::device_start() ram = std::make_unique(RAM_SIZE); save_item(NAME(rom_cur_address)); - save_pointer(NAME(ram.get()), RAM_SIZE); + save_pointer(NAME(ram), RAM_SIZE); } void naomi_m2_board::device_reset() diff --git a/src/mame/machine/naomim4.cpp b/src/mame/machine/naomim4.cpp index f9baab8de51..9bb9992614e 100644 --- a/src/mame/machine/naomim4.cpp +++ b/src/mame/machine/naomim4.cpp @@ -72,7 +72,7 @@ void naomi_m4_board::device_start() buffer = std::make_unique(BUFFER_SIZE); enc_init(); - save_pointer(NAME(buffer.get()), BUFFER_SIZE); + save_pointer(NAME(buffer), BUFFER_SIZE); save_item(NAME(rom_cur_address)); save_item(NAME(buffer_actual_size)); save_item(NAME(encryption)); diff --git a/src/mame/machine/nes.cpp b/src/mame/machine/nes.cpp index d5c03f161d3..9adc870ed8e 100644 --- a/src/mame/machine/nes.cpp +++ b/src/mame/machine/nes.cpp @@ -104,7 +104,7 @@ void nes_state::machine_start() // register saves save_item(NAME(m_last_frame_flip)); - save_pointer(NAME(m_ciram.get()), 0x800); + save_pointer(NAME(m_ciram), 0x800); } diff --git a/src/mame/machine/pce_cd.cpp b/src/mame/machine/pce_cd.cpp index a2bc3be4ae0..d70eea6efed 100644 --- a/src/mame/machine/pce_cd.cpp +++ b/src/mame/machine/pce_cd.cpp @@ -134,8 +134,8 @@ void pce_cd_device::device_start() // TODO: add proper restore for the cd data... save_item(NAME(m_regs)); - save_pointer(NAME(m_bram.get()), PCE_BRAM_SIZE * 2); - save_pointer(NAME(m_adpcm_ram.get()), PCE_ADPCM_RAM_SIZE); + save_pointer(NAME(m_bram), PCE_BRAM_SIZE * 2); + save_pointer(NAME(m_adpcm_ram), PCE_ADPCM_RAM_SIZE); save_item(NAME(m_bram_locked)); save_item(NAME(m_adpcm_read_ptr)); save_item(NAME(m_adpcm_read_buf)); @@ -161,16 +161,16 @@ void pce_cd_device::device_start() save_item(NAME(m_scsi_last_RST)); save_item(NAME(m_cd_motor_on)); save_item(NAME(m_selected)); - save_pointer(NAME(m_command_buffer.get()), PCE_CD_COMMAND_BUFFER_SIZE); + save_pointer(NAME(m_command_buffer), PCE_CD_COMMAND_BUFFER_SIZE); save_item(NAME(m_command_buffer_index)); save_item(NAME(m_status_sent)); save_item(NAME(m_message_after_status)); save_item(NAME(m_message_sent)); - save_pointer(NAME(m_data_buffer.get()), 8192); + save_pointer(NAME(m_data_buffer), 8192); save_item(NAME(m_data_buffer_size)); save_item(NAME(m_data_buffer_index)); save_item(NAME(m_data_transferred)); - save_pointer(NAME(m_acard_ram.get()), PCE_ACARD_RAM_SIZE); + save_pointer(NAME(m_acard_ram), PCE_ACARD_RAM_SIZE); save_item(NAME(m_acard_latch)); save_item(NAME(m_acard_ctrl)); save_item(NAME(m_acard_base_addr)); @@ -183,7 +183,7 @@ void pce_cd_device::device_start() save_item(NAME(m_last_frame)); save_item(NAME(m_cdda_status)); save_item(NAME(m_cdda_play_mode)); - save_pointer(NAME(m_subcode_buffer.get()), 96); + save_pointer(NAME(m_subcode_buffer), 96); save_item(NAME(m_end_mark)); save_item(NAME(m_cdda_volume)); save_item(NAME(m_adpcm_volume)); diff --git a/src/mame/machine/pgmprot_igs027a_type3.cpp b/src/mame/machine/pgmprot_igs027a_type3.cpp index d5474b1242d..a1ff65d223a 100644 --- a/src/mame/machine/pgmprot_igs027a_type3.cpp +++ b/src/mame/machine/pgmprot_igs027a_type3.cpp @@ -214,8 +214,8 @@ void pgm_arm_type3_state::svg_basic_init() m_svg_shareram[1] = std::make_unique(0x20000 / 4); m_svg_ram_sel = 0; - save_pointer(NAME(m_svg_shareram[0].get()), 0x20000 / 4); - save_pointer(NAME(m_svg_shareram[1].get()), 0x20000 / 4); + save_pointer(NAME(m_svg_shareram[0]), 0x20000 / 4); + save_pointer(NAME(m_svg_shareram[1]), 0x20000 / 4); save_item(NAME(m_svg_ram_sel)); } diff --git a/src/mame/machine/simpsons.cpp b/src/mame/machine/simpsons.cpp index 19fc05c50d5..63eee71f583 100644 --- a/src/mame/machine/simpsons.cpp +++ b/src/mame/machine/simpsons.cpp @@ -74,7 +74,7 @@ void simpsons_state::machine_start() save_item(NAME(m_sprite_colorbase)); save_item(NAME(m_layer_colorbase)); save_item(NAME(m_layerpri)); - save_pointer(NAME(m_spriteram.get()), 0x1000 / 2); + save_pointer(NAME(m_spriteram), 0x1000 / 2); } void simpsons_state::machine_reset() diff --git a/src/mame/machine/sms.cpp b/src/mame/machine/sms.cpp index bd87deb4ed3..fde2dc580de 100644 --- a/src/mame/machine/sms.cpp +++ b/src/mame/machine/sms.cpp @@ -1044,7 +1044,7 @@ void sms_state::machine_start() if (m_mainram == nullptr) { m_mainram = make_unique_clear(0x2000); - save_pointer(NAME(m_mainram.get()), 0x2000); + save_pointer(NAME(m_mainram), 0x2000); // alibaba and blockhol are ports of games for the MSX system. The // MSX bios usually initializes callback "vectors" at the top of RAM. @@ -1395,7 +1395,7 @@ VIDEO_START_MEMBER(sms_state,gamegear) save_item(NAME(m_prev_bitmap_copied)); save_item(NAME(m_prev_bitmap)); save_item(NAME(m_gg_sms_mode_bitmap)); - save_pointer(NAME(m_line_buffer.get()), 160 * 4); + save_pointer(NAME(m_line_buffer), 160 * 4); } VIDEO_RESET_MEMBER(sms_state,gamegear) diff --git a/src/mame/machine/st0016.cpp b/src/mame/machine/st0016.cpp index 8e22dc23bb3..eade55d08ed 100644 --- a/src/mame/machine/st0016.cpp +++ b/src/mame/machine/st0016.cpp @@ -573,9 +573,9 @@ void st0016_cpu_device::st0016_save_init() save_item(NAME(m_dma_offset)); //save_item(NAME(st0016_rom_bank)); save_item(NAME(st0016_vregs)); - save_pointer(NAME(m_charram.get()), MAX_CHAR_BANK*CHAR_BANK_SIZE); - save_pointer(NAME(st0016_paletteram.get()), MAX_PAL_BANK*PAL_BANK_SIZE); - save_pointer(NAME(st0016_spriteram.get()), MAX_SPR_BANK*SPR_BANK_SIZE); + save_pointer(NAME(m_charram), MAX_CHAR_BANK*CHAR_BANK_SIZE); + save_pointer(NAME(st0016_paletteram), MAX_PAL_BANK*PAL_BANK_SIZE); + save_pointer(NAME(st0016_spriteram), MAX_SPR_BANK*SPR_BANK_SIZE); } diff --git a/src/mame/video/20pacgal.cpp b/src/mame/video/20pacgal.cpp index 75626a8acec..c5d404d0a12 100644 --- a/src/mame/video/20pacgal.cpp +++ b/src/mame/video/20pacgal.cpp @@ -435,9 +435,9 @@ void _20pacgal_state::video_start() m_sprite_ram = make_unique_clear(0x180); m_sprite_color_lookup = make_unique_clear(0x100); - save_pointer(NAME(m_sprite_gfx_ram.get()), 0x2000); - save_pointer(NAME(m_sprite_ram.get()), 0x180); - save_pointer(NAME(m_sprite_color_lookup.get()), 0x100); + save_pointer(NAME(m_sprite_gfx_ram), 0x2000); + save_pointer(NAME(m_sprite_ram), 0x180); + save_pointer(NAME(m_sprite_color_lookup), 0x100); if (m_proms != nullptr) get_pens(); diff --git a/src/mame/video/40love.cpp b/src/mame/video/40love.cpp index 6beb000f1df..cb6bc13145a 100644 --- a/src/mame/video/40love.cpp +++ b/src/mame/video/40love.cpp @@ -78,8 +78,8 @@ void fortyl_state::video_start() save_item(NAME(m_flipscreen)); save_item(NAME(m_pix_color)); - save_pointer(NAME(m_pixram1.get()), 0x4000); - save_pointer(NAME(m_pixram2.get()), 0x4000); + save_pointer(NAME(m_pixram1), 0x4000); + save_pointer(NAME(m_pixram2), 0x4000); save_item(NAME(*m_tmp_bitmap1)); save_item(NAME(*m_tmp_bitmap2)); save_item(NAME(m_pixram_sel)); diff --git a/src/mame/video/antic.cpp b/src/mame/video/antic.cpp index 900dc1bad07..12a900dd37d 100644 --- a/src/mame/video/antic.cpp +++ b/src/mame/video/antic.cpp @@ -413,8 +413,8 @@ void antic_device::device_start() save_item(NAME(m_cclock)); save_item(NAME(m_pmbits)); - save_pointer(NAME(m_cclk_expand.get()), 21 * 256); - save_pointer(NAME(m_used_colors.get()), 21 * 256); + save_pointer(NAME(m_cclk_expand), 21 * 256); + save_pointer(NAME(m_used_colors), 21 * 256); } diff --git a/src/mame/video/arabian.cpp b/src/mame/video/arabian.cpp index e644b31e7d3..0aaa2d88ad1 100644 --- a/src/mame/video/arabian.cpp +++ b/src/mame/video/arabian.cpp @@ -207,8 +207,8 @@ void arabian_state::video_start() m_converted_gfx[offs * 4 + 0] = p4; } - save_pointer(NAME(m_main_bitmap.get()), BITMAP_WIDTH * BITMAP_HEIGHT); - save_pointer(NAME(m_converted_gfx.get()), 0x8000 * 2); + save_pointer(NAME(m_main_bitmap), BITMAP_WIDTH * BITMAP_HEIGHT); + save_pointer(NAME(m_converted_gfx), 0x8000 * 2); save_item(NAME(m_video_control)); save_item(NAME(m_flip_screen)); } diff --git a/src/mame/video/argus.cpp b/src/mame/video/argus.cpp index 90a80b8e183..3bedadbdb55 100644 --- a/src/mame/video/argus.cpp +++ b/src/mame/video/argus.cpp @@ -275,7 +275,7 @@ VIDEO_START_MEMBER(argus_state,argus) save_item(NAME(m_bg_status)); save_item(NAME(m_flipscreen)); save_item(NAME(m_palette_intensity)); - save_pointer(NAME(m_dummy_bg0ram.get()), 0x800); + save_pointer(NAME(m_dummy_bg0ram), 0x800); save_item(NAME(m_lowbitscroll)); save_item(NAME(m_prvscrollx)); } @@ -335,8 +335,8 @@ VIDEO_START_MEMBER(argus_state,butasan) save_item(NAME(m_bg_status)); save_item(NAME(m_flipscreen)); save_item(NAME(m_palette_intensity)); - save_pointer(NAME(m_butasan_pagedram[0].get()), 0x1000); - save_pointer(NAME(m_butasan_pagedram[1].get()), 0x1000); + save_pointer(NAME(m_butasan_pagedram[0]), 0x1000); + save_pointer(NAME(m_butasan_pagedram[1]), 0x1000); save_item(NAME(m_butasan_page_latch)); save_item(NAME(m_butasan_bg1_status)); save_item(NAME(m_butasan_unknown)); diff --git a/src/mame/video/armedf.cpp b/src/mame/video/armedf.cpp index e68f4cf98ac..5e15e0ff151 100644 --- a/src/mame/video/armedf.cpp +++ b/src/mame/video/armedf.cpp @@ -131,7 +131,7 @@ VIDEO_START_MEMBER(armedf_state,terraf) m_text_videoram = std::make_unique(0x1000); memset(m_text_videoram.get(), 0x00, 0x1000); - save_pointer(NAME(m_text_videoram.get()), 0x1000); + save_pointer(NAME(m_text_videoram), 0x1000); } VIDEO_START_MEMBER(armedf_state,armedf) @@ -153,7 +153,7 @@ VIDEO_START_MEMBER(armedf_state,armedf) m_text_videoram = std::make_unique(0x1000); memset(m_text_videoram.get(), 0x00, 0x1000); - save_pointer(NAME(m_text_videoram.get()), 0x1000); + save_pointer(NAME(m_text_videoram), 0x1000); } /*************************************************************************** diff --git a/src/mame/video/astrocde.cpp b/src/mame/video/astrocde.cpp index 8a3fccb18ad..0f806df0e0f 100644 --- a/src/mame/video/astrocde.cpp +++ b/src/mame/video/astrocde.cpp @@ -206,7 +206,7 @@ VIDEO_START_MEMBER(astrocde_state,profpac) init_savestate(); /* register our specific save state data */ - save_pointer(NAME(m_profpac_videoram.get()), 0x4000 * 4); + save_pointer(NAME(m_profpac_videoram), 0x4000 * 4); save_item(NAME(m_profpac_palette)); save_item(NAME(m_profpac_colormap)); save_item(NAME(m_profpac_intercept)); diff --git a/src/mame/video/bigevglf.cpp b/src/mame/video/bigevglf.cpp index b6cdc74fa5f..0d22bda8cb1 100644 --- a/src/mame/video/bigevglf.cpp +++ b/src/mame/video/bigevglf.cpp @@ -63,7 +63,7 @@ void bigevglf_state::video_start() m_vidram = std::make_unique(0x100 * 0x100 * 4); - save_pointer(NAME(m_vidram.get()), 0x100 * 0x100 * 4); + save_pointer(NAME(m_vidram), 0x100 * 0x100 * 4); } void bigevglf_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/video/blktiger.cpp b/src/mame/video/blktiger.cpp index bc262a77398..9583ed28750 100644 --- a/src/mame/video/blktiger.cpp +++ b/src/mame/video/blktiger.cpp @@ -86,7 +86,7 @@ void blktiger_state::video_start() m_bg_tilemap4x8->set_transmask(2, 0xff00, 0x80ff); m_bg_tilemap4x8->set_transmask(3, 0xf000, 0x8fff); - save_pointer(NAME(m_scroll_ram.get()), BGRAM_BANK_SIZE * BGRAM_BANKS); + save_pointer(NAME(m_scroll_ram), BGRAM_BANK_SIZE * BGRAM_BANKS); } diff --git a/src/mame/video/cbasebal.cpp b/src/mame/video/cbasebal.cpp index bee6f0f6c57..6c50356d99a 100644 --- a/src/mame/video/cbasebal.cpp +++ b/src/mame/video/cbasebal.cpp @@ -46,8 +46,8 @@ void cbasebal_state::video_start() m_fg_tilemap->set_transparent_pen(3); - save_pointer(NAME(m_textram.get()), 0x1000); - save_pointer(NAME(m_scrollram.get()), 0x1000); + save_pointer(NAME(m_textram), 0x1000); + save_pointer(NAME(m_scrollram), 0x1000); } diff --git a/src/mame/video/changela.cpp b/src/mame/video/changela.cpp index bcc08393000..4391174bde3 100644 --- a/src/mame/video/changela.cpp +++ b/src/mame/video/changela.cpp @@ -32,8 +32,8 @@ void changela_state::video_start() m_scanline_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(changela_state::changela_scanline_callback),this)); m_scanline_timer->adjust(m_screen->time_until_pos(30), 30); - save_pointer(NAME(m_memory_devices.get()), 4 * 0x800); - save_pointer(NAME(m_tree_ram.get()), 2 * 0x20); + save_pointer(NAME(m_memory_devices), 4 * 0x800); + save_pointer(NAME(m_tree_ram), 2 * 0x20); } /************************************************************************** diff --git a/src/mame/video/cidelsa.cpp b/src/mame/video/cidelsa.cpp index aa383261fd0..e8cbfab93a1 100644 --- a/src/mame/video/cidelsa.cpp +++ b/src/mame/video/cidelsa.cpp @@ -124,8 +124,8 @@ void cidelsa_state::video_start() // register for state saving save_item(NAME(m_cdp1869_pcb)); - save_pointer(NAME(m_pcbram.get()), CIDELSA_CHARRAM_SIZE); - save_pointer(NAME(m_charram.get()), CIDELSA_CHARRAM_SIZE); + save_pointer(NAME(m_pcbram), CIDELSA_CHARRAM_SIZE); + save_pointer(NAME(m_charram), CIDELSA_CHARRAM_SIZE); } /* AY-3-8910 */ diff --git a/src/mame/video/cloak.cpp b/src/mame/video/cloak.cpp index b4b0fae8e82..ae98e819927 100644 --- a/src/mame/video/cloak.cpp +++ b/src/mame/video/cloak.cpp @@ -172,9 +172,9 @@ void cloak_state::video_start() save_item(NAME(m_bitmap_videoram_address_x)); save_item(NAME(m_bitmap_videoram_address_y)); save_item(NAME(m_bitmap_videoram_selected)); - save_pointer(NAME(m_bitmap_videoram1.get()), 256*256); - save_pointer(NAME(m_bitmap_videoram2.get()), 256*256); - save_pointer(NAME(m_palette_ram.get()), NUM_PENS); + save_pointer(NAME(m_bitmap_videoram1), 256*256); + save_pointer(NAME(m_bitmap_videoram2), 256*256); + save_pointer(NAME(m_palette_ram), NUM_PENS); machine().save().register_postload(save_prepost_delegate(FUNC(cloak_state::set_current_bitmap_videoram_pointer), this)); } diff --git a/src/mame/video/cloud9.cpp b/src/mame/video/cloud9.cpp index 69049a30f44..5a6eea3e0cb 100644 --- a/src/mame/video/cloud9.cpp +++ b/src/mame/video/cloud9.cpp @@ -40,7 +40,7 @@ void cloud9_state::video_start() m_screen->register_screen_bitmap(m_spritebitmap); /* register for savestates */ - save_pointer(NAME(m_videoram.get()), 0x8000); + save_pointer(NAME(m_videoram), 0x8000); save_item(NAME(m_bitmode_addr)); } diff --git a/src/mame/video/combatsc.cpp b/src/mame/video/combatsc.cpp index 3fcbbabedeb..ab23f4d1440 100644 --- a/src/mame/video/combatsc.cpp +++ b/src/mame/video/combatsc.cpp @@ -267,8 +267,8 @@ VIDEO_START_MEMBER(combatsc_state,combatsc) m_textlayer->set_scroll_rows(32); - save_pointer(NAME(m_spriteram[0].get()), 0x800); - save_pointer(NAME(m_spriteram[1].get()), 0x800); + save_pointer(NAME(m_spriteram[0]), 0x800); + save_pointer(NAME(m_spriteram[1]), 0x800); } VIDEO_START_MEMBER(combatsc_state,combatscb) @@ -287,8 +287,8 @@ VIDEO_START_MEMBER(combatsc_state,combatscb) m_bg_tilemap[0]->set_scroll_rows(32); m_bg_tilemap[1]->set_scroll_rows(32); - save_pointer(NAME(m_spriteram[0].get()), 0x800); - save_pointer(NAME(m_spriteram[1].get()), 0x800); + save_pointer(NAME(m_spriteram[0]), 0x800); + save_pointer(NAME(m_spriteram[1]), 0x800); } /*************************************************************************** diff --git a/src/mame/video/contra.cpp b/src/mame/video/contra.cpp index 4fdc0fa7cc6..45bab77d1f6 100644 --- a/src/mame/video/contra.cpp +++ b/src/mame/video/contra.cpp @@ -161,8 +161,8 @@ void contra_state::video_start() m_fg_tilemap->set_transparent_pen(0); - save_pointer(NAME(m_buffered_spriteram.get()), 0x800); - save_pointer(NAME(m_buffered_spriteram_2.get()), 0x800); + save_pointer(NAME(m_buffered_spriteram), 0x800); + save_pointer(NAME(m_buffered_spriteram_2), 0x800); } diff --git a/src/mame/video/cps1.cpp b/src/mame/video/cps1.cpp index cc8a83109df..e9b27dc6228 100644 --- a/src/mame/video/cps1.cpp +++ b/src/mame/video/cps1.cpp @@ -2318,7 +2318,7 @@ void cps_state::video_start() #endif save_item(NAME(m_last_sprite_offset)); - save_pointer(NAME(m_buffered_obj.get()), m_obj_size / 2); + save_pointer(NAME(m_buffered_obj), m_obj_size / 2); machine().save().register_postload(save_prepost_delegate(FUNC(cps_state::cps1_get_video_base), this)); } @@ -2334,7 +2334,7 @@ void cps2_state::video_start() memset(m_objram2, 0, m_cps2_obj_size); save_item(NAME(m_cps2_last_sprite_offset)); - save_pointer(NAME(m_cps2_buffered_obj.get()), m_cps2_obj_size / 2); + save_pointer(NAME(m_cps2_buffered_obj), m_cps2_obj_size / 2); save_item(NAME(m_pri_ctrl)); save_item(NAME(m_objram_bank)); } diff --git a/src/mame/video/dec8.cpp b/src/mame/video/dec8.cpp index fed8235b07f..75c918c3809 100644 --- a/src/mame/video/dec8.cpp +++ b/src/mame/video/dec8.cpp @@ -151,7 +151,7 @@ WRITE8_MEMBER(dec8_state::gondo_scroll_w) void dec8_state::allocate_buffered_spriteram16() { m_buffered_spriteram16 = make_unique_clear(0x800/2); - save_pointer(NAME(m_buffered_spriteram16.get()), 0x800/2); + save_pointer(NAME(m_buffered_spriteram16), 0x800/2); } /******************************************************************************/ diff --git a/src/mame/video/decbac06.cpp b/src/mame/video/decbac06.cpp index 5e56f533083..8f30ba0d737 100644 --- a/src/mame/video/decbac06.cpp +++ b/src/mame/video/decbac06.cpp @@ -110,9 +110,9 @@ void deco_bac06_device::device_start() m_rambank = 0; m_flip_screen = false; - save_pointer(NAME(m_pf_data.get()), 0x4000/2); - save_pointer(NAME(m_pf_rowscroll.get()), 0x2000/2); - save_pointer(NAME(m_pf_colscroll.get()), 0x2000/2); + save_pointer(NAME(m_pf_data), 0x4000/2); + save_pointer(NAME(m_pf_rowscroll), 0x2000/2); + save_pointer(NAME(m_pf_colscroll), 0x2000/2); save_item(NAME(m_pf_control_0)); save_item(NAME(m_pf_control_1)); save_item(NAME(m_gfxcolmask)); diff --git a/src/mame/video/deco16ic.cpp b/src/mame/video/deco16ic.cpp index 6223c46350b..7ff4d8dc5e6 100644 --- a/src/mame/video/deco16ic.cpp +++ b/src/mame/video/deco16ic.cpp @@ -268,9 +268,9 @@ void deco16ic_device::device_start() save_item(NAME(m_pf1_8bpp_mode)); - save_pointer(NAME(m_pf1_data.get()), 0x2000 / 2); - save_pointer(NAME(m_pf2_data.get()), 0x2000 / 2); - save_pointer(NAME(m_pf12_control.get()), 0x10 / 2); + save_pointer(NAME(m_pf1_data), 0x2000 / 2); + save_pointer(NAME(m_pf2_data), 0x2000 / 2); + save_pointer(NAME(m_pf12_control), 0x10 / 2); } //------------------------------------------------- diff --git a/src/mame/video/deco32.cpp b/src/mame/video/deco32.cpp index fe7c2fd097d..75fdba3b035 100644 --- a/src/mame/video/deco32.cpp +++ b/src/mame/video/deco32.cpp @@ -61,14 +61,14 @@ void deco32_state::allocate_spriteram(int chip) { m_spriteram16[chip] = std::make_unique(0x2000/4); m_spriteram16_buffered[chip] = std::make_unique(0x2000/4); - save_pointer(NAME(m_spriteram16[chip].get()), 0x2000/4, chip); - save_pointer(NAME(m_spriteram16_buffered[chip].get()), 0x2000/4, chip); + save_pointer(NAME(m_spriteram16[chip]), 0x2000/4, chip); + save_pointer(NAME(m_spriteram16_buffered[chip]), 0x2000/4, chip); } void deco32_state::allocate_buffered_palette() { m_dirty_palette = make_unique_clear(2048); - save_pointer(NAME(m_dirty_palette.get()), 2048); + save_pointer(NAME(m_dirty_palette), 2048); } void deco32_state::allocate_rowscroll(int size1, int size2, int size3, int size4) @@ -77,10 +77,10 @@ void deco32_state::allocate_rowscroll(int size1, int size2, int size3, int size4 m_pf_rowscroll[1] = make_unique_clear(size2); m_pf_rowscroll[2] = make_unique_clear(size3); m_pf_rowscroll[3] = make_unique_clear(size4); - save_pointer(NAME(m_pf_rowscroll[0].get()), size1); - save_pointer(NAME(m_pf_rowscroll[1].get()), size2); - save_pointer(NAME(m_pf_rowscroll[2].get()), size3); - save_pointer(NAME(m_pf_rowscroll[3].get()), size4); + save_pointer(NAME(m_pf_rowscroll[0]), size1); + save_pointer(NAME(m_pf_rowscroll[1]), size2); + save_pointer(NAME(m_pf_rowscroll[2]), size3); + save_pointer(NAME(m_pf_rowscroll[3]), size4); } VIDEO_START_MEMBER( captaven_state, captaven ) diff --git a/src/mame/video/deco_ace.cpp b/src/mame/video/deco_ace.cpp index 4ea99dbf6e0..b734817a513 100644 --- a/src/mame/video/deco_ace.cpp +++ b/src/mame/video/deco_ace.cpp @@ -83,9 +83,9 @@ void deco_ace_device::device_start() m_paletteram_buffered = make_unique_clear(2048); m_ace_ram = make_unique_clear(0x28); - save_pointer(NAME(m_paletteram.get()), 2048); - save_pointer(NAME(m_paletteram_buffered.get()), 2048); - save_pointer(NAME(m_ace_ram.get()), 0x28); + save_pointer(NAME(m_paletteram), 2048); + save_pointer(NAME(m_paletteram_buffered), 2048); + save_pointer(NAME(m_ace_ram), 0x28); } //------------------------------------------------- diff --git a/src/mame/video/deco_mlc.cpp b/src/mame/video/deco_mlc.cpp index 4415c231456..273fc492444 100644 --- a/src/mame/video/deco_mlc.cpp +++ b/src/mame/video/deco_mlc.cpp @@ -28,9 +28,9 @@ void deco_mlc_state::video_start() m_spriteram_spare = std::make_unique(0x3000/4); m_spriteram = std::make_unique(0x3000/4); - save_pointer(NAME(m_spriteram.get()), 0x3000/4); - save_pointer(NAME(m_spriteram_spare.get()), 0x3000/4); - save_pointer(NAME(m_buffered_spriteram.get()), 0x3000/4); + save_pointer(NAME(m_spriteram), 0x3000/4); + save_pointer(NAME(m_spriteram_spare), 0x3000/4); + save_pointer(NAME(m_buffered_spriteram), 0x3000/4); } diff --git a/src/mame/video/decocomn.cpp b/src/mame/video/decocomn.cpp index b8c7955a106..d0d29893df1 100644 --- a/src/mame/video/decocomn.cpp +++ b/src/mame/video/decocomn.cpp @@ -36,7 +36,7 @@ void decocomn_device::device_start() m_dirty_palette = make_unique_clear(4096); save_item(NAME(m_priority)); - save_pointer(NAME(m_dirty_palette.get()), 4096); + save_pointer(NAME(m_dirty_palette), 4096); } //------------------------------------------------- diff --git a/src/mame/video/dogfgt.cpp b/src/mame/video/dogfgt.cpp index b248a46454e..919f37754a0 100644 --- a/src/mame/video/dogfgt.cpp +++ b/src/mame/video/dogfgt.cpp @@ -70,7 +70,7 @@ void dogfgt_state::video_start() m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dogfgt_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_bitmapram = std::make_unique(BITMAPRAM_SIZE); - save_pointer(NAME(m_bitmapram.get()), BITMAPRAM_SIZE); + save_pointer(NAME(m_bitmapram), BITMAPRAM_SIZE); m_screen->register_screen_bitmap(m_pixbitmap); save_item(NAME(m_pixbitmap)); diff --git a/src/mame/video/dooyong.cpp b/src/mame/video/dooyong.cpp index 7dc8c1f5a62..474e19fd5bb 100644 --- a/src/mame/video/dooyong.cpp +++ b/src/mame/video/dooyong.cpp @@ -232,7 +232,7 @@ void dooyong_ram_tilemap_device::device_start() std::fill(m_tileram.get(), m_tileram.get() + (64 * 32), 0U); m_palette_bank = 0U; - save_pointer(NAME(m_tileram.get()), 64 * 32); + save_pointer(NAME(m_tileram), 64 * 32); save_item(NAME(m_palette_bank)); } diff --git a/src/mame/video/drmicro.cpp b/src/mame/video/drmicro.cpp index 22c85cef143..500c2c03eff 100644 --- a/src/mame/video/drmicro.cpp +++ b/src/mame/video/drmicro.cpp @@ -103,7 +103,7 @@ PALETTE_INIT_MEMBER(drmicro_state, drmicro) void drmicro_state::video_start() { m_videoram = std::make_unique(0x1000); - save_pointer(NAME(m_videoram.get()), 0x1000); + save_pointer(NAME(m_videoram), 0x1000); m_bg1 = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(drmicro_state::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg2 = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(drmicro_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/dynax.cpp b/src/mame/video/dynax.cpp index fa48bef4eff..347a69f4150 100644 --- a/src/mame/video/dynax.cpp +++ b/src/mame/video/dynax.cpp @@ -501,14 +501,14 @@ VIDEO_START_MEMBER(dynax_state,hanamai) dynax_common_reset(); m_layer_layout = LAYOUT_HANAMAI; - save_pointer(NAME(m_pixmap[0][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[0][1].get()), 256 * 256); - save_pointer(NAME(m_pixmap[1][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[1][1].get()), 256 * 256); - save_pointer(NAME(m_pixmap[2][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[2][1].get()), 256 * 256); - save_pointer(NAME(m_pixmap[3][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[3][1].get()), 256 * 256); + save_pointer(NAME(m_pixmap[0][0]), 256 * 256); + save_pointer(NAME(m_pixmap[0][1]), 256 * 256); + save_pointer(NAME(m_pixmap[1][0]), 256 * 256); + save_pointer(NAME(m_pixmap[1][1]), 256 * 256); + save_pointer(NAME(m_pixmap[2][0]), 256 * 256); + save_pointer(NAME(m_pixmap[2][1]), 256 * 256); + save_pointer(NAME(m_pixmap[3][0]), 256 * 256); + save_pointer(NAME(m_pixmap[3][1]), 256 * 256); } VIDEO_START_MEMBER(dynax_state,hnoridur) @@ -527,14 +527,14 @@ VIDEO_START_MEMBER(dynax_state,hnoridur) m_priority_table = priority_hnoridur; - save_pointer(NAME(m_pixmap[0][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[0][1].get()), 256 * 256); - save_pointer(NAME(m_pixmap[1][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[1][1].get()), 256 * 256); - save_pointer(NAME(m_pixmap[2][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[2][1].get()), 256 * 256); - save_pointer(NAME(m_pixmap[3][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[3][1].get()), 256 * 256); + save_pointer(NAME(m_pixmap[0][0]), 256 * 256); + save_pointer(NAME(m_pixmap[0][1]), 256 * 256); + save_pointer(NAME(m_pixmap[1][0]), 256 * 256); + save_pointer(NAME(m_pixmap[1][1]), 256 * 256); + save_pointer(NAME(m_pixmap[2][0]), 256 * 256); + save_pointer(NAME(m_pixmap[2][1]), 256 * 256); + save_pointer(NAME(m_pixmap[3][0]), 256 * 256); + save_pointer(NAME(m_pixmap[3][1]), 256 * 256); } VIDEO_START_MEMBER(dynax_state,mcnpshnt) @@ -555,12 +555,12 @@ VIDEO_START_MEMBER(dynax_state,sprtmtch) dynax_common_reset(); m_layer_layout = LAYOUT_DRGPUNCH; - save_pointer(NAME(m_pixmap[0][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[0][1].get()), 256 * 256); - save_pointer(NAME(m_pixmap[1][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[1][1].get()), 256 * 256); - save_pointer(NAME(m_pixmap[2][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[2][1].get()), 256 * 256); + save_pointer(NAME(m_pixmap[0][0]), 256 * 256); + save_pointer(NAME(m_pixmap[0][1]), 256 * 256); + save_pointer(NAME(m_pixmap[1][0]), 256 * 256); + save_pointer(NAME(m_pixmap[1][1]), 256 * 256); + save_pointer(NAME(m_pixmap[2][0]), 256 * 256); + save_pointer(NAME(m_pixmap[2][1]), 256 * 256); } VIDEO_START_MEMBER(dynax_state,jantouki) @@ -585,22 +585,22 @@ VIDEO_START_MEMBER(dynax_state,jantouki) dynax_common_reset(); m_layer_layout = LAYOUT_JANTOUKI; - save_pointer(NAME(m_pixmap[0][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[0][1].get()), 256 * 256); - save_pointer(NAME(m_pixmap[1][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[1][1].get()), 256 * 256); - save_pointer(NAME(m_pixmap[2][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[2][1].get()), 256 * 256); - save_pointer(NAME(m_pixmap[3][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[3][1].get()), 256 * 256); - save_pointer(NAME(m_pixmap[4][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[4][1].get()), 256 * 256); - save_pointer(NAME(m_pixmap[5][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[5][1].get()), 256 * 256); - save_pointer(NAME(m_pixmap[6][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[6][1].get()), 256 * 256); - save_pointer(NAME(m_pixmap[7][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[7][1].get()), 256 * 256); + save_pointer(NAME(m_pixmap[0][0]), 256 * 256); + save_pointer(NAME(m_pixmap[0][1]), 256 * 256); + save_pointer(NAME(m_pixmap[1][0]), 256 * 256); + save_pointer(NAME(m_pixmap[1][1]), 256 * 256); + save_pointer(NAME(m_pixmap[2][0]), 256 * 256); + save_pointer(NAME(m_pixmap[2][1]), 256 * 256); + save_pointer(NAME(m_pixmap[3][0]), 256 * 256); + save_pointer(NAME(m_pixmap[3][1]), 256 * 256); + save_pointer(NAME(m_pixmap[4][0]), 256 * 256); + save_pointer(NAME(m_pixmap[4][1]), 256 * 256); + save_pointer(NAME(m_pixmap[5][0]), 256 * 256); + save_pointer(NAME(m_pixmap[5][1]), 256 * 256); + save_pointer(NAME(m_pixmap[6][0]), 256 * 256); + save_pointer(NAME(m_pixmap[6][1]), 256 * 256); + save_pointer(NAME(m_pixmap[7][0]), 256 * 256); + save_pointer(NAME(m_pixmap[7][1]), 256 * 256); } VIDEO_START_MEMBER(dynax_state,mjdialq2) @@ -611,8 +611,8 @@ VIDEO_START_MEMBER(dynax_state,mjdialq2) dynax_common_reset(); m_layer_layout = LAYOUT_MJDIALQ2; - save_pointer(NAME(m_pixmap[0][0].get()), 256 * 256); - save_pointer(NAME(m_pixmap[1][0].get()), 256 * 256); + save_pointer(NAME(m_pixmap[0][0]), 256 * 256); + save_pointer(NAME(m_pixmap[1][0]), 256 * 256); } VIDEO_START_MEMBER(dynax_state,mjelctrn) diff --git a/src/mame/video/eolith.cpp b/src/mame/video/eolith.cpp index 2df768faaef..a1d4cc94fc0 100644 --- a/src/mame/video/eolith.cpp +++ b/src/mame/video/eolith.cpp @@ -24,7 +24,7 @@ READ16_MEMBER(eolith_state::eolith_vram_r) VIDEO_START_MEMBER(eolith_state,eolith) { m_vram = std::make_unique(0x40000); - save_pointer(NAME(m_vram.get()), 0x40000); + save_pointer(NAME(m_vram), 0x40000); save_item(NAME(m_buffer)); } diff --git a/src/mame/video/equites.cpp b/src/mame/video/equites.cpp index 66e366a9632..6df9a32706a 100644 --- a/src/mame/video/equites.cpp +++ b/src/mame/video/equites.cpp @@ -120,7 +120,7 @@ TILE_GET_INFO_MEMBER(splndrbt_state::splndrbt_bg_info) VIDEO_START_MEMBER(equites_state,equites) { m_fg_videoram = std::make_unique(0x800); - save_pointer(NAME(m_fg_videoram.get()), 0x800); + save_pointer(NAME(m_fg_videoram), 0x800); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(equites_state::equites_fg_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); @@ -135,7 +135,7 @@ VIDEO_START_MEMBER(splndrbt_state,splndrbt) assert(m_screen->format() == BITMAP_FORMAT_IND16); m_fg_videoram = std::make_unique(0x800); - save_pointer(NAME(m_fg_videoram.get()), 0x800); + save_pointer(NAME(m_fg_videoram), 0x800); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(splndrbt_state::splndrbt_fg_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/esripsys.cpp b/src/mame/video/esripsys.cpp index acb00b3889d..b6b786aa084 100644 --- a/src/mame/video/esripsys.cpp +++ b/src/mame/video/esripsys.cpp @@ -133,13 +133,13 @@ void esripsys_state::video_start() } /* Register stuff for state saving */ - save_pointer(NAME(line_buffer[0].colour_buf.get()), 512); - save_pointer(NAME(line_buffer[0].intensity_buf.get()), 512); - save_pointer(NAME(line_buffer[0].priority_buf.get()), 512); + save_pointer(NAME(line_buffer[0].colour_buf), 512); + save_pointer(NAME(line_buffer[0].intensity_buf), 512); + save_pointer(NAME(line_buffer[0].priority_buf), 512); - save_pointer(NAME(line_buffer[1].colour_buf.get()), 512); - save_pointer(NAME(line_buffer[1].intensity_buf.get()), 512); - save_pointer(NAME(line_buffer[1].priority_buf.get()), 512); + save_pointer(NAME(line_buffer[1].colour_buf), 512); + save_pointer(NAME(line_buffer[1].intensity_buf), 512); + save_pointer(NAME(line_buffer[1].priority_buf), 512); save_item(NAME(m_video_firq)); save_item(NAME(m_bg_intensity)); diff --git a/src/mame/video/excellent_spr.cpp b/src/mame/video/excellent_spr.cpp index 7b5168563d0..41a8874b2f7 100644 --- a/src/mame/video/excellent_spr.cpp +++ b/src/mame/video/excellent_spr.cpp @@ -32,7 +32,7 @@ excellent_spr_device::excellent_spr_device(const machine_config &mconfig, const void excellent_spr_device::device_start() { m_ram = make_unique_clear(0x1000); - save_pointer(NAME(m_ram.get()), 0x1000); + save_pointer(NAME(m_ram), 0x1000); } diff --git a/src/mame/video/exerion.cpp b/src/mame/video/exerion.cpp index 1e3b0d1d6b8..370063bf5e6 100644 --- a/src/mame/video/exerion.cpp +++ b/src/mame/video/exerion.cpp @@ -117,10 +117,10 @@ void exerion_state::video_start() m_background_gfx[2] = std::make_unique(256 * 256); m_background_gfx[3] = std::make_unique(256 * 256); - save_pointer(NAME(m_background_gfx[0].get()), 256 * 256); - save_pointer(NAME(m_background_gfx[1].get()), 256 * 256); - save_pointer(NAME(m_background_gfx[2].get()), 256 * 256); - save_pointer(NAME(m_background_gfx[3].get()), 256 * 256); + save_pointer(NAME(m_background_gfx[0]), 256 * 256); + save_pointer(NAME(m_background_gfx[1]), 256 * 256); + save_pointer(NAME(m_background_gfx[2]), 256 * 256); + save_pointer(NAME(m_background_gfx[3]), 256 * 256); /*--------------------------------- * Decode the background graphics diff --git a/src/mame/video/fromanc2.cpp b/src/mame/video/fromanc2.cpp index 2eac256be6b..04e3e7601f9 100644 --- a/src/mame/video/fromanc2.cpp +++ b/src/mame/video/fromanc2.cpp @@ -277,14 +277,14 @@ VIDEO_START_MEMBER(fromanc2_state,fromanc2) } } - save_pointer(NAME(m_videoram[0][0].get()), (64 * 64)); - save_pointer(NAME(m_videoram[0][1].get()), (64 * 64)); - save_pointer(NAME(m_videoram[0][2].get()), (64 * 64)); - save_pointer(NAME(m_videoram[0][3].get()), (64 * 64)); - save_pointer(NAME(m_videoram[1][0].get()), (64 * 64)); - save_pointer(NAME(m_videoram[1][1].get()), (64 * 64)); - save_pointer(NAME(m_videoram[1][2].get()), (64 * 64)); - save_pointer(NAME(m_videoram[1][3].get()), (64 * 64)); + save_pointer(NAME(m_videoram[0][0]), (64 * 64)); + save_pointer(NAME(m_videoram[0][1]), (64 * 64)); + save_pointer(NAME(m_videoram[0][2]), (64 * 64)); + save_pointer(NAME(m_videoram[0][3]), (64 * 64)); + save_pointer(NAME(m_videoram[1][0]), (64 * 64)); + save_pointer(NAME(m_videoram[1][1]), (64 * 64)); + save_pointer(NAME(m_videoram[1][2]), (64 * 64)); + save_pointer(NAME(m_videoram[1][3]), (64 * 64)); save_item(NAME(m_scrollx[0])); save_item(NAME(m_scrollx[1])); save_item(NAME(m_scrolly[0])); @@ -315,12 +315,12 @@ VIDEO_START_MEMBER(fromanc2_state,fromancr) } } - save_pointer(NAME(m_videoram[0][0].get()), (64 * 64)); - save_pointer(NAME(m_videoram[0][1].get()), (64 * 64)); - save_pointer(NAME(m_videoram[0][2].get()), (64 * 64)); - save_pointer(NAME(m_videoram[1][0].get()), (64 * 64)); - save_pointer(NAME(m_videoram[1][1].get()), (64 * 64)); - save_pointer(NAME(m_videoram[1][2].get()), (64 * 64)); + save_pointer(NAME(m_videoram[0][0]), (64 * 64)); + save_pointer(NAME(m_videoram[0][1]), (64 * 64)); + save_pointer(NAME(m_videoram[0][2]), (64 * 64)); + save_pointer(NAME(m_videoram[1][0]), (64 * 64)); + save_pointer(NAME(m_videoram[1][1]), (64 * 64)); + save_pointer(NAME(m_videoram[1][2]), (64 * 64)); save_item(NAME(m_scrollx[0])); save_item(NAME(m_scrollx[1])); save_item(NAME(m_scrolly[0])); @@ -351,12 +351,12 @@ VIDEO_START_MEMBER(fromanc2_state,fromanc4) } } - save_pointer(NAME(m_videoram[0][0].get()), (256 * 64)); - save_pointer(NAME(m_videoram[0][1].get()), (256 * 64)); - save_pointer(NAME(m_videoram[0][2].get()), (256 * 64)); - save_pointer(NAME(m_videoram[1][0].get()), (256 * 64)); - save_pointer(NAME(m_videoram[1][1].get()), (256 * 64)); - save_pointer(NAME(m_videoram[1][2].get()), (256 * 64)); + save_pointer(NAME(m_videoram[0][0]), (256 * 64)); + save_pointer(NAME(m_videoram[0][1]), (256 * 64)); + save_pointer(NAME(m_videoram[0][2]), (256 * 64)); + save_pointer(NAME(m_videoram[1][0]), (256 * 64)); + save_pointer(NAME(m_videoram[1][1]), (256 * 64)); + save_pointer(NAME(m_videoram[1][2]), (256 * 64)); save_item(NAME(m_scrollx[0])); save_item(NAME(m_scrollx[1])); save_item(NAME(m_scrolly[0])); diff --git a/src/mame/video/fromance.cpp b/src/mame/video/fromance.cpp index 06ffec1c4e2..eaad8257137 100644 --- a/src/mame/video/fromance.cpp +++ b/src/mame/video/fromance.cpp @@ -72,8 +72,8 @@ void fromance_state::init_common( ) /* state save */ save_item(NAME(m_selected_videoram)); - save_pointer(NAME(m_local_videoram[0].get()), 0x1000 * 3); - save_pointer(NAME(m_local_videoram[1].get()), 0x1000 * 3); + save_pointer(NAME(m_local_videoram[0]), 0x1000 * 3); + save_pointer(NAME(m_local_videoram[1]), 0x1000 * 3); save_item(NAME(m_selected_paletteram)); save_item(NAME(m_scrollx)); save_item(NAME(m_scrolly)); @@ -82,7 +82,7 @@ void fromance_state::init_common( ) save_item(NAME(m_flipscreen_old)); save_item(NAME(m_scrollx_ofs)); save_item(NAME(m_scrolly_ofs)); - save_pointer(NAME(m_local_paletteram.get()), 0x800 * 2); + save_pointer(NAME(m_local_paletteram), 0x800 * 2); } VIDEO_START_MEMBER(fromance_state,fromance) diff --git a/src/mame/video/fuukifg.cpp b/src/mame/video/fuukifg.cpp index 16a615750b4..848b7e41d61 100644 --- a/src/mame/video/fuukifg.cpp +++ b/src/mame/video/fuukifg.cpp @@ -27,9 +27,9 @@ void fuukivid_device::device_start() m_sprram_old = make_unique_clear(0x2000 / 2); m_sprram_old2 = make_unique_clear(0x2000 / 2); - save_pointer(NAME(m_sprram.get()), 0x2000 / 2); - save_pointer(NAME(m_sprram_old.get()), 0x2000 / 2); - save_pointer(NAME(m_sprram_old2.get()), 0x2000 / 2); + save_pointer(NAME(m_sprram), 0x2000 / 2); + save_pointer(NAME(m_sprram_old), 0x2000 / 2); + save_pointer(NAME(m_sprram_old2), 0x2000 / 2); } diff --git a/src/mame/video/gaelco3d.cpp b/src/mame/video/gaelco3d.cpp index 7769f6f36eb..614c6a679ce 100644 --- a/src/mame/video/gaelco3d.cpp +++ b/src/mame/video/gaelco3d.cpp @@ -75,8 +75,8 @@ void gaelco3d_state::video_start() /* save states */ - save_pointer(NAME(m_palette.get()), 32768); - save_pointer(NAME(m_polydata_buffer.get()), MAX_POLYDATA); + save_pointer(NAME(m_palette), 32768); + save_pointer(NAME(m_polydata_buffer), MAX_POLYDATA); save_item(NAME(m_polydata_count)); save_item(NAME(m_lastscan)); } diff --git a/src/mame/video/gameplan.cpp b/src/mame/video/gameplan.cpp index 6f15aad5be3..d1d4496d06f 100644 --- a/src/mame/video/gameplan.cpp +++ b/src/mame/video/gameplan.cpp @@ -273,7 +273,7 @@ VIDEO_START_MEMBER(gameplan_state,common) m_via_0_ca1_timer = timer_alloc(TIMER_VIA_0_CAL); /* register for save states */ - save_pointer(NAME(m_videoram.get()), m_videoram_size); + save_pointer(NAME(m_videoram), m_videoram_size); } diff --git a/src/mame/video/goal92.cpp b/src/mame/video/goal92.cpp index 006c6d04a23..87f4d0cba84 100644 --- a/src/mame/video/goal92.cpp +++ b/src/mame/video/goal92.cpp @@ -137,7 +137,7 @@ void goal92_state::video_start() m_tx_layer = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(goal92_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_buffered_spriteram = std::make_unique(0x400 * 2); - save_pointer(NAME(m_buffered_spriteram.get()), 0x400 * 2); + save_pointer(NAME(m_buffered_spriteram), 0x400 * 2); m_bg_layer->set_transparent_pen(15); m_fg_layer->set_transparent_pen(15); diff --git a/src/mame/video/gp9001.cpp b/src/mame/video/gp9001.cpp index 37f8839d818..024e1b553e2 100644 --- a/src/mame/video/gp9001.cpp +++ b/src/mame/video/gp9001.cpp @@ -263,7 +263,7 @@ void gp9001vdp_device::device_start() m_raise_irq_timer = timer_alloc(TIMER_RAISE_IRQ); - save_pointer(NAME(sp.vram16_buffer.get()), SPRITERAM_SIZE/2); + save_pointer(NAME(sp.vram16_buffer), SPRITERAM_SIZE/2); save_item(NAME(gp9001_scroll_reg)); save_item(NAME(gp9001_voffs)); diff --git a/src/mame/video/gridlee.cpp b/src/mame/video/gridlee.cpp index 07e5cac92b7..80cbfeae5f1 100644 --- a/src/mame/video/gridlee.cpp +++ b/src/mame/video/gridlee.cpp @@ -68,7 +68,7 @@ void gridlee_state::video_start() /* reset the palette */ m_palettebank_vis = 0; - save_pointer(NAME(m_local_videoram.get()), 256 * 256); + save_pointer(NAME(m_local_videoram), 256 * 256); save_item(NAME(m_cocktail_flip)); save_item(NAME(m_palettebank_vis)); machine().save().register_postload(save_prepost_delegate(FUNC(gridlee_state::expand_pixels), this)); diff --git a/src/mame/video/gstriker.cpp b/src/mame/video/gstriker.cpp index 29b481fccde..a77d9a2dbb4 100644 --- a/src/mame/video/gstriker.cpp +++ b/src/mame/video/gstriker.cpp @@ -17,8 +17,8 @@ void gstriker_state::video_start() m_buffered_spriteram = std::make_unique(0x2000); m_buffered_spriteram2 = std::make_unique(0x2000); - save_pointer(NAME(m_buffered_spriteram.get()), 0x2000); - save_pointer(NAME(m_buffered_spriteram2.get()), 0x2000); + save_pointer(NAME(m_buffered_spriteram), 0x2000); + save_pointer(NAME(m_buffered_spriteram2), 0x2000); } WRITE_LINE_MEMBER(gstriker_state::screen_vblank) diff --git a/src/mame/video/hnayayoi.cpp b/src/mame/video/hnayayoi.cpp index 3de4f445f74..6744d94835c 100644 --- a/src/mame/video/hnayayoi.cpp +++ b/src/mame/video/hnayayoi.cpp @@ -19,7 +19,7 @@ void hnayayoi_state::common_vh_start( int num_pixmaps ) for (int i = 0; i < num_pixmaps; i++) { m_pixmap[i] = make_unique_clear(256 * 256); - save_pointer(NAME(m_pixmap[i].get()), 256 * 256, i); + save_pointer(NAME(m_pixmap[i]), 256 * 256, i); } } diff --git a/src/mame/video/itech32.cpp b/src/mame/video/itech32.cpp index 4dc9f95faf4..2f75302d132 100644 --- a/src/mame/video/itech32.cpp +++ b/src/mame/video/itech32.cpp @@ -206,7 +206,7 @@ void itech32_state::video_start() save_item(NAME(m_grom_bank)); save_item(NAME(m_color_latch)); save_item(NAME(m_enable_latch)); - save_pointer(NAME(m_videoram.get()), VRAM_WIDTH * (m_vram_height + 16) * 2); + save_pointer(NAME(m_videoram), VRAM_WIDTH * (m_vram_height + 16) * 2); } diff --git a/src/mame/video/jalblend.cpp b/src/mame/video/jalblend.cpp index 650bd99a8f2..2a87c5651a9 100644 --- a/src/mame/video/jalblend.cpp +++ b/src/mame/video/jalblend.cpp @@ -38,7 +38,7 @@ void jaleco_blend_device::device_start() { m_table = make_unique_clear(0xc00); - save_pointer(NAME(m_table.get()), 0xc00); + save_pointer(NAME(m_table), 0xc00); } //------------------------------------------------- diff --git a/src/mame/video/k001005.cpp b/src/mame/video/k001005.cpp index a64d40a93c7..b3b7420a54a 100644 --- a/src/mame/video/k001005.cpp +++ b/src/mame/video/k001005.cpp @@ -57,7 +57,7 @@ k001005_renderer::k001005_renderer(device_t &parent, screen_device &screen, devi } // save state - parent.save_pointer(NAME(m_3dfifo.get()), 0x10000); + parent.save_pointer(NAME(m_3dfifo), 0x10000); parent.save_item(NAME(m_3dfifo_ptr)); parent.save_item(NAME(*m_fb[0])); parent.save_item(NAME(*m_fb[1])); @@ -1210,9 +1210,9 @@ void k001005_device::device_start() m_renderer = auto_alloc(machine(), k001005_renderer(*this, screen(), m_k001006)); - save_pointer(NAME(m_ram[0].get()), 0x140000); - save_pointer(NAME(m_ram[1].get()), 0x140000); - save_pointer(NAME(m_fifo.get()), 0x800); + save_pointer(NAME(m_ram[0]), 0x140000); + save_pointer(NAME(m_ram[1]), 0x140000); + save_pointer(NAME(m_fifo), 0x800); save_item(NAME(m_status)); save_item(NAME(m_ram_ptr)); save_item(NAME(m_fifo_read_ptr)); diff --git a/src/mame/video/k001006.cpp b/src/mame/video/k001006.cpp index 6ce7d0039a1..efc6c4b821b 100644 --- a/src/mame/video/k001006.cpp +++ b/src/mame/video/k001006.cpp @@ -40,9 +40,9 @@ void k001006_device::device_start() preprocess_texture_data(m_texrom.get(), m_gfxrom, 0x800000, m_tex_layout); - save_pointer(NAME(m_pal_ram.get()), 0x800*sizeof(uint16_t)); - save_pointer(NAME(m_unknown_ram.get()), 0x1000*sizeof(uint16_t)); - save_pointer(NAME(m_palette.get()), 0x800*sizeof(uint32_t)); + save_pointer(NAME(m_pal_ram), 0x800*sizeof(uint16_t)); + save_pointer(NAME(m_unknown_ram), 0x1000*sizeof(uint16_t)); + save_pointer(NAME(m_palette), 0x800*sizeof(uint32_t)); save_item(NAME(m_device_sel)); save_item(NAME(m_addr)); } diff --git a/src/mame/video/k001604.cpp b/src/mame/video/k001604.cpp index 40c444f893f..938c4127ea4 100644 --- a/src/mame/video/k001604.cpp +++ b/src/mame/video/k001604.cpp @@ -92,9 +92,9 @@ void k001604_device::device_start() set_gfx(0, std::make_unique(&palette(), k001604_char_layout_layer_8x8, (uint8_t*)&m_char_ram[0], 0, palette().entries() / 16, 0)); set_gfx(1, std::make_unique(&palette(), k001604_char_layout_layer_16x16, (uint8_t*)&m_char_ram[0], 0, palette().entries() / 16, 0)); - save_pointer(NAME(m_reg.get()), 0x400 / 4); - save_pointer(NAME(m_char_ram.get()), 0x200000 / 4); - save_pointer(NAME(m_tile_ram.get()), 0x20000 / 4); + save_pointer(NAME(m_reg), 0x400 / 4); + save_pointer(NAME(m_char_ram), 0x200000 / 4); + save_pointer(NAME(m_tile_ram), 0x20000 / 4); } diff --git a/src/mame/video/k007342.cpp b/src/mame/video/k007342.cpp index 337013abae6..5909970e272 100644 --- a/src/mame/video/k007342.cpp +++ b/src/mame/video/k007342.cpp @@ -82,8 +82,8 @@ void k007342_device::device_start() m_tilemap[0]->set_transparent_pen(0); m_tilemap[1]->set_transparent_pen(0); - save_pointer(NAME(m_ram.get()), 0x2000); - save_pointer(NAME(m_scroll_ram.get()), 0x0200); + save_pointer(NAME(m_ram), 0x2000); + save_pointer(NAME(m_scroll_ram), 0x0200); save_item(NAME(m_int_enabled)); save_item(NAME(m_flipscreen)); save_item(NAME(m_scrollx)); diff --git a/src/mame/video/k007420.cpp b/src/mame/video/k007420.cpp index f90b8551c07..ba3942df7b2 100644 --- a/src/mame/video/k007420.cpp +++ b/src/mame/video/k007420.cpp @@ -42,7 +42,7 @@ void k007420_device::device_start() m_ram = make_unique_clear(0x200); - save_pointer(NAME(m_ram.get()), 0x200); + save_pointer(NAME(m_ram), 0x200); save_item(NAME(m_flipscreen)); // current one uses 7342 one save_item(NAME(m_regs)); // current one uses 7342 ones } diff --git a/src/mame/video/k037122.cpp b/src/mame/video/k037122.cpp index 7106a23f0cd..a5294904886 100644 --- a/src/mame/video/k037122.cpp +++ b/src/mame/video/k037122.cpp @@ -59,9 +59,9 @@ void k037122_device::device_start() set_gfx(m_gfx_index,std::make_unique(&palette(), k037122_char_layout, (uint8_t*)m_char_ram.get(), 0, palette().entries() / 16, 0)); - save_pointer(NAME(m_reg.get()), 0x400 / 4); - save_pointer(NAME(m_char_ram.get()), 0x200000 / 4); - save_pointer(NAME(m_tile_ram.get()), 0x20000 / 4); + save_pointer(NAME(m_reg), 0x400 / 4); + save_pointer(NAME(m_char_ram), 0x200000 / 4); + save_pointer(NAME(m_tile_ram), 0x20000 / 4); } diff --git a/src/mame/video/k051960.cpp b/src/mame/video/k051960.cpp index 9a922bde19b..fa0ec384e35 100644 --- a/src/mame/video/k051960.cpp +++ b/src/mame/video/k051960.cpp @@ -205,7 +205,7 @@ void k051960_device::device_start() save_item(NAME(m_readroms)); save_item(NAME(m_nmi_enabled)); save_item(NAME(m_spriterombank)); - save_pointer(NAME(m_ram.get()), 0x400); + save_pointer(NAME(m_ram), 0x400); } //------------------------------------------------- diff --git a/src/mame/video/k052109.cpp b/src/mame/video/k052109.cpp index de9c8fcd5b8..0d4d4dee964 100644 --- a/src/mame/video/k052109.cpp +++ b/src/mame/video/k052109.cpp @@ -244,7 +244,7 @@ void k052109_device::device_start() m_firq_handler.resolve_safe(); m_nmi_handler.resolve_safe(); - save_pointer(NAME(m_ram.get()), 0x6000); + save_pointer(NAME(m_ram), 0x6000); save_item(NAME(m_rmrd_line)); save_item(NAME(m_romsubbank)); save_item(NAME(m_scrollctrl)); diff --git a/src/mame/video/k053244_k053245.cpp b/src/mame/video/k053244_k053245.cpp index dbbd859e65b..45d11d92133 100644 --- a/src/mame/video/k053244_k053245.cpp +++ b/src/mame/video/k053244_k053245.cpp @@ -137,8 +137,8 @@ void k05324x_device::device_start() // bind callbacks m_k05324x_cb.bind_relative_to(*owner()); - save_pointer(NAME(m_ram.get()), m_ramsize / 2); - save_pointer(NAME(m_buffer.get()), m_ramsize / 2); + save_pointer(NAME(m_ram), m_ramsize / 2); + save_pointer(NAME(m_buffer), m_ramsize / 2); save_item(NAME(m_rombank)); save_item(NAME(m_z_rejection)); save_item(NAME(m_regs)); diff --git a/src/mame/video/k053246_k053247_k055673.cpp b/src/mame/video/k053246_k053247_k055673.cpp index 06168cdf99e..5dd281afc7d 100644 --- a/src/mame/video/k053246_k053247_k055673.cpp +++ b/src/mame/video/k053246_k053247_k055673.cpp @@ -1052,7 +1052,7 @@ void k055673_device::device_start() memset(m_kx46_regs, 0, 8); memset(m_kx47_regs, 0, 32); - save_pointer(NAME(m_ram.get()), 0x800); + save_pointer(NAME(m_ram), 0x800); save_item(NAME(m_kx46_regs)); save_item(NAME(m_kx47_regs)); save_item(NAME(m_objcha_line)); @@ -1134,7 +1134,7 @@ void k053247_device::device_start() m_ram = make_unique_clear(0x1000 / 2); - save_pointer(NAME(m_ram.get()), 0x1000 / 2); + save_pointer(NAME(m_ram), 0x1000 / 2); save_item(NAME(m_kx46_regs)); save_item(NAME(m_kx47_regs)); save_item(NAME(m_objcha_line)); diff --git a/src/mame/video/k053936.cpp b/src/mame/video/k053936.cpp index 429d033084d..93bdeff4233 100644 --- a/src/mame/video/k053936.cpp +++ b/src/mame/video/k053936.cpp @@ -248,8 +248,8 @@ void k053936_device::device_start() m_ctrl = make_unique_clear(0x20); m_linectrl = make_unique_clear(0x4000); - save_pointer(NAME(m_ctrl.get()), 0x20); - save_pointer(NAME(m_linectrl.get()), 0x4000); + save_pointer(NAME(m_ctrl), 0x20); + save_pointer(NAME(m_linectrl), 0x4000); } //------------------------------------------------- diff --git a/src/mame/video/k1ge.cpp b/src/mame/video/k1ge.cpp index b70ded9bbd2..3c24f92264b 100644 --- a/src/mame/video/k1ge.cpp +++ b/src/mame/video/k1ge.cpp @@ -806,7 +806,7 @@ void k1ge_device::device_start() m_vram = make_unique_clear(0x4000); m_bitmap = std::make_unique(screen().width(), screen().height() ); - save_pointer(NAME(m_vram.get()), 0x4000); + save_pointer(NAME(m_vram), 0x4000); save_item(NAME(m_wba_h)); save_item(NAME(m_wba_v)); save_item(NAME(m_wsi_h)); diff --git a/src/mame/video/kan_pand.cpp b/src/mame/video/kan_pand.cpp index c3852d9e674..6687edeccc0 100644 --- a/src/mame/video/kan_pand.cpp +++ b/src/mame/video/kan_pand.cpp @@ -81,7 +81,7 @@ void kaneko_pandora_device::device_start() save_item(NAME(m_clear_bitmap)); save_item(NAME(m_bg_pen)); save_item(NAME(m_flip_screen)); - save_pointer(NAME(m_spriteram.get()), 0x1000); + save_pointer(NAME(m_spriteram), 0x1000); save_item(NAME(*m_sprites_bitmap)); } diff --git a/src/mame/video/kaneko_grap2.cpp b/src/mame/video/kaneko_grap2.cpp index af0d0bf16ce..5b697f0225c 100644 --- a/src/mame/video/kaneko_grap2.cpp +++ b/src/mame/video/kaneko_grap2.cpp @@ -53,10 +53,10 @@ void kaneko_grap2_device::device_start() m_framebuffer_unk1 = make_unique_clear(0x400/2); m_framebuffer_unk2 = make_unique_clear(0x400/2); - save_pointer(NAME(m_framebuffer.get()), 0x80000/2); - save_pointer(NAME(m_framebuffer_palette.get()), 0x101); - save_pointer(NAME(m_framebuffer_unk1.get()), 0x400/2); - save_pointer(NAME(m_framebuffer_unk2.get()), 0x400/2); + save_pointer(NAME(m_framebuffer), 0x80000/2); + save_pointer(NAME(m_framebuffer_palette), 0x101); + save_pointer(NAME(m_framebuffer_unk1), 0x400/2); + save_pointer(NAME(m_framebuffer_unk2), 0x400/2); save_item(NAME(m_framebuffer_scrolly)); save_item(NAME(m_framebuffer_scrollx)); diff --git a/src/mame/video/kaneko_spr.cpp b/src/mame/video/kaneko_spr.cpp index 27e468340b8..3bbd42920c0 100644 --- a/src/mame/video/kaneko_spr.cpp +++ b/src/mame/video/kaneko_spr.cpp @@ -71,7 +71,7 @@ void kaneko16_sprite_device::device_start() save_item(NAME(m_sprite_flipx)); save_item(NAME(m_sprite_flipy)); - save_pointer(NAME(m_sprites_regs.get()), 0x20/2); + save_pointer(NAME(m_sprites_regs), 0x20/2); save_item(NAME(m_keep_sprites)); save_item(NAME(m_sprites_bitmap)); } diff --git a/src/mame/video/kaneko_tmap.cpp b/src/mame/video/kaneko_tmap.cpp index 4a155defad7..ab94806d25d 100644 --- a/src/mame/video/kaneko_tmap.cpp +++ b/src/mame/video/kaneko_tmap.cpp @@ -150,11 +150,11 @@ void kaneko_view2_tilemap_device::device_start() m_tmap[0]->set_scrolldy(-m_dy, m_ydim + m_dy -1 ); m_tmap[1]->set_scrolldy(-m_dy, m_ydim + m_dy -1 ); - save_pointer(NAME(m_vram[0].get()), 0x1000/2); - save_pointer(NAME(m_vram[1].get()), 0x1000/2); - save_pointer(NAME(m_vscroll[0].get()), 0x1000/2); - save_pointer(NAME(m_vscroll[1].get()), 0x1000/2); - save_pointer(NAME(m_regs.get()), 0x20/2); + save_pointer(NAME(m_vram[0]), 0x1000/2); + save_pointer(NAME(m_vram[1]), 0x1000/2); + save_pointer(NAME(m_vscroll[0]), 0x1000/2); + save_pointer(NAME(m_vscroll[1]), 0x1000/2); + save_pointer(NAME(m_regs), 0x20/2); save_item(NAME(m_vram_tile_addition[0])); save_item(NAME(m_vram_tile_addition[1])); } diff --git a/src/mame/video/kangaroo.cpp b/src/mame/video/kangaroo.cpp index 93ad46ed797..f8ce9c49314 100644 --- a/src/mame/video/kangaroo.cpp +++ b/src/mame/video/kangaroo.cpp @@ -19,7 +19,7 @@ void kangaroo_state::video_start() { /* video RAM is accessed 32 bits at a time (two planes, 4bpp each, 4 pixels) */ m_videoram = std::make_unique(256 * 64); - save_pointer(NAME(m_videoram.get()), 256 * 64); + save_pointer(NAME(m_videoram), 256 * 64); } diff --git a/src/mame/video/ladybug.cpp b/src/mame/video/ladybug.cpp index 718879683da..13c64dda857 100644 --- a/src/mame/video/ladybug.cpp +++ b/src/mame/video/ladybug.cpp @@ -105,8 +105,8 @@ void ladybug_video_device::device_start() m_bg_tilemap->set_scroll_rows(32); m_bg_tilemap->set_transparent_pen(0); - save_pointer(NAME(m_spr_ram.get()), 0x0400); - save_pointer(NAME(m_bg_ram.get()), 0x0800); + save_pointer(NAME(m_spr_ram), 0x0400); + save_pointer(NAME(m_bg_ram), 0x0800); } TILE_GET_INFO_MEMBER(ladybug_video_device::get_bg_tile_info) diff --git a/src/mame/video/ladyfrog.cpp b/src/mame/video/ladyfrog.cpp index 3dae84121f8..d36c5e72408 100644 --- a/src/mame/video/ladyfrog.cpp +++ b/src/mame/video/ladyfrog.cpp @@ -137,7 +137,7 @@ VIDEO_START_MEMBER(ladyfrog_state,ladyfrog_common) m_bg_tilemap->set_scroll_cols(32); m_bg_tilemap->set_scrolldy(15, 15); - save_pointer(NAME(m_spriteram.get()), 160); + save_pointer(NAME(m_spriteram), 160); save_item(NAME(m_paletteram)); save_item(NAME(m_paletteram_ext)); } diff --git a/src/mame/video/legionna.cpp b/src/mame/video/legionna.cpp index 1e234d8a823..7d871730d2e 100644 --- a/src/mame/video/legionna.cpp +++ b/src/mame/video/legionna.cpp @@ -229,12 +229,12 @@ void legionna_state::common_video_allocate_ptr() m_sprite_xoffs = 0; m_sprite_yoffs = 0; - save_pointer(NAME(m_back_data.get()), 0x800/2); - save_pointer(NAME(m_fore_data.get()), 0x800/2); - save_pointer(NAME(m_mid_data.get()), 0x800/2); - save_pointer(NAME(m_textram.get()), 0x1000/2); - save_pointer(NAME(m_scrollram16.get()), 0x60/2); - save_pointer(NAME(m_paletteram.get()), 0x1000/2); + save_pointer(NAME(m_back_data), 0x800/2); + save_pointer(NAME(m_fore_data), 0x800/2); + save_pointer(NAME(m_mid_data), 0x800/2); + save_pointer(NAME(m_textram), 0x1000/2); + save_pointer(NAME(m_scrollram16), 0x60/2); + save_pointer(NAME(m_paletteram), 0x1000/2); save_item(NAME(m_back_gfx_bank)); save_item(NAME(m_mid_gfx_bank)); diff --git a/src/mame/video/leland.cpp b/src/mame/video/leland.cpp index dd0bca45bc0..d0dedd09e74 100644 --- a/src/mame/video/leland.cpp +++ b/src/mame/video/leland.cpp @@ -106,7 +106,7 @@ void leland_state::video_start() m_scanline_timer->adjust(m_screen->time_until_pos(0)); save_item(NAME(m_gfx_control)); - save_pointer(NAME(m_video_ram.get()), VRAM_SIZE); + save_pointer(NAME(m_video_ram), VRAM_SIZE); save_item(NAME(m_xscroll)); save_item(NAME(m_yscroll)); save_item(NAME(m_gfxbank)); @@ -130,8 +130,8 @@ void ataxx_state::video_start() /* allocate memory */ m_ataxx_qram = make_unique_clear(QRAM_SIZE); - save_pointer(NAME(m_video_ram.get()), VRAM_SIZE); - save_pointer(NAME(m_ataxx_qram.get()), QRAM_SIZE); + save_pointer(NAME(m_video_ram), VRAM_SIZE); + save_pointer(NAME(m_ataxx_qram), QRAM_SIZE); save_item(NAME(m_xscroll)); save_item(NAME(m_yscroll)); for (uint8_t i = 0; i < 2; i++) diff --git a/src/mame/video/lemmings.cpp b/src/mame/video/lemmings.cpp index 0116ed0429f..70d13de215a 100644 --- a/src/mame/video/lemmings.cpp +++ b/src/mame/video/lemmings.cpp @@ -48,9 +48,9 @@ void lemmings_state::video_start() m_sprite_triple_buffer[1] = make_unique_clear(0x800/2); save_item(NAME(m_bitmap0)); - save_pointer(NAME(m_vram_buffer.get()), 2048 * 64); - save_pointer(NAME(m_sprite_triple_buffer[0].get()), 0x800/2, 0); - save_pointer(NAME(m_sprite_triple_buffer[1].get()), 0x800/2, 1); + save_pointer(NAME(m_vram_buffer), 2048 * 64); + save_pointer(NAME(m_sprite_triple_buffer[0]), 0x800/2, 0); + save_pointer(NAME(m_sprite_triple_buffer[1]), 0x800/2, 1); } WRITE_LINE_MEMBER(lemmings_state::screen_vblank_lemmings) diff --git a/src/mame/video/liberate.cpp b/src/mame/video/liberate.cpp index a0b55e4eb12..618d0f29f81 100644 --- a/src/mame/video/liberate.cpp +++ b/src/mame/video/liberate.cpp @@ -212,7 +212,7 @@ VIDEO_START_MEMBER(liberate_state,prosoccr) m_fg_gfx = memregion("fg_gfx")->base(); m_charram = std::make_unique(0x1800 * 2); - save_pointer(NAME(m_charram.get()), 0x1800 * 2); + save_pointer(NAME(m_charram), 0x1800 * 2); save_pointer(NAME(m_fg_gfx), 0x6000); } diff --git a/src/mame/video/lockon.cpp b/src/mame/video/lockon.cpp index 38d7f7f0326..ce93ebc96f9 100644 --- a/src/mame/video/lockon.cpp +++ b/src/mame/video/lockon.cpp @@ -906,7 +906,7 @@ void lockon_state::video_start() save_item(NAME(*m_back_buffer)); save_item(NAME(*m_front_buffer)); - save_pointer(NAME(m_obj_pal_ram.get()), 2048); + save_pointer(NAME(m_obj_pal_ram), 2048); } uint32_t lockon_state::screen_update_lockon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/m107.cpp b/src/mame/video/m107.cpp index e384a585964..b9d637fe80a 100644 --- a/src/mame/video/m107.cpp +++ b/src/mame/video/m107.cpp @@ -148,7 +148,7 @@ void m107_state::video_start() save_item(NAME(m_sprite_display)); save_item(NAME(m_raster_irq_position)); save_item(NAME(m_control)); - save_pointer(NAME(m_buffered_spriteram.get()), 0x1000/2); + save_pointer(NAME(m_buffered_spriteram), 0x1000/2); for (int i = 0; i < 4; i++) { diff --git a/src/mame/video/m72.cpp b/src/mame/video/m72.cpp index 4fd2c3498b3..6cc92c031c6 100644 --- a/src/mame/video/m72.cpp +++ b/src/mame/video/m72.cpp @@ -106,7 +106,7 @@ void m72_state::register_savestate() save_item(NAME(m_scrolly1)); save_item(NAME(m_scrollx2)); save_item(NAME(m_scrolly2)); - save_pointer(NAME(m_buffered_spriteram.get()), m_spriteram.bytes()/2); + save_pointer(NAME(m_buffered_spriteram), m_spriteram.bytes()/2); } diff --git a/src/mame/video/macrossp.cpp b/src/mame/video/macrossp.cpp index 9cac1274daa..6658441b966 100644 --- a/src/mame/video/macrossp.cpp +++ b/src/mame/video/macrossp.cpp @@ -183,8 +183,8 @@ void macrossp_state::video_start() m_gfxdecode->gfx(2)->set_granularity(64); m_gfxdecode->gfx(3)->set_granularity(64); - save_pointer(NAME(m_spriteram_old.get()), m_spriteram.bytes() / 4); - save_pointer(NAME(m_spriteram_old2.get()), m_spriteram.bytes() / 4); + save_pointer(NAME(m_spriteram_old), m_spriteram.bytes() / 4); + save_pointer(NAME(m_spriteram_old2), m_spriteram.bytes() / 4); } diff --git a/src/mame/video/mb60553.cpp b/src/mame/video/mb60553.cpp index c9676a60f29..894c7e91710 100644 --- a/src/mame/video/mb60553.cpp +++ b/src/mame/video/mb60553.cpp @@ -42,8 +42,8 @@ void mb60553_zooming_tilemap_device::device_start() m_lineram = make_unique_clear(0x1000/2); m_vram = make_unique_clear(0x4000/2); - save_pointer(NAME(m_lineram.get()), 0x1000/2); - save_pointer(NAME(m_vram.get()), 0x4000/2); + save_pointer(NAME(m_lineram), 0x1000/2); + save_pointer(NAME(m_vram), 0x4000/2); save_item(NAME(m_pal_base)); save_item(NAME(m_bank)); save_item(NAME(m_regs)); diff --git a/src/mame/video/mcatadv.cpp b/src/mame/video/mcatadv.cpp index db636e1386f..30c6dd35c55 100644 --- a/src/mame/video/mcatadv.cpp +++ b/src/mame/video/mcatadv.cpp @@ -253,8 +253,8 @@ void mcatadv_state::video_start() m_palette_bank[0] = m_palette_bank[1] = 0; - save_pointer(NAME(m_spriteram_old.get()), m_spriteram.bytes() / 2); - save_pointer(NAME(m_vidregs_old.get()), m_vidregs.bytes() / 2); + save_pointer(NAME(m_spriteram_old), m_spriteram.bytes() / 2); + save_pointer(NAME(m_vidregs_old), m_vidregs.bytes() / 2); } WRITE_LINE_MEMBER(mcatadv_state::screen_vblank_mcatadv) diff --git a/src/mame/video/megasys1.cpp b/src/mame/video/megasys1.cpp index 13b99f9fd2f..5cd53bbea40 100644 --- a/src/mame/video/megasys1.cpp +++ b/src/mame/video/megasys1.cpp @@ -216,10 +216,10 @@ VIDEO_START_MEMBER(megasys1_state,megasys1) m_screen->register_screen_bitmap(m_sprite_buffer_bitmap); - save_pointer(NAME(m_buffer_objectram.get()), 0x2000); - save_pointer(NAME(m_buffer_spriteram16.get()), 0x2000); - save_pointer(NAME(m_buffer2_objectram.get()), 0x2000); - save_pointer(NAME(m_buffer2_spriteram16.get()), 0x2000); + save_pointer(NAME(m_buffer_objectram), 0x2000); + save_pointer(NAME(m_buffer_spriteram16), 0x2000); + save_pointer(NAME(m_buffer2_objectram), 0x2000); + save_pointer(NAME(m_buffer2_spriteram16), 0x2000); save_item(NAME(m_screen_flag)); save_item(NAME(m_active_layers)); save_item(NAME(m_sprite_flag)); diff --git a/src/mame/video/metlclsh.cpp b/src/mame/video/metlclsh.cpp index c1b77261b31..462452c4f8d 100644 --- a/src/mame/video/metlclsh.cpp +++ b/src/mame/video/metlclsh.cpp @@ -141,7 +141,7 @@ void metlclsh_state::video_start() m_bg_tilemap->set_transparent_pen(0); m_fg_tilemap->set_transparent_pen(0); - save_pointer(NAME(m_otherram.get()), 0x800); + save_pointer(NAME(m_otherram), 0x800); } diff --git a/src/mame/video/midtunit.cpp b/src/mame/video/midtunit.cpp index e060100015d..6e91baff868 100644 --- a/src/mame/video/midtunit.cpp +++ b/src/mame/video/midtunit.cpp @@ -106,7 +106,7 @@ VIDEO_START_MEMBER(midtunit_state,midtunit) /* register for state saving */ save_item(NAME(midtunit_control)); save_item(NAME(gfxbank_offset)); - save_pointer(NAME(local_videoram.get()), 0x100000/sizeof(local_videoram[0])); + save_pointer(NAME(local_videoram), 0x100000/sizeof(local_videoram[0])); save_item(NAME(videobank_select)); save_item(NAME(dma_register)); } diff --git a/src/mame/video/midyunit.cpp b/src/mame/video/midyunit.cpp index ba4052fbe76..9a6edb55e19 100644 --- a/src/mame/video/midyunit.cpp +++ b/src/mame/video/midyunit.cpp @@ -62,8 +62,8 @@ VIDEO_START_MEMBER(midyunit_state,common) /* register for state saving */ save_item(NAME(m_autoerase_enable)); - save_pointer(NAME(m_local_videoram.get()), 0x80000/2); - save_pointer(NAME(m_cmos_ram.get()), (0x2000 * 4)/2); + save_pointer(NAME(m_local_videoram), 0x80000/2); + save_pointer(NAME(m_cmos_ram), (0x2000 * 4)/2); save_item(NAME(m_videobank_select)); save_item(NAME(m_dma_register)); } diff --git a/src/mame/video/model1.cpp b/src/mame/video/model1.cpp index 65fe8bed3e6..2426dcbd3ae 100644 --- a/src/mame/video/model1.cpp +++ b/src/mame/video/model1.cpp @@ -1585,8 +1585,8 @@ VIDEO_START_MEMBER(model1_state, model1) m_clipfn[3].m_isclipped = &model1_state::fclip_isc_right; m_clipfn[3].m_clip = &model1_state::fclip_clip_right; - save_pointer(NAME(m_tgp_ram.get()), 0x100000-0x40000); - save_pointer(NAME(m_poly_ram.get()), 0x40000); + save_pointer(NAME(m_tgp_ram), 0x100000-0x40000); + save_pointer(NAME(m_poly_ram), 0x40000); save_item(NAME(m_listctl)); } diff --git a/src/mame/video/model2.cpp b/src/mame/video/model2.cpp index a43bffda5fe..e84d78bb020 100644 --- a/src/mame/video/model2.cpp +++ b/src/mame/video/model2.cpp @@ -2642,9 +2642,9 @@ void model2_state::video_start() save_item(NAME(m_render_test_mode)); save_item(NAME(m_render_unk)); save_item(NAME(m_render_mode)); - save_pointer(NAME(m_palram.get()), 0x4000/2); - save_pointer(NAME(m_colorxlat.get()), 0xc000/2); - save_pointer(NAME(m_lumaram.get()), 0x10000/2); + save_pointer(NAME(m_palram), 0x4000/2); + save_pointer(NAME(m_colorxlat), 0xc000/2); + save_pointer(NAME(m_lumaram), 0x10000/2); save_pointer(NAME(m_gamma_table), 256); } diff --git a/src/mame/video/nbmj8688.cpp b/src/mame/video/nbmj8688.cpp index 7e42b075668..9a2f3a88c8b 100644 --- a/src/mame/video/nbmj8688.cpp +++ b/src/mame/video/nbmj8688.cpp @@ -557,8 +557,8 @@ void nbmj8688_state::common_video_start() m_scrolly = 0; // reset because crystalg/crystal2 don't write to this register m_screen_refresh = 1; - save_pointer(NAME(m_videoram.get()), 512 * 256); - save_pointer(NAME(m_clut.get()), 0x20); + save_pointer(NAME(m_videoram), 512 * 256); + save_pointer(NAME(m_clut), 0x20); save_item(NAME(m_scrolly)); save_item(NAME(m_blitter_destx)); save_item(NAME(m_blitter_desty)); diff --git a/src/mame/video/nbmj8891.cpp b/src/mame/video/nbmj8891.cpp index f941d6c61bf..783b2ea6bae 100644 --- a/src/mame/video/nbmj8891.cpp +++ b/src/mame/video/nbmj8891.cpp @@ -528,7 +528,7 @@ void nbmj8891_state::video_start() m_screen_refresh = 1; common_save_state(); - save_pointer(NAME(m_videoram1.get()), width * height); + save_pointer(NAME(m_videoram1), width * height); } void nbmj8891_state::common_save_state() @@ -547,9 +547,9 @@ void nbmj8891_state::common_save_state() save_item(NAME(m_flipscreen)); save_item(NAME(m_clutsel)); save_item(NAME(m_gfxdraw_mode)); - save_pointer(NAME(m_videoram0.get()), m_screen->width() * m_screen->height()); - save_pointer(NAME(m_palette_ptr.get()), 0x200); - save_pointer(NAME(m_clut.get()), 0x800); + save_pointer(NAME(m_videoram0), m_screen->width() * m_screen->height()); + save_pointer(NAME(m_palette_ptr), 0x200); + save_pointer(NAME(m_clut), 0x800); save_item(NAME(m_flipscreen_old)); machine().save().register_postload(save_prepost_delegate(FUNC(nbmj8891_state::postload), this)); diff --git a/src/mame/video/nbmj8900.cpp b/src/mame/video/nbmj8900.cpp index eb1693d7896..92a250683a2 100644 --- a/src/mame/video/nbmj8900.cpp +++ b/src/mame/video/nbmj8900.cpp @@ -397,10 +397,10 @@ void nbmj8900_state::video_start() save_item(NAME(m_flipscreen)); save_item(NAME(m_clutsel)); //save_item(NAME(m_gfxdraw_mode)); //always 1? - save_pointer(NAME(m_videoram0.get()), m_screen_width * m_screen_height); - save_pointer(NAME(m_videoram1.get()), m_screen_width * m_screen_height); - save_pointer(NAME(m_palette_ptr.get()), 0x200); - save_pointer(NAME(m_clut.get()), 0x800); + save_pointer(NAME(m_videoram0), m_screen_width * m_screen_height); + save_pointer(NAME(m_videoram1), m_screen_width * m_screen_height); + save_pointer(NAME(m_palette_ptr), 0x200); + save_pointer(NAME(m_clut), 0x800); save_item(NAME(m_flipscreen_old)); } diff --git a/src/mame/video/nbmj8991.cpp b/src/mame/video/nbmj8991.cpp index f30184c2d21..2c192dbe8e1 100644 --- a/src/mame/video/nbmj8991.cpp +++ b/src/mame/video/nbmj8991.cpp @@ -313,8 +313,8 @@ void nbmj8991_state::video_start() save_item(NAME(m_dispflag)); save_item(NAME(m_flipscreen)); save_item(NAME(m_clutsel)); - save_pointer(NAME(m_videoram.get()), width * height); - save_pointer(NAME(m_clut.get()), 0x800); + save_pointer(NAME(m_videoram), width * height); + save_pointer(NAME(m_clut), 0x800); save_item(NAME(m_flipscreen_old)); machine().save().register_postload(save_prepost_delegate(FUNC(nbmj8991_state::postload), this)); diff --git a/src/mame/video/nbmj9195.cpp b/src/mame/video/nbmj9195.cpp index 828f18e646c..06d5cb5c6c8 100644 --- a/src/mame/video/nbmj9195.cpp +++ b/src/mame/video/nbmj9195.cpp @@ -401,8 +401,8 @@ VIDEO_START_MEMBER(nbmj9195_state,_1layer) save_item(NAME(m_gfxdraw_mode)); save_item(NAME(m_nb19010_busyctr)); save_item(NAME(m_nb19010_busyflag)); - save_pointer(NAME(m_videoram[0].get()), width * height); - save_pointer(NAME(m_clut[0].get()), 0x1000); + save_pointer(NAME(m_videoram[0]), width * height); + save_pointer(NAME(m_clut[0]), 0x1000); save_item(NAME(m_flipscreen_old)); machine().save().register_postload(save_prepost_delegate(FUNC(nbmj9195_state::postload), this)); } @@ -444,10 +444,10 @@ void nbmj9195_state::video_start() save_item(NAME(m_gfxdraw_mode)); save_item(NAME(m_nb19010_busyctr)); save_item(NAME(m_nb19010_busyflag)); - save_pointer(NAME(m_videoram[0].get()), width * height); - save_pointer(NAME(m_videoram[1].get()), width * height); - save_pointer(NAME(m_clut[0].get()), 0x1000); - save_pointer(NAME(m_clut[1].get()), 0x1000); + save_pointer(NAME(m_videoram[0]), width * height); + save_pointer(NAME(m_videoram[1]), width * height); + save_pointer(NAME(m_clut[0]), 0x1000); + save_pointer(NAME(m_clut[1]), 0x1000); save_item(NAME(m_flipscreen_old)); machine().save().register_postload(save_prepost_delegate(FUNC(nbmj9195_state::postload), this)); } @@ -467,8 +467,8 @@ VIDEO_START_MEMBER(nbmj9195_state,nb22090) m_videoworkram[0] = make_unique_clear(width * height); m_videoworkram[1] = make_unique_clear(width * height); - save_pointer(NAME(m_videoworkram[0].get()), width * height); - save_pointer(NAME(m_videoworkram[1].get()), width * height); + save_pointer(NAME(m_videoworkram[0]), width * height); + save_pointer(NAME(m_videoworkram[1]), width * height); m_gfxdraw_mode = 2; } diff --git a/src/mame/video/neogeo_spr.cpp b/src/mame/video/neogeo_spr.cpp index faa70356041..a53d09b871d 100644 --- a/src/mame/video/neogeo_spr.cpp +++ b/src/mame/video/neogeo_spr.cpp @@ -43,7 +43,7 @@ void neosprite_base_device::device_start() m_auto_animation_frame_counter = 0; /* register for state saving */ - save_pointer(NAME(m_videoram.get()), 0x8000 + 0x800); + save_pointer(NAME(m_videoram), 0x8000 + 0x800); save_item(NAME(m_vram_offset)); save_item(NAME(m_vram_read_buffer)); save_item(NAME(m_vram_modulo)); diff --git a/src/mame/video/newport.cpp b/src/mame/video/newport.cpp index 778049a721a..a62b5b70e0f 100644 --- a/src/mame/video/newport.cpp +++ b/src/mame/video/newport.cpp @@ -97,7 +97,7 @@ void newport_video_device::device_start() { m_base = make_unique_clear((1280+64) * (1024+64)); - save_pointer(NAME(m_base.get()), (1280+64) * (1024+64)); + save_pointer(NAME(m_base), (1280+64) * (1024+64)); save_item(NAME(m_VC2.nRegister)); save_item(NAME(m_VC2.nRAM)); save_item(NAME(m_VC2.nRegIdx)); diff --git a/src/mame/video/ninjakd2.cpp b/src/mame/video/ninjakd2.cpp index 2029c768487..54b8e92d988 100644 --- a/src/mame/video/ninjakd2.cpp +++ b/src/mame/video/ninjakd2.cpp @@ -117,7 +117,7 @@ void robokid_state::video_init_banked(uint32_t vram_alloc_size) { m_robokid_bg_videoram[i] = make_unique_clear(vram_alloc_size); - save_pointer(NAME(m_robokid_bg_videoram[i].get()), vram_alloc_size, i); + save_pointer(NAME(m_robokid_bg_videoram[i]), vram_alloc_size, i); } m_vram_bank_mask = (vram_alloc_size >> 10) - 1; } diff --git a/src/mame/video/niyanpai.cpp b/src/mame/video/niyanpai.cpp index e720dfebeb8..a590d466292 100644 --- a/src/mame/video/niyanpai.cpp +++ b/src/mame/video/niyanpai.cpp @@ -392,16 +392,16 @@ void niyanpai_state::video_start() save_item(NAME(m_nb19010_busyctr)); save_item(NAME(m_nb19010_busyflag)); save_item(NAME(m_flipscreen_old)); - save_pointer(NAME(m_palette_ptr.get()), 0x480); - save_pointer(NAME(m_videoram[0].get()), width * height); - save_pointer(NAME(m_videoram[1].get()), width * height); - save_pointer(NAME(m_videoram[2].get()), width * height); - save_pointer(NAME(m_videoworkram[0].get()), width * height); - save_pointer(NAME(m_videoworkram[1].get()), width * height); - save_pointer(NAME(m_videoworkram[2].get()), width * height); - save_pointer(NAME(m_clut[0].get()), 0x1000); - save_pointer(NAME(m_clut[1].get()), 0x1000); - save_pointer(NAME(m_clut[2].get()), 0x1000); + save_pointer(NAME(m_palette_ptr), 0x480); + save_pointer(NAME(m_videoram[0]), width * height); + save_pointer(NAME(m_videoram[1]), width * height); + save_pointer(NAME(m_videoram[2]), width * height); + save_pointer(NAME(m_videoworkram[0]), width * height); + save_pointer(NAME(m_videoworkram[1]), width * height); + save_pointer(NAME(m_videoworkram[2]), width * height); + save_pointer(NAME(m_clut[0]), 0x1000); + save_pointer(NAME(m_clut[1]), 0x1000); + save_pointer(NAME(m_clut[2]), 0x1000); save_item(NAME(m_tmpbitmap[0])); save_item(NAME(m_tmpbitmap[1])); save_item(NAME(m_tmpbitmap[2])); diff --git a/src/mame/video/pastelg.cpp b/src/mame/video/pastelg.cpp index a586449e936..e53cbc9b8c2 100644 --- a/src/mame/video/pastelg.cpp +++ b/src/mame/video/pastelg.cpp @@ -298,7 +298,7 @@ void pastelg_state::video_start() save_item(NAME(m_blitter_direction_x)); save_item(NAME(m_blitter_direction_y)); save_item(NAME(m_palbank)); - save_pointer(NAME(m_videoram.get()), width*height); + save_pointer(NAME(m_videoram), width*height); save_item(NAME(m_flipscreen_old)); } diff --git a/src/mame/video/pc080sn.cpp b/src/mame/video/pc080sn.cpp index 4dce648768c..64e2a825dd6 100644 --- a/src/mame/video/pc080sn.cpp +++ b/src/mame/video/pc080sn.cpp @@ -115,7 +115,7 @@ void pc080sn_device::device_start() m_bgscroll_ram[0] = m_ram.get() + 0x4000 /2; m_bgscroll_ram[1] = m_ram.get() + 0xc000 /2; - save_pointer(NAME(m_ram.get()), PC080SN_RAM_SIZE / 2); + save_pointer(NAME(m_ram), PC080SN_RAM_SIZE / 2); save_item(NAME(m_ctrl)); machine().save().register_postload(save_prepost_delegate(FUNC(pc080sn_device::restore_scroll), this)); diff --git a/src/mame/video/pc090oj.cpp b/src/mame/video/pc090oj.cpp index 9dbb902f727..567c56c8745 100644 --- a/src/mame/video/pc090oj.cpp +++ b/src/mame/video/pc090oj.cpp @@ -98,8 +98,8 @@ void pc090oj_device::device_start() m_ram = make_unique_clear(PC090OJ_RAM_SIZE / 2); m_ram_buffered = make_unique_clear(PC090OJ_RAM_SIZE / 2); - save_pointer(NAME(m_ram.get()), PC090OJ_RAM_SIZE / 2); - save_pointer(NAME(m_ram_buffered.get()), PC090OJ_RAM_SIZE / 2); + save_pointer(NAME(m_ram), PC090OJ_RAM_SIZE / 2); + save_pointer(NAME(m_ram_buffered), PC090OJ_RAM_SIZE / 2); save_item(NAME(m_ctrl)); save_item(NAME(m_sprite_ctrl)); // should this be set in intf?!? } diff --git a/src/mame/video/pecom.cpp b/src/mame/video/pecom.cpp index d013bb52a52..5365b9fd3bc 100644 --- a/src/mame/video/pecom.cpp +++ b/src/mame/video/pecom.cpp @@ -88,7 +88,7 @@ void pecom_state::video_start() /* register for state saving */ save_item(NAME(m_reset)); save_item(NAME(m_dma)); - save_pointer(NAME(m_charram.get()), PECOM_CHAR_RAM_SIZE); + save_pointer(NAME(m_charram), PECOM_CHAR_RAM_SIZE); } MACHINE_CONFIG_START(pecom_state::pecom_video) diff --git a/src/mame/video/pgm.cpp b/src/mame/video/pgm.cpp index f655e48c1b4..eac0196aa9c 100644 --- a/src/mame/video/pgm.cpp +++ b/src/mame/video/pgm.cpp @@ -630,7 +630,7 @@ VIDEO_START_MEMBER(pgm_state,pgm) m_spritebufferram = make_unique_clear(0xa00/2); - save_pointer(NAME(m_spritebufferram.get()), 0xa00/2); + save_pointer(NAME(m_spritebufferram), 0xa00/2); } uint32_t pgm_state::screen_update_pgm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/pgm2.cpp b/src/mame/video/pgm2.cpp index a7f71e3f7fb..563594fbd2f 100644 --- a/src/mame/video/pgm2.cpp +++ b/src/mame/video/pgm2.cpp @@ -382,7 +382,7 @@ void pgm2_state::video_start() m_screen->register_screen_bitmap(m_sprite_bitmap); - save_pointer(NAME(m_spritebufferram.get()), 0x2000 / 4); + save_pointer(NAME(m_spritebufferram), 0x2000 / 4); m_sprites_mask_mask = memregion("sprites_mask")->bytes() - 1; m_sprites_colour_mask = memregion("sprites_colour")->bytes() - 1; diff --git a/src/mame/video/phoenix.cpp b/src/mame/video/phoenix.cpp index 9407302810e..9eefeab0950 100644 --- a/src/mame/video/phoenix.cpp +++ b/src/mame/video/phoenix.cpp @@ -186,8 +186,8 @@ VIDEO_START_MEMBER(phoenix_state,phoenix) m_fg_tilemap->set_transparent_pen(0); - save_pointer(NAME(m_videoram_pg[0].get()), 0x1000); - save_pointer(NAME(m_videoram_pg[1].get()), 0x1000); + save_pointer(NAME(m_videoram_pg[0]), 0x1000); + save_pointer(NAME(m_videoram_pg[1]), 0x1000); save_item(NAME(m_videoram_pg_index)); save_item(NAME(m_palette_bank)); save_item(NAME(m_cocktail_mode)); diff --git a/src/mame/video/powerins.cpp b/src/mame/video/powerins.cpp index 0b45caf082d..bd2c0a9a67d 100644 --- a/src/mame/video/powerins.cpp +++ b/src/mame/video/powerins.cpp @@ -154,8 +154,8 @@ void powerins_state::video_start() m_tilemap[1]->set_transparent_pen(15); save_item(NAME(m_tile_bank)); - save_pointer(NAME(m_spritebuffer[0].get()), 0x1000/2); - save_pointer(NAME(m_spritebuffer[1].get()), 0x1000/2); + save_pointer(NAME(m_spritebuffer[0]), 0x1000/2); + save_pointer(NAME(m_spritebuffer[1]), 0x1000/2); } diff --git a/src/mame/video/psikyo.cpp b/src/mame/video/psikyo.cpp index 2f9c27ec83e..14c758e3221 100644 --- a/src/mame/video/psikyo.cpp +++ b/src/mame/video/psikyo.cpp @@ -114,8 +114,8 @@ VIDEO_START_MEMBER(psikyo_state,psikyo) m_spritebuf[0] = std::make_unique(0x2000 / 4); m_spritebuf[1] = std::make_unique(0x2000 / 4); - save_pointer(NAME(m_spritebuf[0].get()), 0x2000 / 4, 0); - save_pointer(NAME(m_spritebuf[1].get()), 0x2000 / 4, 1); + save_pointer(NAME(m_spritebuf[0]), 0x2000 / 4, 0); + save_pointer(NAME(m_spritebuf[1]), 0x2000 / 4, 1); save_item(NAME(m_old_linescroll)); } diff --git a/src/mame/video/psikyosh.cpp b/src/mame/video/psikyosh.cpp index 94dc1cf99b8..7c8d5d39636 100644 --- a/src/mame/video/psikyosh.cpp +++ b/src/mame/video/psikyosh.cpp @@ -1117,7 +1117,7 @@ void psikyosh_state::video_start() save_item(NAME(m_z_bitmap)); save_item(NAME(m_zoom_bitmap)); save_item(NAME(m_bg_bitmap)); - save_pointer(NAME(m_bg_zoom.get()), 256); + save_pointer(NAME(m_bg_zoom), 256); } diff --git a/src/mame/video/quasar.cpp b/src/mame/video/quasar.cpp index 86377605bd7..8f94b3b89e0 100644 --- a/src/mame/video/quasar.cpp +++ b/src/mame/video/quasar.cpp @@ -98,7 +98,7 @@ VIDEO_START_MEMBER(quasar_state,quasar) /* register save */ save_item(NAME(m_collision_background)); - save_pointer(NAME(m_effectram.get()), 0x400); + save_pointer(NAME(m_effectram), 0x400); } uint32_t quasar_state::screen_update_quasar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/quizdna.cpp b/src/mame/video/quizdna.cpp index e8b69194950..ce4f2911194 100644 --- a/src/mame/video/quizdna.cpp +++ b/src/mame/video/quizdna.cpp @@ -61,8 +61,8 @@ void quizdna_state::video_start() m_fg_tilemap->set_transparent_pen(0 ); - save_pointer(NAME(m_bg_ram.get()), 0x2000); - save_pointer(NAME(m_fg_ram.get()), 0x1000); + save_pointer(NAME(m_bg_ram), 0x2000); + save_pointer(NAME(m_fg_ram), 0x1000); save_item(NAME(m_bg_xscroll)); save_item(NAME(m_flipscreen)); save_item(NAME(m_video_enable)); diff --git a/src/mame/video/redalert.cpp b/src/mame/video/redalert.cpp index 609794abbdb..e045aee9e26 100644 --- a/src/mame/video/redalert.cpp +++ b/src/mame/video/redalert.cpp @@ -166,7 +166,7 @@ VIDEO_START_MEMBER(redalert_state,redalert) { m_bitmap_colorram = std::make_unique(0x0400); - save_pointer(NAME(m_bitmap_colorram.get()), 0x0400); + save_pointer(NAME(m_bitmap_colorram), 0x0400); m_control_xor = 0x00; } diff --git a/src/mame/video/segaic16.cpp b/src/mame/video/segaic16.cpp index 69250c997ab..622ef9f95a2 100644 --- a/src/mame/video/segaic16.cpp +++ b/src/mame/video/segaic16.cpp @@ -1364,7 +1364,7 @@ void segaic16_video_device::rotate_init(int which, int type, int colorbase) info->buffer = std::make_unique(info->ramsize/2); save_item(NAME(info->colorbase), which); - save_pointer(NAME((uint8_t *) info->buffer.get()), info->ramsize, which); + save_pointer(NAME(info->buffer), info->ramsize/2, which); } diff --git a/src/mame/video/segaic24.cpp b/src/mame/video/segaic24.cpp index 68014c1c014..19dee8c4579 100644 --- a/src/mame/video/segaic24.cpp +++ b/src/mame/video/segaic24.cpp @@ -96,8 +96,8 @@ void segas24_tile_device::device_start() set_gfx(char_gfx_index, std::make_unique(&palette(), char_layout, (uint8_t *)char_ram.get(), NATIVE_ENDIAN_VALUE_LE_BE(8,0), palette().entries() / 16, 0)); - save_pointer(NAME(tile_ram.get()), 0x10000/2); - save_pointer(NAME(char_ram.get()), 0x80000/2); + save_pointer(NAME(tile_ram), 0x10000/2); + save_pointer(NAME(char_ram), 0x80000/2); } void segas24_tile_device::draw_rect(screen_device &screen, bitmap_ind16 &bm, bitmap_ind8 &tm, bitmap_ind16 &dm, const uint16_t *mask, @@ -572,7 +572,7 @@ void segas24_sprite_device::device_start() { sprite_ram = std::make_unique(0x40000/2); - save_pointer(NAME(sprite_ram.get()), 0x40000/2); + save_pointer(NAME(sprite_ram), 0x40000/2); } /* System24 sprites diff --git a/src/mame/video/seibuspi.cpp b/src/mame/video/seibuspi.cpp index e393e87b870..56906b2b770 100644 --- a/src/mame/video/seibuspi.cpp +++ b/src/mame/video/seibuspi.cpp @@ -842,7 +842,7 @@ void seibuspi_state::register_video_state() save_item(NAME(m_midl_layer_d14)); save_item(NAME(m_fore_layer_d14)); - if (m_tilemap_ram != nullptr) save_pointer(NAME(m_tilemap_ram.get()), m_tilemap_ram_size/4); - save_pointer(NAME(m_palette_ram.get()), m_palette_ram_size/4); - save_pointer(NAME(m_sprite_ram.get()), m_sprite_ram_size/4); + if (m_tilemap_ram != nullptr) save_pointer(NAME(m_tilemap_ram), m_tilemap_ram_size/4); + save_pointer(NAME(m_palette_ram), m_palette_ram_size/4); + save_pointer(NAME(m_sprite_ram), m_sprite_ram_size/4); } diff --git a/src/mame/video/simpl156.cpp b/src/mame/video/simpl156.cpp index 3c06f8cff70..ae0beb6f5c6 100644 --- a/src/mame/video/simpl156.cpp +++ b/src/mame/video/simpl156.cpp @@ -19,9 +19,9 @@ void simpl156_state::video_start() memset(m_spriteram.get(), 0xff, 0x2000); /* and register the allocated ram so that save states still work */ - save_pointer(NAME(m_pf1_rowscroll.get()), 0x800/2); - save_pointer(NAME(m_pf2_rowscroll.get()), 0x800/2); - save_pointer(NAME(m_spriteram.get()), 0x2000/2); + save_pointer(NAME(m_pf1_rowscroll), 0x800/2); + save_pointer(NAME(m_pf2_rowscroll), 0x800/2); + save_pointer(NAME(m_spriteram), 0x2000/2); } uint32_t simpl156_state::screen_update_simpl156(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/sknsspr.cpp b/src/mame/video/sknsspr.cpp index f90365274f8..dc6297ef3dd 100644 --- a/src/mame/video/sknsspr.cpp +++ b/src/mame/video/sknsspr.cpp @@ -33,7 +33,7 @@ void sknsspr_device::device_start() { m_decodebuffer = make_unique_clear(SUPRNOVA_DECODE_BUFFER_SIZE); - save_pointer(NAME(m_decodebuffer.get()), SUPRNOVA_DECODE_BUFFER_SIZE); + save_pointer(NAME(m_decodebuffer), SUPRNOVA_DECODE_BUFFER_SIZE); //printf("sknsspr_device::device_start()\n"); } diff --git a/src/mame/video/slapshot.cpp b/src/mame/video/slapshot.cpp index 79ed3b7ea31..a0f80659fa7 100644 --- a/src/mame/video/slapshot.cpp +++ b/src/mame/video/slapshot.cpp @@ -21,8 +21,8 @@ void slapshot_state::video_start() save_item(NAME(m_sprites_master_scrolly)); save_item(NAME(m_sprites_flipscreen)); save_item(NAME(m_prepare_sprites)); - save_pointer(NAME(m_spriteram_delayed.get()), m_spriteram.bytes() / 2); - save_pointer(NAME(m_spriteram_buffered.get()), m_spriteram.bytes() / 2); + save_pointer(NAME(m_spriteram_delayed), m_spriteram.bytes() / 2); + save_pointer(NAME(m_spriteram_buffered), m_spriteram.bytes() / 2); } /************************************************************ diff --git a/src/mame/video/spacefb.cpp b/src/mame/video/spacefb.cpp index 21bbb85f80e..69c4e4e5f2b 100644 --- a/src/mame/video/spacefb.cpp +++ b/src/mame/video/spacefb.cpp @@ -91,7 +91,7 @@ void spacefb_state::video_start() uses whatever value is on the shift register on power-up */ m_star_shift_reg = 0x18f89; - save_pointer(NAME(m_object_present_map.get()), width * height); + save_pointer(NAME(m_object_present_map), width * height); save_item(NAME(m_port_0)); save_item(NAME(m_port_2)); save_item(NAME(m_star_shift_reg)); diff --git a/src/mame/video/ssv.cpp b/src/mame/video/ssv.cpp index ed500fd9c3e..48b1bb3465b 100644 --- a/src/mame/video/ssv.cpp +++ b/src/mame/video/ssv.cpp @@ -209,7 +209,7 @@ VIDEO_START_MEMBER(ssv_state,eaglshot) m_gfxdecode->gfx(0)->set_source((uint8_t *)m_eaglshot_gfxram.get()); m_gfxdecode->gfx(1)->set_source((uint8_t *)m_eaglshot_gfxram.get()); - save_pointer(NAME(m_eaglshot_gfxram.get()), 16 * 0x40000 / 2); + save_pointer(NAME(m_eaglshot_gfxram), 16 * 0x40000 / 2); } TILE_GET_INFO_MEMBER(ssv_state::get_tile_info_0) diff --git a/src/mame/video/st0020.cpp b/src/mame/video/st0020.cpp index bdeea2a0ea1..49fd957fa6e 100644 --- a/src/mame/video/st0020.cpp +++ b/src/mame/video/st0020.cpp @@ -82,9 +82,9 @@ void st0020_device::device_start() } // Save state - save_pointer(NAME(m_gfxram.get()), 4 * 0x100000/2); - save_pointer(NAME(m_spriteram.get()), 0x80000/2); - save_pointer(NAME(m_regs.get()), 0x100/2); + save_pointer(NAME(m_gfxram), 4 * 0x100000/2); + save_pointer(NAME(m_spriteram), 0x80000/2); + save_pointer(NAME(m_regs), 0x100/2); save_item(NAME(m_gfxram_bank)); } diff --git a/src/mame/video/system1.cpp b/src/mame/video/system1.cpp index 890a7498778..d6c3e0a3bdc 100644 --- a/src/mame/video/system1.cpp +++ b/src/mame/video/system1.cpp @@ -144,9 +144,9 @@ void system1_state::video_start_common(int pagecount) save_item(NAME(m_mix_collide_summary)); save_item(NAME(m_sprite_collide_summary)); save_item(NAME(m_videoram_bank)); - save_pointer(NAME(m_videoram.get()), 0x800 * pagecount); - save_pointer(NAME(m_mix_collide.get()), 64); - save_pointer(NAME(m_sprite_collide.get()), 1024); + save_pointer(NAME(m_videoram), 0x800 * pagecount); + save_pointer(NAME(m_mix_collide), 64); + save_pointer(NAME(m_sprite_collide), 1024); } diff --git a/src/mame/video/taito_f2.cpp b/src/mame/video/taito_f2.cpp index eb6ac55efcf..82a63e9b98c 100644 --- a/src/mame/video/taito_f2.cpp +++ b/src/mame/video/taito_f2.cpp @@ -68,8 +68,8 @@ void taitof2_state::taitof2_core_vh_start (int sprite_type, int hide, int flip_h save_item(NAME(m_spritepri)); save_item(NAME(m_spriteblendmode)); save_item(NAME(m_prepare_sprites)); - save_pointer(NAME(m_spriteram_delayed.get()), m_spriteram.bytes() / 2); - save_pointer(NAME(m_spriteram_buffered.get()), m_spriteram.bytes() / 2); + save_pointer(NAME(m_spriteram_delayed), m_spriteram.bytes() / 2); + save_pointer(NAME(m_spriteram_buffered), m_spriteram.bytes() / 2); } /**************************************************************************************/ diff --git a/src/mame/video/taito_f3.cpp b/src/mame/video/taito_f3.cpp index 459e962b39f..d9ac891fe9a 100644 --- a/src/mame/video/taito_f3.cpp +++ b/src/mame/video/taito_f3.cpp @@ -656,12 +656,12 @@ void taito_f3_state::video_start() memset(m_spriteram16_buffered.get(),0,0x10000); memset(m_spriteram.get(),0,0x10000); - save_pointer(NAME(m_videoram.get()), 0x2000/2); - save_pointer(NAME(m_spriteram.get()), 0x10000/2); - save_pointer(NAME(m_f3_vram.get()), 0x2000/2); - save_pointer(NAME(m_f3_pf_data.get()), 0xc000/2); - save_pointer(NAME(m_f3_line_ram.get()), 0x10000/2); - save_pointer(NAME(m_f3_pivot_ram.get()), 0x10000/2); + save_pointer(NAME(m_videoram), 0x2000/2); + save_pointer(NAME(m_spriteram), 0x10000/2); + save_pointer(NAME(m_f3_vram), 0x2000/2); + save_pointer(NAME(m_f3_pf_data), 0xc000/2); + save_pointer(NAME(m_f3_line_ram), 0x10000/2); + save_pointer(NAME(m_f3_pivot_ram), 0x10000/2); save_item(NAME(m_f3_control_0)); save_item(NAME(m_f3_control_1)); diff --git a/src/mame/video/taito_l.cpp b/src/mame/video/taito_l.cpp index 908697ddda1..93f87f28621 100644 --- a/src/mame/video/taito_l.cpp +++ b/src/mame/video/taito_l.cpp @@ -65,7 +65,7 @@ VIDEO_START_MEMBER(taitol_state, taito_l) m_bg_tilemap[0]->set_scrolldx(28, -11); m_bg_tilemap[1]->set_scrolldx(38, -21); - save_pointer(NAME(m_buff_spriteram.get()), SPRITERAM_SIZE); + save_pointer(NAME(m_buff_spriteram), SPRITERAM_SIZE); } diff --git a/src/mame/video/tatsumi.cpp b/src/mame/video/tatsumi.cpp index a42aac35d63..ad860cf729c 100644 --- a/src/mame/video/tatsumi.cpp +++ b/src/mame/video/tatsumi.cpp @@ -762,9 +762,9 @@ VIDEO_START_MEMBER(roundup5_state,roundup5) m_tx_layer->set_transparent_pen(0); m_gfxdecode->gfx(1)->set_source(m_tx_gfxram.get()); - - save_pointer(NAME(m_tx_gfxram.get()),0x20000); - save_pointer(NAME(m_bg_gfxram.get()),0x20000); + + save_pointer(NAME(m_tx_gfxram), 0x20000); + save_pointer(NAME(m_bg_gfxram), 0x20000); } void roundup5_state::draw_road(bitmap_rgb32 &bitmap, const rectangle &cliprect) diff --git a/src/mame/video/tc0080vco.cpp b/src/mame/video/tc0080vco.cpp index 646aa08527e..f90984319bc 100644 --- a/src/mame/video/tc0080vco.cpp +++ b/src/mame/video/tc0080vco.cpp @@ -177,7 +177,7 @@ void tc0080vco_device::device_start() /* create the char set (gfx will then be updated dynamically from RAM) */ m_gfxdecode->set_gfx(m_txnum, std::make_unique(&m_gfxdecode->palette(), charlayout, (uint8_t *)m_char_ram, 0, 1, 512)); - save_pointer(NAME(m_ram.get()), TC0080VCO_RAM_SIZE / 2); + save_pointer(NAME(m_ram), TC0080VCO_RAM_SIZE / 2); machine().save().register_postload(save_prepost_delegate(FUNC(tc0080vco_device::postload), this)); } diff --git a/src/mame/video/tc0100scn.cpp b/src/mame/video/tc0100scn.cpp index 9b7ad0fac2b..cc4a37b0e3e 100644 --- a/src/mame/video/tc0100scn.cpp +++ b/src/mame/video/tc0100scn.cpp @@ -283,7 +283,7 @@ void tc0100scn_device::device_start() set_colbanks(0, 0, 0); /* standard values, only Wgp & multiscreen games change them */ /* we call this here, so that they can be modified at video_start*/ - save_pointer(NAME(m_ram.get()), TC0100SCN_RAM_SIZE / 2); + save_pointer(NAME(m_ram), TC0100SCN_RAM_SIZE / 2); save_item(NAME(m_ctrl)); save_item(NAME(m_dblwidth)); save_item(NAME(m_gfxbank)); diff --git a/src/mame/video/tc0110pcr.cpp b/src/mame/video/tc0110pcr.cpp index e4743abc7af..05fd8d42c15 100644 --- a/src/mame/video/tc0110pcr.cpp +++ b/src/mame/video/tc0110pcr.cpp @@ -37,7 +37,7 @@ void tc0110pcr_device::device_start() { m_ram = make_unique_clear(TC0110PCR_RAM_SIZE); - save_pointer(NAME(m_ram.get()), TC0110PCR_RAM_SIZE); + save_pointer(NAME(m_ram), TC0110PCR_RAM_SIZE); save_item(NAME(m_type)); save_item(NAME(m_addr)); machine().save().register_postload(save_prepost_delegate(FUNC(tc0110pcr_device::restore_colors), this)); diff --git a/src/mame/video/tc0280grd.cpp b/src/mame/video/tc0280grd.cpp index 70713f7cdc3..38c091cf34d 100644 --- a/src/mame/video/tc0280grd.cpp +++ b/src/mame/video/tc0280grd.cpp @@ -50,7 +50,7 @@ void tc0280grd_device::device_start() m_ram = make_unique_clear(TC0280GRD_RAM_SIZE / 2); - save_pointer(NAME(m_ram.get()), TC0280GRD_RAM_SIZE / 2); + save_pointer(NAME(m_ram), TC0280GRD_RAM_SIZE / 2); save_item(NAME(m_ctrl)); } diff --git a/src/mame/video/tc0780fpa.cpp b/src/mame/video/tc0780fpa.cpp index e94a077de9f..e2ddf4804f4 100644 --- a/src/mame/video/tc0780fpa.cpp +++ b/src/mame/video/tc0780fpa.cpp @@ -409,8 +409,8 @@ void tc0780fpa_device::device_start() m_renderer = std::make_unique(*this, screen(), m_texture.get()); - save_pointer(NAME(m_texture.get()), 0x400000); - save_pointer(NAME(m_poly_fifo.get()), POLY_FIFO_SIZE); + save_pointer(NAME(m_texture), 0x400000); + save_pointer(NAME(m_poly_fifo), POLY_FIFO_SIZE); save_item(NAME(m_poly_fifo_ptr)); save_item(NAME(m_tex_address)); save_item(NAME(m_tex_offset)); diff --git a/src/mame/video/tceptor.cpp b/src/mame/video/tceptor.cpp index 8c7125f6b07..f24f50a2c2c 100644 --- a/src/mame/video/tceptor.cpp +++ b/src/mame/video/tceptor.cpp @@ -388,7 +388,7 @@ void tceptor_state::video_start() m_bg1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tceptor_state::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg2_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tceptor_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - save_pointer(NAME(m_sprite_ram_buffered.get()), 0x200 / 2); + save_pointer(NAME(m_sprite_ram_buffered), 0x200 / 2); save_item(NAME(m_bg1_scroll_x)); save_item(NAME(m_bg1_scroll_y)); save_item(NAME(m_bg2_scroll_x)); diff --git a/src/mame/video/tetrisp2.cpp b/src/mame/video/tetrisp2.cpp index 7c8ab3befd2..0f53dd44fee 100644 --- a/src/mame/video/tetrisp2.cpp +++ b/src/mame/video/tetrisp2.cpp @@ -233,7 +233,7 @@ VIDEO_START_MEMBER(tetrisp2_state,tetrisp2) ms32_rearrange_sprites(machine(), "gfx1"); save_item(NAME(m_flipscreen_old)); - save_pointer(NAME(m_priority.get()), 0x40000); + save_pointer(NAME(m_priority), 0x40000); } VIDEO_START_MEMBER(tetrisp2_state,nndmseal) @@ -259,7 +259,7 @@ VIDEO_START_MEMBER(tetrisp2_state,rockntread) ms32_rearrange_sprites(machine(), "gfx1"); save_item(NAME(m_flipscreen_old)); - save_pointer(NAME(m_priority.get()), 0x40000); + save_pointer(NAME(m_priority), 0x40000); } diff --git a/src/mame/video/thoop2.cpp b/src/mame/video/thoop2.cpp index ad2251a0e88..86ce5269467 100644 --- a/src/mame/video/thoop2.cpp +++ b/src/mame/video/thoop2.cpp @@ -89,7 +89,7 @@ void thoop2_state::video_start() for (int i = 0; i < 5; i++){ m_sprite_table[i] = std::make_unique(512); - save_pointer(NAME(m_sprite_table[i].get()), 512, i); + save_pointer(NAME(m_sprite_table[i]), 512, i); } save_item(NAME(m_sprite_count)); diff --git a/src/mame/video/tiamc1.cpp b/src/mame/video/tiamc1.cpp index 93ff43af73f..fd44fdbeff8 100644 --- a/src/mame/video/tiamc1.cpp +++ b/src/mame/video/tiamc1.cpp @@ -165,7 +165,7 @@ void tiamc1_state::video_start() m_spriteram_a = m_videoram.get() + 0x3030; m_paletteram = m_videoram.get() + 0x3040; - save_pointer(NAME(m_videoram.get()), 0x3050); + save_pointer(NAME(m_videoram), 0x3050); m_bg_tilemap1 = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tiamc1_state::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -200,7 +200,7 @@ VIDEO_START_MEMBER(tiamc1_state, kot) m_spriteram_a = m_videoram.get() + 0x430; m_paletteram = m_videoram.get() + 0x440; - save_pointer(NAME(m_videoram.get()), 0x450); + save_pointer(NAME(m_videoram), 0x450); m_bg_tilemap1 = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tiamc1_state::get_bg1_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/toaplan1.cpp b/src/mame/video/toaplan1.cpp index 190b0a5c6f5..4ef0d39aed4 100644 --- a/src/mame/video/toaplan1.cpp +++ b/src/mame/video/toaplan1.cpp @@ -227,10 +227,10 @@ void toaplan1_state::toaplan1_vram_alloc() m_pf3_tilevram16 = make_unique_clear(TOAPLAN1_TILEVRAM_SIZE/2); m_pf4_tilevram16 = make_unique_clear(TOAPLAN1_TILEVRAM_SIZE/2); - save_pointer(NAME(m_pf1_tilevram16.get()), TOAPLAN1_TILEVRAM_SIZE/2); - save_pointer(NAME(m_pf2_tilevram16.get()), TOAPLAN1_TILEVRAM_SIZE/2); - save_pointer(NAME(m_pf3_tilevram16.get()), TOAPLAN1_TILEVRAM_SIZE/2); - save_pointer(NAME(m_pf4_tilevram16.get()), TOAPLAN1_TILEVRAM_SIZE/2); + save_pointer(NAME(m_pf1_tilevram16), TOAPLAN1_TILEVRAM_SIZE/2); + save_pointer(NAME(m_pf2_tilevram16), TOAPLAN1_TILEVRAM_SIZE/2); + save_pointer(NAME(m_pf3_tilevram16), TOAPLAN1_TILEVRAM_SIZE/2); + save_pointer(NAME(m_pf4_tilevram16), TOAPLAN1_TILEVRAM_SIZE/2); #ifdef MAME_DEBUG m_display_pf1 = 1; @@ -248,9 +248,9 @@ void toaplan1_state::toaplan1_spritevram_alloc() m_spritesizeram16 = make_unique_clear(TOAPLAN1_SPRITESIZERAM_SIZE/2); m_buffered_spritesizeram16 = make_unique_clear(TOAPLAN1_SPRITESIZERAM_SIZE/2); - save_pointer(NAME(m_buffered_spriteram.get()), TOAPLAN1_SPRITERAM_SIZE/2); - save_pointer(NAME(m_spritesizeram16.get()), TOAPLAN1_SPRITESIZERAM_SIZE/2); - save_pointer(NAME(m_buffered_spritesizeram16.get()), TOAPLAN1_SPRITESIZERAM_SIZE/2); + save_pointer(NAME(m_buffered_spriteram), TOAPLAN1_SPRITERAM_SIZE/2); + save_pointer(NAME(m_spritesizeram16), TOAPLAN1_SPRITESIZERAM_SIZE/2); + save_pointer(NAME(m_buffered_spritesizeram16), TOAPLAN1_SPRITESIZERAM_SIZE/2); } void toaplan1_state::toaplan1_set_scrolls() @@ -295,7 +295,7 @@ VIDEO_START_MEMBER(toaplan1_rallybik_state,rallybik) toaplan1_vram_alloc(); m_buffered_spriteram = make_unique_clear(m_spriteram.bytes()/2); - save_pointer(NAME(m_buffered_spriteram.get()), m_spriteram.bytes()/2); + save_pointer(NAME(m_buffered_spriteram), m_spriteram.bytes()/2); m_pf1_tilemap->set_scrolldx(-0x00d-6, -0x80+6); m_pf2_tilemap->set_scrolldx(-0x00d-4, -0x80+4); diff --git a/src/mame/video/tryout.cpp b/src/mame/video/tryout.cpp index a00b8427ec7..c23e219ae07 100644 --- a/src/mame/video/tryout.cpp +++ b/src/mame/video/tryout.cpp @@ -173,8 +173,8 @@ void tryout_state::video_start() m_fg_tilemap->set_transparent_pen(0); save_item(NAME(m_vram_bank)); - save_pointer(NAME(m_vram.get()), 8 * 0x800); - save_pointer(NAME(m_vram_gfx.get()), 0x6000); + save_pointer(NAME(m_vram), 8 * 0x800); + save_pointer(NAME(m_vram_gfx), 0x6000); } void tryout_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) diff --git a/src/mame/video/turbo.cpp b/src/mame/video/turbo.cpp index 0f043545483..a2234d6d40a 100644 --- a/src/mame/video/turbo.cpp +++ b/src/mame/video/turbo.cpp @@ -174,7 +174,7 @@ VIDEO_START_MEMBER(turbo_state,buckrog) /* allocate the bitmap RAM */ m_buckrog_bitmap_ram = std::make_unique(0xe000); - save_pointer(NAME(m_buckrog_bitmap_ram.get()), 0xe000); + save_pointer(NAME(m_buckrog_bitmap_ram), 0xe000); } diff --git a/src/mame/video/twincobr.cpp b/src/mame/video/twincobr.cpp index dafed1b7c30..e4be34470bb 100644 --- a/src/mame/video/twincobr.cpp +++ b/src/mame/video/twincobr.cpp @@ -99,9 +99,9 @@ VIDEO_START_MEMBER(twincobr_state,toaplan0) m_display_on = 0; - save_pointer(NAME(m_txvideoram16.get()), m_txvideoram_size); - save_pointer(NAME(m_fgvideoram16.get()), m_fgvideoram_size); - save_pointer(NAME(m_bgvideoram16.get()), m_bgvideoram_size); + save_pointer(NAME(m_txvideoram16), m_txvideoram_size); + save_pointer(NAME(m_fgvideoram16), m_fgvideoram_size); + save_pointer(NAME(m_bgvideoram16), m_bgvideoram_size); save_item(NAME(m_txoffs)); save_item(NAME(m_fgoffs)); save_item(NAME(m_bgoffs)); diff --git a/src/mame/video/unico.cpp b/src/mame/video/unico.cpp index 3493bd39dfa..b45b085b8e0 100644 --- a/src/mame/video/unico.cpp +++ b/src/mame/video/unico.cpp @@ -131,9 +131,9 @@ void unico_state::video_start() m_scroll = make_unique_clear(0x18 / 2); m_spriteram = make_unique_clear(0x800 / 2); - save_pointer(NAME(m_vram.get()), 0xc000/2); - save_pointer(NAME(m_scroll.get()), 0x18/2); - save_pointer(NAME(m_spriteram.get()), 0x800/2); + save_pointer(NAME(m_vram), 0xc000/2); + save_pointer(NAME(m_scroll), 0x18/2); + save_pointer(NAME(m_spriteram), 0x800/2); m_tilemap[0] = &machine().tilemap().create( *m_gfxdecode, tilemap_get_info_delegate(FUNC(unico_state::get_tile_info),this),TILEMAP_SCAN_ROWS, diff --git a/src/mame/video/victory.cpp b/src/mame/video/victory.cpp index 4c81a3b5053..4e6287caaf1 100644 --- a/src/mame/video/victory.cpp +++ b/src/mame/video/victory.cpp @@ -52,9 +52,9 @@ void victory_state::video_start() /* register for state saving */ save_item(NAME(m_paletteram)); - save_pointer(NAME(m_rram.get()), 0x4000); - save_pointer(NAME(m_gram.get()), 0x4000); - save_pointer(NAME(m_bram.get()), 0x4000); + save_pointer(NAME(m_rram), 0x4000); + save_pointer(NAME(m_gram), 0x4000); + save_pointer(NAME(m_bram), 0x4000); save_item(NAME(m_vblank_irq)); save_item(NAME(m_fgcoll)); save_item(NAME(m_fgcollx)); diff --git a/src/mame/video/volfied.cpp b/src/mame/video/volfied.cpp index bc61f879cf6..70ffc0bfb20 100644 --- a/src/mame/video/volfied.cpp +++ b/src/mame/video/volfied.cpp @@ -14,7 +14,7 @@ void volfied_state::video_start() m_video_ctrl = 0; m_video_mask = 0; - save_pointer(NAME(m_video_ram.get()), 0x40000); + save_pointer(NAME(m_video_ram), 0x40000); save_item(NAME(m_video_ctrl)); save_item(NAME(m_video_mask)); } diff --git a/src/mame/video/vs920a.cpp b/src/mame/video/vs920a.cpp index 02c7911f315..a0eeca2f63d 100644 --- a/src/mame/video/vs920a.cpp +++ b/src/mame/video/vs920a.cpp @@ -49,7 +49,7 @@ void vs920a_text_tilemap_device::device_start() throw device_missing_dependencies(); m_vram = make_unique_clear(0x1000/2); - save_pointer(NAME(m_vram.get()), 0x1000/2); + save_pointer(NAME(m_vram), 0x1000/2); save_item(NAME(m_pal_base));