seta/simple_st0016.cpp: Remove unnecessary trampoline (#13270)

* seta/simple_st0016.cpp: Remove unnecessary trampoline * seta/st0016.cpp: Fix naming
mamedev · Jan 24, 2025 · 05fa265 · 05fa265
1 parent 43187e5
commit 05fa265
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/src/mame/seta/macs.cpp b/src/mame/seta/macs.cpp
@@ -511,7 +511,7 @@ void macs_state::macs(machine_config &config)
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
 	screen.set_size(128*8, 128*8);
 	screen.set_visarea(0*8, 128*8-1, 0*8, 128*8-1);
-	screen.set_screen_update(m_maincpu, FUNC(st0016_cpu_device::update));
+	screen.set_screen_update(m_maincpu, FUNC(st0016_cpu_device::screen_update));
 	screen.set_palette("maincpu:palette");
 	screen.screen_vblank().set_inputline(m_maincpu, INPUT_LINE_IRQ0, HOLD_LINE); // FIXME: HOLD_LINE is bad juju
 

diff --git a/src/mame/seta/simple_st0016.cpp b/src/mame/seta/simple_st0016.cpp
@@ -77,7 +77,6 @@ class st0016_state : public driver_device
 
 	void rom_bank_w(uint8_t data);
 
-	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	TIMER_DEVICE_CALLBACK_MEMBER(interrupt);
 
 	void renju_mem(address_map &map) ATTR_COLD;
@@ -525,12 +524,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(st0016_state::interrupt)
  *
  *************************************/
 
-uint32_t st0016_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	return m_maincpu->update(screen, bitmap, cliprect);
-}
-
-
 void st0016_state::st0016(machine_config &config)
 {
 	// basic machine hardware
@@ -547,7 +540,7 @@ void st0016_state::st0016(machine_config &config)
 	m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0));
 	m_screen->set_size(48*8, 48*8);
 	m_screen->set_visarea(0*8, 48*8-1, 0*8, 48*8-1);
-	m_screen->set_screen_update(FUNC(st0016_state::screen_update));
+	m_screen->set_screen_update(m_maincpu, FUNC(st0016_cpu_device::screen_update));
 	m_screen->set_palette("maincpu:palette");
 
 	// TODO: Mono?

diff --git a/src/mame/seta/st0016.cpp b/src/mame/seta/st0016.cpp
@@ -743,7 +743,7 @@ void st0016_cpu_device::draw_screen(screen_device &screen, bitmap_ind16 &bitmap,
 	draw_bgmap(bitmap, cliprect, 1);
 }
 
-u32 st0016_cpu_device::update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+u32 st0016_cpu_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 #ifdef MAME_DEBUG
 	if (machine().input().code_pressed_once(KEYCODE_Z))

diff --git a/src/mame/seta/st0016.h b/src/mame/seta/st0016.h
@@ -29,7 +29,7 @@ class st0016_cpu_device : public z80_device, public device_gfx_interface, public
 	void set_game_flag(u32 flag) { m_game_flag = flag; }
 
 	void draw_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	u32 update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 protected:
 	// device-level overrides