diff options
Diffstat (limited to 'src/mame/machine/msx.cpp')
-rw-r--r-- | src/mame/machine/msx.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/machine/msx.cpp b/src/mame/machine/msx.cpp index f55a90394f3..de154116dbd 100644 --- a/src/mame/machine/msx.cpp +++ b/src/mame/machine/msx.cpp @@ -61,7 +61,7 @@ void msx_state::machine_start() } -static const UINT8 cc_op[0x100] = { +static const uint8_t cc_op[0x100] = { 4+1,10+1, 7+1, 6+1, 4+1, 4+1, 7+1, 4+1, 4+1,11+1, 7+1, 6+1, 4+1, 4+1, 7+1, 4+1, 8+1,10+1, 7+1, 6+1, 4+1, 4+1, 7+1, 4+1,12+1,11+1, 7+1, 6+1, 4+1, 4+1, 7+1, 4+1, 7+1,10+1,16+1, 6+1, 4+1, 4+1, 7+1, 4+1, 7+1,11+1,16+1, 6+1, 4+1, 4+1, 7+1, 4+1, @@ -80,7 +80,7 @@ static const UINT8 cc_op[0x100] = { 5+1,10+1,10+1, 4+1,10+1,11+1, 7+1,11+1, 5+1, 6+1,10+1, 4+1,10+1, 0 , 7+1,11+1 }; -static const UINT8 cc_cb[0x100] = { +static const uint8_t cc_cb[0x100] = { 8+2, 8+2, 8+2, 8+2, 8+2, 8+2,15+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2,15+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2,15+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2,15+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2,15+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2,15+2, 8+2, @@ -99,7 +99,7 @@ static const UINT8 cc_cb[0x100] = { 8+2, 8+2, 8+2, 8+2, 8+2, 8+2,15+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2,15+2, 8+2 }; -static const UINT8 cc_ed[0x100] = { +static const uint8_t cc_ed[0x100] = { 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, @@ -118,7 +118,7 @@ static const UINT8 cc_ed[0x100] = { 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2, 8+2 }; -static const UINT8 cc_xy[0x100] = { +static const uint8_t cc_xy[0x100] = { 4+4+2,10+4+2, 7+4+2, 6+4+2, 4+4+2, 4+4+2, 7+4+2, 4+4+2, 4+4+2,11+4+2, 7+4+2, 6+4+2, 4+4+2, 4+4+2, 7+4+2, 4+4+2, 8+4+2,10+4+2, 7+4+2, 6+4+2, 4+4+2, 4+4+2, 7+4+2, 4+4+2,12+4+2,11+4+2, 7+4+2, 6+4+2, 4+4+2, 4+4+2, 7+4+2, 4+4+2, 7+4+2,10+4+2,16+4+2, 6+4+2, 4+4+2, 4+4+2, 7+4+2, 4+4+2, 7+4+2,11+4+2,16+4+2, 6+4+2, 4+4+2, 4+4+2, 7+4+2, 4+4+2, @@ -137,7 +137,7 @@ static const UINT8 cc_xy[0x100] = { 5+4+2,10+4+2,10+4+2, 4+4+2,10+4+2,11+4+2, 7+4+2,11+4+2, 5+4+2, 6+4+2,10+4+2, 4+4+2,10+4+2, 4 +1, 7+4+2,11+4+2 }; -static const UINT8 cc_xycb[0x100] = { +static const uint8_t cc_xycb[0x100] = { 23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2, 23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2, 23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2,23+2, @@ -157,7 +157,7 @@ static const UINT8 cc_xycb[0x100] = { }; /* extra cycles if jr/jp/call taken and 'interrupt latency' on rst 0-7 */ -static const UINT8 cc_ex[0x100] = { +static const uint8_t cc_ex[0x100] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* DJNZ */ 5, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, /* JR NZ/JR Z */ @@ -227,14 +227,14 @@ INTERRUPT_GEN_MEMBER(msx_state::msx_interrupt) READ8_MEMBER(msx_state::msx_psg_port_a_r) { - UINT8 data; + uint8_t data; data = (m_cassette->input() > 0.0038 ? 0x80 : 0); if ( (m_psg_b ^ m_io_dsw->read() ) & 0x40) { /* game port 2 */ - UINT8 inp = m_io_joy1->read(); + uint8_t inp = m_io_joy1->read(); if ( !(inp & 0x80) ) { /* joystick */ @@ -253,7 +253,7 @@ READ8_MEMBER(msx_state::msx_psg_port_a_r) else { /* game port 1 */ - UINT8 inp = m_io_joy0->read(); + uint8_t inp = m_io_joy0->read(); if ( !(inp & 0x80) ) { /* joystick */ @@ -359,7 +359,7 @@ WRITE8_MEMBER( msx_state::msx_ppi_port_c_w ) READ8_MEMBER( msx_state::msx_ppi_port_b_r ) { - UINT8 result = 0xff; + uint8_t result = 0xff; int row, data; row = m_keylatch; @@ -380,7 +380,7 @@ READ8_MEMBER( msx_state::msx_ppi_port_b_r ) * ***********************************************************************/ -void msx_state::install_slot_pages(device_t &owner, UINT8 prim, UINT8 sec, UINT8 page, UINT8 numpages, device_t *device) +void msx_state::install_slot_pages(device_t &owner, uint8_t prim, uint8_t sec, uint8_t page, uint8_t numpages, device_t *device) { msx_state &msx = downcast<msx_state &>(owner); msx_internal_slot_interface *internal_slot = dynamic_cast<msx_internal_slot_interface *>(device); @@ -433,7 +433,7 @@ void msx_state::msx_memory_reset () } } -void msx_state::msx_memory_map_page (UINT8 page) +void msx_state::msx_memory_map_page (uint8_t page) { int slot_primary = (m_primary_slot >> (page * 2)) & 3; int slot_secondary = (m_secondary_slot[slot_primary] >> (page * 2)) & 3; @@ -443,7 +443,7 @@ void msx_state::msx_memory_map_page (UINT8 page) void msx_state::msx_memory_map_all () { - for (UINT8 i=0; i<4; i++) + for (uint8_t i=0; i<4; i++) msx_memory_map_page (i); } @@ -488,7 +488,7 @@ READ8_MEMBER( msx_state::msx_sec_slot_r ) READ8_MEMBER( msx_state::msx_kanji_r ) { - UINT8 result = 0xff; + uint8_t result = 0xff; if (offset && m_region_kanji) { |