diff options
Diffstat (limited to 'src/devices/bus/nubus/nubus_m2video.cpp')
-rw-r--r-- | src/devices/bus/nubus/nubus_m2video.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/devices/bus/nubus/nubus_m2video.cpp b/src/devices/bus/nubus/nubus_m2video.cpp index 1d8134887f8..04db8cffb1b 100644 --- a/src/devices/bus/nubus/nubus_m2video.cpp +++ b/src/devices/bus/nubus/nubus_m2video.cpp @@ -66,7 +66,7 @@ const tiny_rom_entry *nubus_m2video_device::device_rom_region() const // nubus_m2video_device - constructor //------------------------------------------------- -nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NUBUS_M2VIDEO, "Macintosh II Video Card", tag, owner, clock, "nb_m2vc", __FILE__), 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) @@ -75,7 +75,7 @@ nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, const m_screen_tag = m_assembled_tag.c_str(); } -nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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) @@ -90,7 +90,7 @@ nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device void nubus_m2video_device::device_start() { - UINT32 slotspace; + uint32_t slotspace; // set_nubus_device makes m_slot valid set_nubus_device(); @@ -101,7 +101,7 @@ void nubus_m2video_device::device_start() // printf("[m2video %p] slotspace = %x\n", this, slotspace); m_vram.resize(VRAM_SIZE); - m_vram32 = (UINT32 *)&m_vram[0]; + m_vram32 = (uint32_t *)&m_vram[0]; m_nubus->install_device(slotspace, slotspace+VRAM_SIZE-1, read32_delegate(FUNC(nubus_m2video_device::vram_r), this), write32_delegate(FUNC(nubus_m2video_device::vram_w), this)); m_nubus->install_device(slotspace+0x900000, slotspace+VRAM_SIZE-1+0x900000, read32_delegate(FUNC(nubus_m2video_device::vram_r), this), write32_delegate(FUNC(nubus_m2video_device::vram_w), this)); @@ -145,11 +145,11 @@ void nubus_m2video_device::device_timer(emu_timer &timer, device_timer_id tid, i ***************************************************************************/ -UINT32 nubus_m2video_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) +uint32_t nubus_m2video_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - UINT32 *scanline; + uint32_t *scanline; int x, y; - UINT8 pixels, *vram; + uint8_t pixels, *vram; vram = &m_vram[0x20]; |