diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp index f4b0663893f..5ef61ce16eb 100644 --- a/src/mame/drivers/x68k.cpp +++ b/src/mame/drivers/x68k.cpp @@ -1116,8 +1116,6 @@ void x68k_state::x68k_base_map(address_map &map) map(0xc00000, 0xdfffff).rw(m_crtc, FUNC(x68k_crtc_device::gvram_r), FUNC(x68k_crtc_device::gvram_w)); map(0xe00000, 0xe7ffff).rw(m_crtc, FUNC(x68k_crtc_device::tvram_r), FUNC(x68k_crtc_device::tvram_w)); map(0xe80000, 0xe81fff).rw(m_crtc, FUNC(x68k_crtc_device::crtc_r), FUNC(x68k_crtc_device::crtc_w)); - map(0xe82000, 0xe821ff).rw(m_gfxpalette, FUNC(palette_device::read16), FUNC(palette_device::write16)).share("gfxpalette"); - map(0xe82200, 0xe823ff).rw(m_pcgpalette, FUNC(palette_device::read16), FUNC(palette_device::write16)).share("pcgpalette"); map(0xe82400, 0xe83fff).rw(FUNC(x68k_state::vid_r), FUNC(x68k_state::vid_w)); map(0xe84000, 0xe85fff).rw(m_hd63450, FUNC(hd63450_device::read), FUNC(hd63450_device::write)); map(0xe86000, 0xe87fff).rw(FUNC(x68k_state::areaset_r), FUNC(x68k_state::areaset_w)); @@ -1145,6 +1143,8 @@ void x68k_state::x68k_base_map(address_map &map) void x68k_state::x68k_map(address_map &map) { x68k_base_map(map); + map(0xe82000, 0xe821ff).rw(m_gfxpalette, FUNC(palette_device::read16), FUNC(palette_device::write16)).share("gfxpalette"); + map(0xe82200, 0xe823ff).rw(m_pcgpalette, FUNC(palette_device::read16), FUNC(palette_device::write16)).share("pcgpalette"); map(0xe92001, 0xe92001).rw(m_okim6258, FUNC(okim6258_device::status_r), FUNC(okim6258_device::ctrl_w)); map(0xe92003, 0xe92003).rw(m_okim6258, FUNC(okim6258_device::status_r), FUNC(okim6258_device::data_w)); map(0xe96000, 0xe9601f).rw("x68k_hdc", FUNC(x68k_hdc_image_device::hdc_r), FUNC(x68k_hdc_image_device::hdc_w)); @@ -1156,6 +1156,8 @@ void x68k_state::x68k_map(address_map &map) void x68ksupr_state::x68kxvi_map(address_map &map) { x68k_base_map(map); + map(0xe82000, 0xe821ff).rw(m_gfxpalette, FUNC(palette_device::read16), FUNC(palette_device::write16)).share("gfxpalette"); + map(0xe82200, 0xe823ff).rw(m_pcgpalette, FUNC(palette_device::read16), FUNC(palette_device::write16)).share("pcgpalette"); map(0xe92001, 0xe92001).rw(m_okim6258, FUNC(okim6258_device::status_r), FUNC(okim6258_device::ctrl_w)); map(0xe92003, 0xe92003).rw(m_okim6258, FUNC(okim6258_device::status_r), FUNC(okim6258_device::data_w)); map(0xea0000, 0xea1fff).rw(FUNC(x68ksupr_state::exp_r), FUNC(x68ksupr_state::exp_w)); // external SCSI ROM and controller @@ -1167,6 +1169,8 @@ void x68030_state::x68030_map(address_map &map) { map.global_mask(0x00ffffff); // Still only has 24-bit address space x68k_base_map(map); + map(0xe82000, 0xe821ff).rw(m_gfxpalette, FUNC(palette_device::read32), FUNC(palette_device::write32)).share("gfxpalette"); + map(0xe82200, 0xe823ff).rw(m_pcgpalette, FUNC(palette_device::read32), FUNC(palette_device::write32)).share("pcgpalette"); // AM_RANGE(0xe8c000, 0xe8dfff) AM_READWRITE(x68k_printer_r, x68k_printer_w) map(0xe92000, 0xe92003).r(m_okim6258, FUNC(okim6258_device::status_r)).umask32(0x00ff00ff).w(FUNC(x68030_state::adpcm_w)).umask32(0x00ff00ff); @@ -1590,8 +1594,6 @@ MACHINE_CONFIG_START(x68k_state::x68000_base) PALETTE(config, m_gfxpalette, 256).set_format(raw_to_rgb_converter(2, &x68k_state::GGGGGRRRRRBBBBBI_decoder)); PALETTE(config, m_pcgpalette, 256).set_format(raw_to_rgb_converter(2, &x68k_state::GGGGGRRRRRBBBBBI_decoder)); - MCFG_VIDEO_START_OVERRIDE(x68k_state, x68000) - config.set_default_layout(layout_x68000); /* sound hardware */ diff --git a/src/mame/includes/x68k.h b/src/mame/includes/x68k.h index c8eb90f974e..c565081eadb 100644 --- a/src/mame/includes/x68k.h +++ b/src/mame/includes/x68k.h @@ -78,7 +78,7 @@ public: void x68000_base(machine_config &config); void x68000(machine_config &config); - void driver_init() override; + virtual void driver_init() override; protected: enum @@ -249,7 +249,7 @@ protected: TILE_GET_INFO_MEMBER(get_bg1_tile); TILE_GET_INFO_MEMBER(get_bg0_tile_16); TILE_GET_INFO_MEMBER(get_bg1_tile_16); - DECLARE_VIDEO_START(x68000); + virtual void video_start() override; DECLARE_PALETTE_INIT(x68000); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(led_callback); @@ -350,7 +350,7 @@ public: void x68kxvi(machine_config &config); void x68ksupr(machine_config &config); - void driver_init() override; + virtual void driver_init() override; protected: DECLARE_WRITE_LINE_MEMBER(scsi_irq); @@ -371,7 +371,7 @@ public: void x68030(machine_config &config); - void driver_init() override; + virtual void driver_init() override; protected: void x68030_map(address_map &map); diff --git a/src/mame/video/x68k.cpp b/src/mame/video/x68k.cpp index ec60bb17b05..b8b83746c15 100644 --- a/src/mame/video/x68k.cpp +++ b/src/mame/video/x68k.cpp @@ -575,7 +575,7 @@ TILE_GET_INFO_MEMBER(x68k_state::get_bg1_tile_16) SET_TILE_INFO_MEMBER(1,code,colour,flags); } -VIDEO_START_MEMBER(x68k_state,x68000) +void x68k_state::video_start() { int gfx_index;