summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/ngen.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/ngen.cpp')
-rw-r--r--src/mame/drivers/ngen.cpp56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/mame/drivers/ngen.cpp b/src/mame/drivers/ngen.cpp
index f6eb283c682..31a69f410ba 100644
--- a/src/mame/drivers/ngen.cpp
+++ b/src/mame/drivers/ngen.cpp
@@ -119,9 +119,9 @@ public:
DECLARE_WRITE8_MEMBER(dma_write_word);
MC6845_UPDATE_ROW(crtc_update_row);
// TODO: sort out what devices use which channels
- DECLARE_READ8_MEMBER( dma_0_dack_r ) { UINT16 ret = 0xffff; m_dma_high_byte = ret & 0xff00; return ret; }
- DECLARE_READ8_MEMBER( dma_1_dack_r ) { UINT16 ret = 0xffff; m_dma_high_byte = ret & 0xff00; return ret; }
- DECLARE_READ8_MEMBER( dma_2_dack_r ) { UINT16 ret = 0xffff; m_dma_high_byte = ret & 0xff00; return ret; }
+ DECLARE_READ8_MEMBER( dma_0_dack_r ) { uint16_t ret = 0xffff; m_dma_high_byte = ret & 0xff00; return ret; }
+ DECLARE_READ8_MEMBER( dma_1_dack_r ) { uint16_t ret = 0xffff; m_dma_high_byte = ret & 0xff00; return ret; }
+ DECLARE_READ8_MEMBER( dma_2_dack_r ) { uint16_t ret = 0xffff; m_dma_high_byte = ret & 0xff00; return ret; }
DECLARE_READ8_MEMBER( dma_3_dack_r );
DECLARE_WRITE8_MEMBER( dma_0_dack_w ){ popmessage("IOW0: data %02x",data); }
DECLARE_WRITE8_MEMBER( dma_1_dack_w ){ }
@@ -164,23 +164,23 @@ private:
optional_device<pit8253_device> m_fdc_timer;
optional_device<wd2010_device> m_hdc;
optional_device<pit8253_device> m_hdc_timer;
- optional_shared_ptr<UINT8> m_hd_buffer;
+ optional_shared_ptr<uint8_t> m_hd_buffer;
void set_dma_channel(int channel, int state);
- UINT8 m_xbus_current; // currently selected X-Bus module
- UINT16 m_peripheral;
- UINT16 m_upper;
- UINT16 m_middle;
- UINT16 m_port00;
- UINT16 m_periph141;
- UINT8 m_dma_offset[4];
- INT8 m_dma_channel;
- UINT16 m_dma_high_byte;
- UINT16 m_control;
- UINT16 m_disk_rom_ptr;
- UINT8 m_hdc_control;
- UINT8 m_disk_page;
+ uint8_t m_xbus_current; // currently selected X-Bus module
+ uint16_t m_peripheral;
+ uint16_t m_upper;
+ uint16_t m_middle;
+ uint16_t m_port00;
+ uint16_t m_periph141;
+ uint8_t m_dma_offset[4];
+ int8_t m_dma_channel;
+ uint16_t m_dma_high_byte;
+ uint16_t m_control;
+ uint16_t m_disk_rom_ptr;
+ uint8_t m_hdc_control;
+ uint8_t m_disk_page;
};
class ngen386_state : public ngen_state
@@ -233,7 +233,7 @@ WRITE_LINE_MEMBER(ngen_state::timer_clk_out)
WRITE16_MEMBER(ngen_state::cpu_peripheral_cb)
{
- UINT32 addr;
+ uint32_t addr;
switch(offset)
{
@@ -341,7 +341,7 @@ WRITE16_MEMBER(ngen_state::peripheral_w)
READ16_MEMBER(ngen_state::peripheral_r)
{
- UINT16 ret = 0xffff;
+ uint16_t ret = 0xffff;
switch(offset)
{
case 0x00:
@@ -422,7 +422,7 @@ READ16_MEMBER(ngen_state::peripheral_r)
// TODO: make expansion modules slot devices
WRITE16_MEMBER(ngen_state::xbus_w)
{
- UINT16 addr = (data & 0x00ff) << 8;
+ uint16_t addr = (data & 0x00ff) << 8;
cpu_device* cpu;
if(m_maincpu)
@@ -451,7 +451,7 @@ WRITE16_MEMBER(ngen_state::xbus_w)
// 0x3141 - QIC Tape module
READ16_MEMBER(ngen_state::xbus_r)
{
- UINT16 ret = 0xffff;
+ uint16_t ret = 0xffff;
switch(m_xbus_current)
{
@@ -532,7 +532,7 @@ WRITE16_MEMBER(ngen_state::hfd_w)
READ16_MEMBER(ngen_state::hfd_r)
{
- UINT16 ret = 0xffff;
+ uint16_t ret = 0xffff;
switch(offset)
{
@@ -684,7 +684,7 @@ WRITE_LINE_MEMBER( ngen_state::dack3_w ) { set_dma_channel(3, state); }
READ8_MEMBER(ngen_state::dma_3_dack_r)
{
- UINT16 ret = 0xffff;
+ uint16_t ret = 0xffff;
if((m_hdc_control & 0x04) && m_disk_rom)
{
@@ -703,7 +703,7 @@ READ8_MEMBER(ngen_state::dma_3_dack_r)
READ8_MEMBER(ngen_state::dma_read_word)
{
cpu_device* cpu;
- UINT16 result;
+ uint16_t result;
if(m_maincpu)
cpu = m_maincpu;
@@ -743,11 +743,11 @@ WRITE8_MEMBER(ngen_state::dma_write_word)
MC6845_UPDATE_ROW( ngen_state::crtc_update_row )
{
- UINT16 addr = ma;
+ uint16_t addr = ma;
for(int x=0;x<bitmap.width();x+=9)
{
- UINT8 ch = m_vram.read16(addr++) & 0xff;
+ uint8_t ch = m_vram.read16(addr++) & 0xff;
for(int z=0;z<9;z++)
{
if(BIT(m_fontram.read16(ch*16+ra),8-z))
@@ -765,7 +765,7 @@ READ8_MEMBER( ngen_state::irq_cb )
READ16_MEMBER( ngen_state::b38_keyboard_r )
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
switch(offset)
{
case 0:
@@ -798,7 +798,7 @@ WRITE16_MEMBER( ngen_state::b38_keyboard_w )
READ16_MEMBER( ngen_state::b38_crtc_r )
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
switch(offset)
{
case 0: