diff options
author | 2016-10-22 13:13:17 +0200 | |
---|---|---|
committer | 2016-10-22 13:13:17 +0200 | |
commit | ddb290d5f615019c33c42b8d94e5a5254cabcf33 (patch) | |
tree | a70f688b0df3acd19da7b1151e5902e3c6af3fa5 /src/mame/drivers/pegasus.cpp | |
parent | 333bff8de64dfaeb98134000412796b4fdef970b (diff) |
NOTICE (TYPE NAME CONSOLIDATION)
Use standard uint64_t, uint32_t, uint16_t or uint8_t instead of UINT64, UINT32, UINT16 or UINT8
also use standard int64_t, int32_t, int16_t or int8_t instead of INT64, INT32, INT16 or INT8
Diffstat (limited to 'src/mame/drivers/pegasus.cpp')
-rw-r--r-- | src/mame/drivers/pegasus.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp index fe4f163d20f..9242aa05ffd 100644 --- a/src/mame/drivers/pegasus.cpp +++ b/src/mame/drivers/pegasus.cpp @@ -75,7 +75,7 @@ public: DECLARE_READ_LINE_MEMBER(pegasus_cassette_r); DECLARE_WRITE_LINE_MEMBER(pegasus_cassette_w); DECLARE_WRITE_LINE_MEMBER(pegasus_firq_clr); - UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_DRIVER_INIT(pegasus); TIMER_DEVICE_CALLBACK_MEMBER(pegasus_firq); image_init_result load_cart(device_image_interface &image, generic_slot_device *slot, const char *reg_tag); @@ -85,15 +85,15 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER(exp0c_load) { return load_cart(image, m_exp_0c, "c000"); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER(exp0d_load) { return load_cart(image, m_exp_0d, "d000"); } private: - UINT8 m_kbd_row; + uint8_t m_kbd_row; bool m_kbd_irq; - UINT8 *m_p_pcgram; - const UINT8 *m_p_chargen; - UINT8 m_control_bits; + uint8_t *m_p_pcgram; + const uint8_t *m_p_chargen; + uint8_t m_control_bits; virtual void machine_reset() override; virtual void machine_start() override; virtual void video_start() override; - void pegasus_decrypt_rom(UINT8 *ROM); + void pegasus_decrypt_rom(uint8_t *ROM); required_device<cpu_device> m_maincpu; required_device<cassette_image_device> m_cass; required_device<pia6821_device> m_pia_s; @@ -103,7 +103,7 @@ private: required_device<generic_slot_device> m_exp_02; required_device<generic_slot_device> m_exp_0c; required_device<generic_slot_device> m_exp_0d; - required_shared_ptr<UINT8> m_p_videoram; + required_shared_ptr<uint8_t> m_p_videoram; required_ioport_array<8> m_io_keyboard; }; @@ -119,7 +119,7 @@ WRITE_LINE_MEMBER( pegasus_state::pegasus_firq_clr ) READ8_MEMBER( pegasus_state::pegasus_keyboard_r ) { - UINT8 i,data = 0xff; + uint8_t i,data = 0xff; for (i = 0; i < 8; i++) if (!BIT(m_kbd_row, i)) data &= m_io_keyboard[i]->read(); @@ -163,7 +163,7 @@ WRITE_LINE_MEMBER( pegasus_state::pegasus_cassette_w ) READ8_MEMBER( pegasus_state::pegasus_pcg_r ) { - UINT8 code = m_p_videoram[offset] & 0x7f; + uint8_t code = m_p_videoram[offset] & 0x7f; return m_p_pcgram[(code << 4) | (~m_kbd_row & 15)]; } @@ -171,7 +171,7 @@ WRITE8_MEMBER( pegasus_state::pegasus_pcg_w ) { // if (BIT(m_control_bits, 1)) { - UINT8 code = m_p_videoram[offset] & 0x7f; + uint8_t code = m_p_videoram[offset] & 0x7f; m_p_pcgram[(code << 4) | (~m_kbd_row & 15)] = data; } } @@ -179,7 +179,7 @@ WRITE8_MEMBER( pegasus_state::pegasus_pcg_w ) /* Must return the A register except when it is doing a rom search */ READ8_MEMBER( pegasus_state::pegasus_protection_r ) { - UINT8 data = m_maincpu->state_int(M6809_A); + uint8_t data = m_maincpu->state_int(M6809_A); if (data == 0x20) data = 0xff; return data; } @@ -291,7 +291,7 @@ void pegasus_state::video_start() m_p_chargen = memregion("chargen")->base(); } -static const UINT8 mcm6571a_shift[] = +static const uint8_t mcm6571a_shift[] = { 0,1,1,0,0,0,1,0,0,0,0,1,0,0,0,0, 1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0, @@ -304,17 +304,17 @@ static const UINT8 mcm6571a_shift[] = }; -UINT32 pegasus_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +uint32_t pegasus_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - UINT8 y,ra,chr,gfx,inv; - UINT16 sy=0,ma=0,x; + uint8_t y,ra,chr,gfx,inv; + uint16_t sy=0,ma=0,x; bool pcg_mode = BIT(m_control_bits, 1); for(y = 0; y < 16; y++ ) { for(ra = 0; ra < 16; ra++ ) { - UINT16 *p = &bitmap.pix16(sy++); + uint16_t *p = &bitmap.pix16(sy++); for(x = ma; x < ma + 32; x++ ) { @@ -386,12 +386,12 @@ GFXDECODE_END // An encrypted single rom starts with 02, decrypted with 20. // The 2nd and 3rd part of a multi-rom set will have no obvious byte, // so we check the first 4 bytes for a signature, and decrypt if found. -void pegasus_state::pegasus_decrypt_rom(UINT8 *ROM) +void pegasus_state::pegasus_decrypt_rom(uint8_t *ROM) { bool doit = FALSE; - UINT8 b; - UINT16 j; - std::vector<UINT8> temp_copy; + uint8_t b; + uint16_t j; + std::vector<uint8_t> temp_copy; temp_copy.resize(0x1000); if (ROM[0] == 0x02) doit = TRUE; @@ -415,7 +415,7 @@ void pegasus_state::pegasus_decrypt_rom(UINT8 *ROM) image_init_result pegasus_state::load_cart(device_image_interface &image, generic_slot_device *slot, const char *reg_tag) { - UINT32 size = slot->common_get_size(reg_tag); + uint32_t size = slot->common_get_size(reg_tag); bool any_socket = false; if (size > 0x1000) @@ -476,7 +476,7 @@ void pegasus_state::machine_reset() DRIVER_INIT_MEMBER(pegasus_state, pegasus) { // decrypt monitor - UINT8 *base = memregion("maincpu")->base() + 0xf000; + uint8_t *base = memregion("maincpu")->base() + 0xf000; pegasus_decrypt_rom(base); } |