diff options
Diffstat (limited to 'src/mame/drivers/namcos12.cpp')
-rw-r--r-- | src/mame/drivers/namcos12.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/mame/drivers/namcos12.cpp b/src/mame/drivers/namcos12.cpp index b2afcbe8500..4a2f0a31255 100644 --- a/src/mame/drivers/namcos12.cpp +++ b/src/mame/drivers/namcos12.cpp @@ -1116,20 +1116,20 @@ public: required_device<h8_adc_device> m_adc; required_device<rtc4543_device> m_rtc; required_device<namco_settings_device> m_settings; - required_shared_ptr<UINT16> m_sharedram; + required_shared_ptr<uint16_t> m_sharedram; - UINT16 m_n_bankoffset; - UINT32 m_n_dmaoffset; - UINT32 m_n_tektagdmaoffset; + uint16_t m_n_bankoffset; + uint32_t m_n_dmaoffset; + uint32_t m_n_tektagdmaoffset; int m_has_tektagt_dma; int m_ttt_cnt; - UINT32 m_ttt_val[2]; - UINT8 m_sub_porta; - UINT8 m_sub_portb; + uint32_t m_ttt_val[2]; + uint8_t m_sub_porta; + uint8_t m_sub_portb; - UINT8 m_jvssense; - UINT8 m_tssio_port_4; + uint8_t m_jvssense; + uint8_t m_tssio_port_4; DECLARE_READ16_MEMBER(s12_mcu_p6_r); DECLARE_READ16_MEMBER(iob_p4_r); @@ -1160,7 +1160,7 @@ public: DECLARE_DRIVER_INIT(ptblank2); DECLARE_DRIVER_INIT(technodr); inline void ATTR_PRINTF(3,4) verboselog( int n_level, const char *s_fmt, ... ); - void namcos12_rom_read( UINT32 *p_n_psxram, UINT32 n_address, INT32 n_size ); + void namcos12_rom_read( uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); void namcos12_sub_irq( screen_device &screen, bool vblank_state ); protected: @@ -1225,19 +1225,19 @@ WRITE16_MEMBER(namcos12_state::dmaoffset_w) verboselog(1, "dmaoffset_w( %08x, %08x, %08x ) %08x\n", offset, data, mem_mask, m_n_dmaoffset ); } -void namcos12_state::namcos12_rom_read( UINT32 *p_n_psxram, UINT32 n_address, INT32 n_size ) +void namcos12_state::namcos12_rom_read( uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ) { const char *n_region; int n_offset; - INT32 n_romleft; + int32_t n_romleft; - UINT16 *source; - UINT16 *destination; - INT32 n_ramleft; + uint16_t *source; + uint16_t *destination; + int32_t n_ramleft; // TODO: the check for going past the end of ram should be in dma.c - UINT32 m_n_psxramsize = m_ram->size(); + uint32_t m_n_psxramsize = m_ram->size(); if(m_has_tektagt_dma && !m_n_dmaoffset) { @@ -1259,7 +1259,7 @@ void namcos12_state::namcos12_rom_read( UINT32 *p_n_psxram, UINT32 n_address, IN verboselog(1, "namcos12_rom_read( %08x, %08x ) game %08x\n", n_address, n_size, n_offset ); } - source = (UINT16 *) memregion( n_region )->base(); + source = (uint16_t *) memregion( n_region )->base(); n_romleft = ( memregion( n_region )->bytes() - n_offset ) / 4; if( n_size > n_romleft ) { @@ -1267,7 +1267,7 @@ void namcos12_state::namcos12_rom_read( UINT32 *p_n_psxram, UINT32 n_address, IN n_size = n_romleft; } - destination = (UINT16 *)p_n_psxram; + destination = (uint16_t *)p_n_psxram; n_ramleft = ( m_n_psxramsize - n_address ) / 4; if( n_size > n_ramleft ) @@ -1347,7 +1347,7 @@ WRITE16_MEMBER(namcos12_state::system11gun_w) READ16_MEMBER(namcos12_state::system11gun_r) { - UINT16 data = 0; + uint16_t data = 0; switch (offset) { @@ -1507,8 +1507,8 @@ void namcos12_state::machine_reset() strcmp( machine().system().name, "ghlpanic" ) == 0 ) { /* HACK: this is based on guesswork, it might not even be keycus. */ - UINT8 *rom = memregion( "maincpu:rom" )->base() + 0x20280; - UINT8 *ram = m_ram->pointer() + 0x10000; + uint8_t *rom = memregion( "maincpu:rom" )->base() + 0x20280; + uint8_t *ram = m_ram->pointer() + 0x10000; memcpy( ram, rom, 12 ); } @@ -1657,7 +1657,7 @@ DRIVER_INIT_MEMBER(namcos12_state,ptblank2) DRIVER_INIT_CALL(namcos12); /* HACK: patch out wait for dma 5 to complete */ - *( (UINT32 *)( memregion( "maincpu:rom" )->base() + 0x331c4 ) ) = 0; + *( (uint32_t *)( memregion( "maincpu:rom" )->base() + 0x331c4 ) ) = 0; } DRIVER_INIT_MEMBER(namcos12_state,technodr) @@ -1665,7 +1665,7 @@ DRIVER_INIT_MEMBER(namcos12_state,technodr) DRIVER_INIT_CALL(namcos12); // HACK: patch H8 to fix COIN ERROR - *( (UINT32 *)( memregion( "sub" )->base() + 0x14b6 ) ) = 0; + *( (uint32_t *)( memregion( "sub" )->base() + 0x14b6 ) ) = 0; } static MACHINE_CONFIG_START( coh700, namcos12_state ) @@ -1776,7 +1776,7 @@ WRITE16_MEMBER(namcos12_state::iob_p4_w) READ16_MEMBER(namcos12_state::iob_p6_r) { // d4 is service button - UINT8 sb = (ioport("SERVICE")->read() & 1) << 4; + uint8_t sb = (ioport("SERVICE")->read() & 1) << 4; // other bits: unknown return sb | 0; |