From c26638fb146b3ac51e7100bb3179c3346aebfaff Mon Sep 17 00:00:00 2001 From: mooglyguy Date: Sat, 15 Sep 2018 16:46:44 +0200 Subject: -cgthree,turbogx: Hooked up Bt458 RAMDAC instead of custom palette handling. [Ryan Holtz] --- src/devices/bus/sbus/cgthree.cpp | 67 +++++-------------------------------- src/devices/bus/sbus/cgthree.h | 11 ++---- src/devices/bus/sbus/turbogx.cpp | 72 +++++----------------------------------- src/devices/bus/sbus/turbogx.h | 13 ++------ 4 files changed, 22 insertions(+), 141 deletions(-) diff --git a/src/devices/bus/sbus/cgthree.cpp b/src/devices/bus/sbus/cgthree.cpp index da7a2178105..f4582c2d862 100644 --- a/src/devices/bus/sbus/cgthree.cpp +++ b/src/devices/bus/sbus/cgthree.cpp @@ -16,7 +16,7 @@ void sbus_cgthree_device::mem_map(address_map &map) { map(0x00000000, 0x01ffffff).rw(FUNC(sbus_cgthree_device::unknown_r), FUNC(sbus_cgthree_device::unknown_w)); map(0x00000000, 0x000007ff).r(FUNC(sbus_cgthree_device::rom_r)); - map(0x00400000, 0x00400007).w(FUNC(sbus_cgthree_device::palette_w)); + map(0x00400000, 0x0040000f).m(m_ramdac, FUNC(bt458_device::map)).umask32(0xff000000); map(0x007ff800, 0x007ff81f).rw(FUNC(sbus_cgthree_device::regs_r), FUNC(sbus_cgthree_device::regs_w)); map(0x00800000, 0x008fffff).rw(FUNC(sbus_cgthree_device::vram_r), FUNC(sbus_cgthree_device::vram_w)); map(0x00bff800, 0x00cff7ff).rw(FUNC(sbus_cgthree_device::vram_r), FUNC(sbus_cgthree_device::vram_w)); @@ -34,13 +34,13 @@ const tiny_rom_entry *sbus_cgthree_device::device_rom_region() const void sbus_cgthree_device::device_add_mconfig(machine_config &config) { - screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_screen_update(FUNC(sbus_cgthree_device::screen_update)); - screen.set_size(1152, 900); - screen.set_visarea(0, 1152-1, 0, 900-1); - screen.set_refresh_hz(72); + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_screen_update(FUNC(sbus_cgthree_device::screen_update)); + m_screen->set_size(1152, 900); + m_screen->set_visarea(0, 1152-1, 0, 900-1); + m_screen->set_refresh_hz(72); - PALETTE(config, m_palette, 256).set_init(DEVICE_SELF, FUNC(sbus_cgthree_device::palette_init)); + BT458(config, m_ramdac, 0); } sbus_cgthree_device::sbus_cgthree_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) @@ -48,28 +48,17 @@ sbus_cgthree_device::sbus_cgthree_device(const machine_config &mconfig, const ch , device_sbus_card_interface(mconfig, *this) , m_rom(*this, "prom") , m_screen(*this, "screen") - , m_palette(*this, "palette") + , m_ramdac(*this, "ramdac") { } void sbus_cgthree_device::device_start() { m_vram = std::make_unique(0x100000/4); - - save_item(NAME(m_palette_entry)); - save_item(NAME(m_palette_r)); - save_item(NAME(m_palette_g)); - save_item(NAME(m_palette_b)); - save_item(NAME(m_palette_step)); } void sbus_cgthree_device::device_reset() { - m_palette_entry = 0; - m_palette_r = 0; - m_palette_g = 0; - m_palette_b = 0; - m_palette_step = 0; } void sbus_cgthree_device::install_device() @@ -77,18 +66,9 @@ void sbus_cgthree_device::install_device() m_sbus->install_device(m_base, m_base + 0x1ffffff, *this, &sbus_cgthree_device::mem_map); } -void sbus_cgthree_device::palette_init(palette_device &palette) -{ - for (int i = 0; i < 256; i++) - { - const uint8_t reversed = 255 - i; - palette.set_pen_color(i, rgb_t(reversed, reversed, reversed)); - } -} - uint32_t sbus_cgthree_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - const pen_t *pens = m_palette->pens(); + const pen_t *pens = m_ramdac->pens(); uint8_t *vram = (uint8_t *)&m_vram[0]; for (int y = 0; y < 900; y++) @@ -115,35 +95,6 @@ WRITE32_MEMBER(sbus_cgthree_device::unknown_w) logerror("%s: unknown_w: %08x = %08x & %08x\n", machine().describe_context(), offset << 2, data, mem_mask); } -WRITE32_MEMBER(sbus_cgthree_device::palette_w) -{ - if (offset == 0) - { - m_palette_entry = data >> 24; - m_palette_step = 0; - } - else - { - switch (m_palette_step) - { - case 0: - m_palette_r = data >> 24; - m_palette_step++; - break; - case 1: - m_palette_g = data >> 24; - m_palette_step++; - break; - case 2: - m_palette_b = data >> 24; - m_palette->set_pen_color(m_palette_entry, rgb_t(m_palette_r, m_palette_g, m_palette_b)); - m_palette_step = 0; - m_palette_entry++; - break; - } - } -} - READ8_MEMBER(sbus_cgthree_device::regs_r) { logerror("%s: regs_r: Unimplemented: %08x\n", machine().describe_context(), 0x7ff800 + offset); diff --git a/src/devices/bus/sbus/cgthree.h b/src/devices/bus/sbus/cgthree.h index dc27bb68de0..113f5b14492 100644 --- a/src/devices/bus/sbus/cgthree.h +++ b/src/devices/bus/sbus/cgthree.h @@ -12,7 +12,7 @@ #pragma once #include "sbus.h" -#include "emupal.h" +#include "video/bt45x.h" class sbus_cgthree_device : public device_t, public device_sbus_card_interface { @@ -30,8 +30,6 @@ protected: // device_sbus_slot_interface overrides virtual void install_device() override; - void palette_init(palette_device &palette); - DECLARE_READ32_MEMBER(unknown_r); DECLARE_WRITE32_MEMBER(unknown_w); DECLARE_WRITE32_MEMBER(palette_w); @@ -49,12 +47,7 @@ private: required_memory_region m_rom; std::unique_ptr m_vram; required_device m_screen; - required_device m_palette; - uint8_t m_palette_entry; - uint8_t m_palette_r; - uint8_t m_palette_g; - uint8_t m_palette_b; - uint8_t m_palette_step; + required_device m_ramdac; }; // device type definition diff --git a/src/devices/bus/sbus/turbogx.cpp b/src/devices/bus/sbus/turbogx.cpp index 4c2d57c0cc2..93608458814 100644 --- a/src/devices/bus/sbus/turbogx.cpp +++ b/src/devices/bus/sbus/turbogx.cpp @@ -16,7 +16,7 @@ void sbus_turbogx_device::mem_map(address_map &map) { map(0x00000000, 0x01ffffff).rw(FUNC(sbus_turbogx_device::unknown_r), FUNC(sbus_turbogx_device::unknown_w)); map(0x00000000, 0x00007fff).r(FUNC(sbus_turbogx_device::rom_r)); - map(0x00200000, 0x00200007).w(FUNC(sbus_turbogx_device::palette_w)); + map(0x00200000, 0x0020000f).m(m_ramdac, FUNC(bt458_device::map)).umask32(0xff000000); map(0x00700000, 0x00700fff).rw(FUNC(sbus_turbogx_device::fbc_r), FUNC(sbus_turbogx_device::fbc_w)); map(0x00800000, 0x008fffff).rw(FUNC(sbus_turbogx_device::vram_r), FUNC(sbus_turbogx_device::vram_w)); } @@ -33,13 +33,13 @@ const tiny_rom_entry *sbus_turbogx_device::device_rom_region() const void sbus_turbogx_device::device_add_mconfig(machine_config &config) { - screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_screen_update(FUNC(sbus_turbogx_device::screen_update)); - screen.set_size(1152, 900); - screen.set_visarea(0, 1152-1, 0, 900-1); - screen.set_refresh_hz(72); + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_screen_update(FUNC(sbus_turbogx_device::screen_update)); + m_screen->set_size(1152, 900); + m_screen->set_visarea(0, 1152-1, 0, 900-1); + m_screen->set_refresh_hz(72); - PALETTE(config, m_palette, 256).set_init(DEVICE_SELF, FUNC(sbus_turbogx_device::palette_init)); + BT458(config, m_ramdac, 0); } @@ -48,29 +48,17 @@ sbus_turbogx_device::sbus_turbogx_device(const machine_config &mconfig, const ch , device_sbus_card_interface(mconfig, *this) , m_rom(*this, "prom") , m_screen(*this, "screen") - , m_palette(*this, "palette") + , m_ramdac(*this, "ramdac") { } void sbus_turbogx_device::device_start() { m_vram = std::make_unique(0x100000/4); - - save_item(NAME(m_palette_entry)); - save_item(NAME(m_palette_r)); - save_item(NAME(m_palette_g)); - save_item(NAME(m_palette_b)); - save_item(NAME(m_palette_step)); } void sbus_turbogx_device::device_reset() { - m_palette_entry = 0; - m_palette_r = 0; - m_palette_g = 0; - m_palette_b = 0; - m_palette_step = 0; - memset(&m_fbc, 0, sizeof(m_fbc)); } @@ -79,18 +67,9 @@ void sbus_turbogx_device::install_device() m_sbus->install_device(m_base, m_base + 0x1ffffff, *this, &sbus_turbogx_device::mem_map); } -void sbus_turbogx_device::palette_init(palette_device &palette) -{ - for (int i = 0; i < 256; i++) - { - const uint8_t reversed = 255 - i; - palette.set_pen_color(i, rgb_t(reversed, reversed, reversed)); - } -} - uint32_t sbus_turbogx_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - const pen_t *pens = m_palette->pens(); + const pen_t *pens = m_ramdac->pens(); uint8_t *vram = (uint8_t *)&m_vram[0]; for (int y = 0; y < 900; y++) @@ -132,39 +111,6 @@ WRITE32_MEMBER(sbus_turbogx_device::vram_w) COMBINE_DATA(&m_vram[offset]); } -WRITE32_MEMBER(sbus_turbogx_device::palette_w) -{ - if (offset == 0) - { - m_palette_entry = data >> 24; - logerror("selecting palette entry %d\n", (uint32_t)m_palette_entry); - m_palette_step = 0; - } - else if (offset == 1) - { - switch (m_palette_step) - { - case 0: - logerror("palette entry %d red: %02x\n", (uint32_t)m_palette_entry, data); - m_palette_r = data >> 24; - m_palette_step++; - break; - case 1: - logerror("palette entry %d green: %02x\n", (uint32_t)m_palette_entry, data); - m_palette_g = data >> 24; - m_palette_step++; - break; - case 2: - logerror("palette entry %d blue: %02x\n", (uint32_t)m_palette_entry, data); - m_palette_b = data >> 24; - m_palette->set_pen_color(m_palette_entry, rgb_t(m_palette_r, m_palette_g, m_palette_b)); - m_palette_step = 0; - m_palette_entry++; - break; - } - } -} - uint8_t sbus_turbogx_device::perform_rasterop(uint8_t src, uint8_t dst) { const uint32_t rops[4] = { fbc_rasterop_rop00(), fbc_rasterop_rop01(), fbc_rasterop_rop10(), fbc_rasterop_rop11() }; diff --git a/src/devices/bus/sbus/turbogx.h b/src/devices/bus/sbus/turbogx.h index aa7a3e850bf..19b448ff837 100644 --- a/src/devices/bus/sbus/turbogx.h +++ b/src/devices/bus/sbus/turbogx.h @@ -12,7 +12,7 @@ #pragma once #include "sbus.h" -#include "emupal.h" +#include "video/bt45x.h" class sbus_turbogx_device : public device_t, public device_sbus_card_interface { @@ -30,14 +30,11 @@ protected: // device_sbus_slot_interface overrides virtual void install_device() override; - void palette_init(palette_device &palette); - DECLARE_READ32_MEMBER(rom_r); DECLARE_READ32_MEMBER(unknown_r); DECLARE_WRITE32_MEMBER(unknown_w); DECLARE_READ32_MEMBER(vram_r); DECLARE_WRITE32_MEMBER(vram_w); - DECLARE_WRITE32_MEMBER(palette_w); DECLARE_READ32_MEMBER(fbc_r); DECLARE_WRITE32_MEMBER(fbc_w); @@ -466,13 +463,7 @@ private: required_memory_region m_rom; std::unique_ptr m_vram; required_device m_screen; - required_device m_palette; - - uint8_t m_palette_entry; - uint8_t m_palette_r; - uint8_t m_palette_g; - uint8_t m_palette_b; - uint8_t m_palette_step; + required_device m_ramdac; fbc_t m_fbc; }; -- cgit v1.2.3