diff options
Diffstat (limited to 'src/devices/bus/nubus/nubus_m2video.cpp')
-rw-r--r-- | src/devices/bus/nubus/nubus_m2video.cpp | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/devices/bus/nubus/nubus_m2video.cpp b/src/devices/bus/nubus/nubus_m2video.cpp index 60728d7dd15..688acf0ec1f 100644 --- a/src/devices/bus/nubus/nubus_m2video.cpp +++ b/src/devices/bus/nubus/nubus_m2video.cpp @@ -15,6 +15,8 @@ #include "nubus_m2video.h" #include "screen.h" +#include <algorithm> + #define M2VIDEO_SCREEN_NAME "m2video_screen" #define M2VIDEO_ROM_REGION "m2video_rom" @@ -31,7 +33,7 @@ ROM_END // GLOBAL VARIABLES //************************************************************************** -DEFINE_DEVICE_TYPE(NUBUS_M2VIDEO, nubus_m2video_device, "nb_m2vc", "Macintosh II Video Card") +DEFINE_DEVICE_TYPE(NUBUS_M2VIDEO, nubus_m2video_device, "nb_m2vc", "Apple Macintosh II Video Card") //------------------------------------------------- @@ -73,7 +75,7 @@ nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device device_t(mconfig, type, tag, owner, clock), device_video_interface(mconfig, *this), device_nubus_card_interface(mconfig, *this), - m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) + m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr) { set_screen(*this, M2VIDEO_SCREEN_NAME); } @@ -86,20 +88,19 @@ void nubus_m2video_device::device_start() { uint32_t slotspace; - install_declaration_rom(this, M2VIDEO_ROM_REGION, true, true); + install_declaration_rom(M2VIDEO_ROM_REGION, true, true); slotspace = get_slotspace(); // logerror("[m2video %p] slotspace = %x\n", this, slotspace); - m_vram.resize(VRAM_SIZE); - m_vram32 = (uint32_t *)&m_vram[0]; + m_vram.resize(VRAM_SIZE / sizeof(uint32_t)); nubus().install_device(slotspace, slotspace+VRAM_SIZE-1, read32s_delegate(*this, FUNC(nubus_m2video_device::vram_r)), write32s_delegate(*this, FUNC(nubus_m2video_device::vram_w))); nubus().install_device(slotspace+0x900000, slotspace+VRAM_SIZE-1+0x900000, read32s_delegate(*this, FUNC(nubus_m2video_device::vram_r)), write32s_delegate(*this, FUNC(nubus_m2video_device::vram_w))); nubus().install_device(slotspace+0x80000, slotspace+0xeffff, read32s_delegate(*this, FUNC(nubus_m2video_device::m2video_r)), write32s_delegate(*this, FUNC(nubus_m2video_device::m2video_w))); - m_timer = timer_alloc(0, nullptr); + m_timer = timer_alloc(FUNC(nubus_m2video_device::vbl_tick), this); m_timer->adjust(screen().time_until_pos(479, 0), 0); } @@ -113,7 +114,7 @@ void nubus_m2video_device::device_reset() m_clutoffs = 0; m_vbl_disable = 1; m_mode = 0; - memset(&m_vram[0], 0, VRAM_SIZE); + std::fill(m_vram.begin(), m_vram.end(), 0); memset(m_palette, 0, sizeof(m_palette)); m_palette[0] = rgb_t(255, 255, 255); @@ -121,7 +122,7 @@ void nubus_m2video_device::device_reset() } -void nubus_m2video_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) +TIMER_CALLBACK_MEMBER(nubus_m2video_device::vbl_tick) { if (!m_vbl_disable) { @@ -139,7 +140,7 @@ void nubus_m2video_device::device_timer(emu_timer &timer, device_timer_id tid, i uint32_t nubus_m2video_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - uint8_t const *const vram = &m_vram[0x20]; + auto const vram8 = util::big_endian_cast<uint8_t const>(&m_vram[0]) + 0x20; switch (m_mode) { @@ -149,7 +150,7 @@ uint32_t nubus_m2video_device::screen_update(screen_device &screen, bitmap_rgb32 uint32_t *scanline = &bitmap.pix(y); for (int x = 0; x < 640/8; x++) { - uint8_t const pixels = vram[(y * 128) + (BYTE4_XOR_BE(x))]; + uint8_t const pixels = vram8[(y * 128) + x]; *scanline++ = m_palette[(pixels&0x80)]; *scanline++ = m_palette[((pixels<<1)&0x80)]; @@ -169,7 +170,7 @@ uint32_t nubus_m2video_device::screen_update(screen_device &screen, bitmap_rgb32 uint32_t *scanline = &bitmap.pix(y); for (int x = 0; x < 640/4; x++) { - uint8_t const pixels = vram[(y * 256) + (BYTE4_XOR_BE(x))]; + uint8_t const pixels = vram8[(y * 256) + x]; *scanline++ = m_palette[(pixels&0xc0)]; *scanline++ = m_palette[((pixels<<2)&0xc0)]; @@ -185,7 +186,7 @@ uint32_t nubus_m2video_device::screen_update(screen_device &screen, bitmap_rgb32 uint32_t *scanline = &bitmap.pix(y); for (int x = 0; x < 640/2; x++) { - uint8_t const pixels = vram[(y * 512) + (BYTE4_XOR_BE(x))]; + uint8_t const pixels = vram8[(y * 512) + x]; *scanline++ = m_palette[(pixels&0xf0)]; *scanline++ = m_palette[((pixels&0x0f)<<4)]; @@ -199,7 +200,7 @@ uint32_t nubus_m2video_device::screen_update(screen_device &screen, bitmap_rgb32 uint32_t *scanline = &bitmap.pix(y); for (int x = 0; x < 640; x++) { - uint8_t const pixels = vram[(y * 1024) + (BYTE4_XOR_BE(x))]; + uint8_t const pixels = vram8[(y * 1024) + x]; *scanline++ = m_palette[pixels]; } } @@ -291,10 +292,10 @@ uint32_t nubus_m2video_device::m2video_r(offs_t offset, uint32_t mem_mask) void nubus_m2video_device::vram_w(offs_t offset, uint32_t data, uint32_t mem_mask) { data ^= 0xffffffff; - COMBINE_DATA(&m_vram32[offset]); + COMBINE_DATA(&m_vram[offset]); } uint32_t nubus_m2video_device::vram_r(offs_t offset, uint32_t mem_mask) { - return m_vram32[offset] ^ 0xffffffff; + return m_vram[offset] ^ 0xffffffff; } |