diff options
Diffstat (limited to 'src/mame/drivers/pce220.cpp')
-rw-r--r-- | src/mame/drivers/pce220.cpp | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/src/mame/drivers/pce220.cpp b/src/mame/drivers/pce220.cpp index 3e494d389a4..fbc1dee727b 100644 --- a/src/mame/drivers/pce220.cpp +++ b/src/mame/drivers/pce220.cpp @@ -47,22 +47,18 @@ class pce220_state : public driver_device { public: pce220_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_ram(*this, RAM_TAG), - m_beep(*this, "beeper"), - m_serial(*this, PCE220SERIAL_TAG) - { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_ram(*this, RAM_TAG) + , m_beep(*this, "beeper") + , m_serial(*this, PCE220SERIAL_TAG) + { } void pce220(machine_config &config); DECLARE_INPUT_CHANGED_MEMBER(kb_irq); DECLARE_INPUT_CHANGED_MEMBER(on_irq); - TIMER_DEVICE_CALLBACK_MEMBER(pce220_timer_callback); - - DECLARE_PALETTE_INIT(pce220); - protected: required_device<cpu_device> m_maincpu; required_device<ram_device> m_ram; @@ -88,6 +84,11 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; + + TIMER_DEVICE_CALLBACK_MEMBER(pce220_timer_callback); + + void pce220_palette(palette_device &palette) const; + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_READ8_MEMBER( lcd_status_r ); DECLARE_WRITE8_MEMBER( lcd_control_w ); @@ -936,7 +937,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(pce220_state::pce220_timer_callback) } } -PALETTE_INIT_MEMBER(pce220_state,pce220) +void pce220_state::pce220_palette(palette_device &palette) const { palette.set_pen_color(0, rgb_t(138, 146, 148)); palette.set_pen_color(1, rgb_t(92, 83, 88)); @@ -959,13 +960,11 @@ MACHINE_CONFIG_START(pce220_state::pce220) MCFG_SCREEN_VISIBLE_AREA(0, 24*6-1, 0, 4*8-1) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD("palette", 2) - MCFG_PALETTE_INIT_OWNER(pce220_state,pce220) + PALETTE(config, "palette", FUNC(pce220_state::pce220_palette), 2); /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("beeper", BEEP, 3250) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) + BEEP(config, m_beep, 3250).add_route(ALL_OUTPUTS, "mono", 0.50); MCFG_TIMER_DRIVER_ADD_PERIODIC("pce220_timer", pce220_state, pce220_timer_callback, attotime::from_msec(468)) @@ -993,15 +992,13 @@ MACHINE_CONFIG_START(pcg850v_state::pcg815) MCFG_SCREEN_VISIBLE_AREA(0, 144-1, 0, 32-1) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD("palette", 2) - MCFG_PALETTE_INIT_OWNER(pce220_state,pce220) + PALETTE(config, "palette", FUNC(pcg850v_state::pce220_palette), 2); /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("beeper", BEEP, 3250) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) + BEEP(config, m_beep, 3250).add_route(ALL_OUTPUTS, "mono", 0.50); - MCFG_TIMER_DRIVER_ADD_PERIODIC("pce220_timer", pce220_state, pce220_timer_callback, attotime::from_msec(468)) + MCFG_TIMER_DRIVER_ADD_PERIODIC("pce220_timer", pcg850v_state, pce220_timer_callback, attotime::from_msec(468)) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); @@ -1027,15 +1024,13 @@ MACHINE_CONFIG_START(pcg850v_state::pcg850v) MCFG_SCREEN_VISIBLE_AREA(0, 144-1, 0, 48-1) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD("palette", 2) - MCFG_PALETTE_INIT_OWNER(pce220_state,pce220) + PALETTE(config, "palette", FUNC(pcg850v_state::pce220_palette), 2); /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("beeper", BEEP, 3250) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) + BEEP(config, m_beep, 3250).add_route(ALL_OUTPUTS, "mono", 0.50); - MCFG_TIMER_DRIVER_ADD_PERIODIC("pce220_timer", pce220_state, pce220_timer_callback, attotime::from_msec(468)) + MCFG_TIMER_DRIVER_ADD_PERIODIC("pce220_timer", pcg850v_state, pce220_timer_callback, attotime::from_msec(468)) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); |