diff options
Diffstat (limited to 'src/mame/drivers/multigam.cpp')
-rw-r--r-- | src/mame/drivers/multigam.cpp | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/src/mame/drivers/multigam.cpp b/src/mame/drivers/multigam.cpp index e3f72a883a0..a25889e7fc8 100644 --- a/src/mame/drivers/multigam.cpp +++ b/src/mame/drivers/multigam.cpp @@ -128,40 +128,40 @@ public: required_ioport m_p2; optional_ioport m_dsw; - std::unique_ptr<UINT8[]> m_nt_ram; - std::unique_ptr<UINT8[]> m_vram; - UINT8* m_nt_page[4]; - UINT32 m_in_0; - UINT32 m_in_1; - UINT32 m_in_0_shift; - UINT32 m_in_1_shift; - UINT32 m_in_dsw; - UINT32 m_in_dsw_shift; + std::unique_ptr<uint8_t[]> m_nt_ram; + std::unique_ptr<uint8_t[]> m_vram; + uint8_t* m_nt_page[4]; + uint32_t m_in_0; + uint32_t m_in_1; + uint32_t m_in_0_shift; + uint32_t m_in_1_shift; + uint32_t m_in_dsw; + uint32_t m_in_dsw_shift; int m_game_gfx_bank; int m_multigam3_mmc3_scanline_counter; int m_multigam3_mmc3_scanline_latch; int m_multigam3_mmc3_banks[2]; int m_multigam3_mmc3_4screen; int m_multigam3_mmc3_last_bank; - std::unique_ptr<UINT8[]> m_multigmc_mmc3_6000_ram; - UINT8* m_multigam3_mmc3_prg_base; + std::unique_ptr<uint8_t[]> m_multigmc_mmc3_6000_ram; + uint8_t* m_multigam3_mmc3_prg_base; int m_multigam3_mmc3_prg_size; int m_multigam3_mmc3_chr_bank_base; int m_multigam3_mmc3_command; - UINT8* m_mapper02_prg_base; + uint8_t* m_mapper02_prg_base; int m_mapper02_prg_size; int m_mmc1_shiftreg; int m_mmc1_shiftcount; int m_mmc1_rom_mask; - UINT8* m_mmc1_prg_base; + uint8_t* m_mmc1_prg_base; int m_mmc1_prg_size; int m_mmc1_chr_bank_base; int m_mmc1_reg_write_enable; int m_size16k; int m_switchlow; int m_vrom4k; - UINT8 m_supergm3_prg_bank; - UINT8 m_supergm3_chr_bank; + uint8_t m_supergm3_prg_bank; + uint8_t m_supergm3_chr_bank; DECLARE_CUSTOM_INPUT_MEMBER(multigam_inputs_r); DECLARE_WRITE8_MEMBER(multigam_nt_w); DECLARE_READ8_MEMBER(multigam_nt_r); @@ -191,15 +191,15 @@ public: DECLARE_MACHINE_START(multigm3); DECLARE_MACHINE_RESET(multigm3); DECLARE_MACHINE_START(supergm3); - UINT32 screen_update_multigam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update_multigam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(mmc1_resync_callback); void set_videorom_bank( int start, int count, int bank, int bank_size_in_kb); void set_videoram_bank( int start, int count, int bank, int bank_size_in_kb); - void multigam_init_mmc3(UINT8 *prg_base, int prg_size, int chr_bank_base); - void multigam_init_mapper02(UINT8* prg_base, int prg_size); - void multigam_init_mmc1(UINT8 *prg_base, int prg_size, int chr_bank_base); + void multigam_init_mmc3(uint8_t *prg_base, int prg_size, int chr_bank_base); + void multigam_init_mapper02(uint8_t* prg_base, int prg_size); + void multigam_init_mmc1(uint8_t *prg_base, int prg_size, int chr_bank_base); void supergm3_set_bank(); - void multigm3_decrypt(UINT8* mem, int memsize, const UINT8* decode_nibble); + void multigm3_decrypt(uint8_t* mem, int memsize, const uint8_t* decode_nibble); void multigam3_mmc3_scanline_cb(int scanline, int vblank, int blanked); void ppu_irq(int *ppu_regs); }; @@ -348,8 +348,8 @@ CUSTOM_INPUT_MEMBER(multigam_state::multigam_inputs_r) WRITE8_MEMBER(multigam_state::multigam_switch_prg_rom) { /* switch PRG rom */ - UINT8* dst = memregion("maincpu")->base(); - UINT8* src = memregion("user1")->base(); + uint8_t* dst = memregion("maincpu")->base(); + uint8_t* src = memregion("user1")->base(); if (data & 0x80) { @@ -456,7 +456,7 @@ WRITE8_MEMBER(multigam_state::multigam3_mmc3_rom_switch_w) if (m_multigam3_mmc3_last_bank != (data & 0xc0)) { int bank; - UINT8 *prg = memregion("maincpu")->base(); + uint8_t *prg = memregion("maincpu")->base(); /* reset the banks */ if (m_multigam3_mmc3_command & 0x40) @@ -486,7 +486,7 @@ WRITE8_MEMBER(multigam_state::multigam3_mmc3_rom_switch_w) case 0x0001: { - UINT8 cmd = m_multigam3_mmc3_command & 0x07; + uint8_t cmd = m_multigam3_mmc3_command & 0x07; int page = (m_multigam3_mmc3_command & 0x80) >> 5; int bank; @@ -509,7 +509,7 @@ WRITE8_MEMBER(multigam_state::multigam3_mmc3_rom_switch_w) case 6: /* program banking */ { - UINT8 *prg = memregion("maincpu")->base(); + uint8_t *prg = memregion("maincpu")->base(); if (m_multigam3_mmc3_command & 0x40) { /* high bank */ @@ -534,7 +534,7 @@ WRITE8_MEMBER(multigam_state::multigam3_mmc3_rom_switch_w) case 7: /* program banking */ { /* mid bank */ - UINT8 *prg = memregion("maincpu")->base(); + uint8_t *prg = memregion("maincpu")->base(); m_multigam3_mmc3_banks[1] = data & bankmask; bank = m_multigam3_mmc3_banks[1] * 0x2000; @@ -590,9 +590,9 @@ WRITE8_MEMBER(multigam_state::multigam3_mmc3_rom_switch_w) } } -void multigam_state::multigam_init_mmc3(UINT8 *prg_base, int prg_size, int chr_bank_base) +void multigam_state::multigam_init_mmc3(uint8_t *prg_base, int prg_size, int chr_bank_base) { - UINT8* dst = memregion("maincpu")->base(); + uint8_t* dst = memregion("maincpu")->base(); // Tom & Jerry in Super Game III enables 6000 ram, but does not read/write it // however, it expects ROM from 6000 there (code jumps to $6xxx) @@ -636,8 +636,8 @@ WRITE8_MEMBER(multigam_state::multigm3_switch_gfx_rom) WRITE8_MEMBER(multigam_state::multigm3_switch_prg_rom) { /* switch PRG rom */ - UINT8* dst = memregion("maincpu")->base(); - UINT8* src = memregion("user1")->base(); + uint8_t* dst = memregion("maincpu")->base(); + uint8_t* src = memregion("user1")->base(); if (data == 0xa8) { @@ -697,14 +697,14 @@ ADDRESS_MAP_END WRITE8_MEMBER(multigam_state::multigam3_mapper02_rom_switch_w) { - UINT8* mem = memregion("maincpu")->base(); + uint8_t* mem = memregion("maincpu")->base(); int bankmask = (m_mapper02_prg_size/0x4000) - 1; memcpy(mem + 0x8000, m_mapper02_prg_base + 0x4000*(data & bankmask), 0x4000); } -void multigam_state::multigam_init_mapper02(UINT8* prg_base, int prg_size) +void multigam_state::multigam_init_mapper02(uint8_t* prg_base, int prg_size) { - UINT8* mem = memregion("maincpu")->base(); + uint8_t* mem = memregion("maincpu")->base(); memcpy(mem + 0x8000, prg_base + prg_size - 0x8000, 0x8000); m_maincpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(multigam_state::multigam3_mapper02_rom_switch_w),this)); @@ -823,7 +823,7 @@ WRITE8_MEMBER(multigam_state::mmc1_rom_switch_w) case 3: /* program banking */ { int bank = (m_mmc1_shiftreg & m_mmc1_rom_mask) * 0x4000; - UINT8 *prg = memregion("maincpu")->base(); + uint8_t *prg = memregion("maincpu")->base(); if (!m_size16k) { @@ -853,9 +853,9 @@ WRITE8_MEMBER(multigam_state::mmc1_rom_switch_w) } } -void multigam_state::multigam_init_mmc1(UINT8 *prg_base, int prg_size, int chr_bank_base) +void multigam_state::multigam_init_mmc1(uint8_t *prg_base, int prg_size, int chr_bank_base) { - UINT8* dst = memregion("maincpu")->base(); + uint8_t* dst = memregion("maincpu")->base(); memcpy(&dst[0x8000], prg_base + (prg_size - 0x8000), 0x8000); @@ -895,7 +895,7 @@ void multigam_state::multigam_init_mmc1(UINT8 *prg_base, int prg_size, int chr_b void multigam_state::supergm3_set_bank() { - UINT8* mem = memregion("maincpu")->base(); + uint8_t* mem = memregion("maincpu")->base(); // video bank if (m_supergm3_chr_bank == 0x10 || @@ -1133,7 +1133,7 @@ void multigam_state::video_start() { } -UINT32 multigam_state::screen_update_multigam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +uint32_t multigam_state::screen_update_multigam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { /* render the ppu */ m_ppu->render(bitmap, 0, 0, 0, 0); @@ -1163,7 +1163,7 @@ MACHINE_RESET_MEMBER(multigam_state,multigm3) void multigam_state::machine_start() { - m_nt_ram = std::make_unique<UINT8[]>(0x1000); + m_nt_ram = std::make_unique<uint8_t[]>(0x1000); m_nt_page[0] = m_nt_ram.get(); m_nt_page[1] = m_nt_ram.get() + 0x400; m_nt_page[2] = m_nt_ram.get() + 0x800; @@ -1176,7 +1176,7 @@ void multigam_state::machine_start() MACHINE_START_MEMBER(multigam_state,multigm3) { - m_nt_ram = std::make_unique<UINT8[]>(0x1000); + m_nt_ram = std::make_unique<uint8_t[]>(0x1000); m_nt_page[0] = m_nt_ram.get(); m_nt_page[1] = m_nt_ram.get() + 0x400; m_nt_page[2] = m_nt_ram.get() + 0x800; @@ -1198,7 +1198,7 @@ MACHINE_START_MEMBER(multigam_state,multigm3) MACHINE_START_MEMBER(multigam_state,supergm3) { - m_nt_ram = std::make_unique<UINT8[]>(0x1000); + m_nt_ram = std::make_unique<uint8_t[]>(0x1000); m_nt_page[0] = m_nt_ram.get(); m_nt_page[1] = m_nt_ram.get() + 0x400; m_nt_page[2] = m_nt_ram.get() + 0x800; @@ -1206,8 +1206,8 @@ MACHINE_START_MEMBER(multigam_state,supergm3) m_ppu->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(multigam_state::multigam_nt_r),this), write8_delegate(FUNC(multigam_state::multigam_nt_w),this)); - m_vram = std::make_unique<UINT8[]>(0x2000); - m_multigmc_mmc3_6000_ram = std::make_unique<UINT8[]>(0x2000); + m_vram = std::make_unique<uint8_t[]>(0x2000); + m_multigmc_mmc3_6000_ram = std::make_unique<uint8_t[]>(0x2000); } static MACHINE_CONFIG_START( multigam, multigam_state ) @@ -1393,7 +1393,7 @@ DRIVER_INIT_MEMBER(multigam_state,multigam) multigam_switch_prg_rom(space, 0x0, 0x01); } -void multigam_state::multigm3_decrypt(UINT8* mem, int memsize, const UINT8* decode_nibble) +void multigam_state::multigm3_decrypt(uint8_t* mem, int memsize, const uint8_t* decode_nibble) { int i; for (i = 0; i < memsize; i++) @@ -1406,12 +1406,12 @@ DRIVER_INIT_MEMBER(multigam_state,multigm3) { address_space &space = m_maincpu->space(AS_PROGRAM); - const UINT8 decode[16] = { 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a }; + const uint8_t decode[16] = { 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a }; multigm3_decrypt(memregion("maincpu")->base(), memregion("maincpu")->bytes(), decode ); multigm3_decrypt(memregion("user1")->base(), memregion("user1")->bytes(), decode ); - m_multigmc_mmc3_6000_ram = std::make_unique<UINT8[]>(0x2000); + m_multigmc_mmc3_6000_ram = std::make_unique<uint8_t[]>(0x2000); multigam_switch_prg_rom(space, 0x0, 0x01); } @@ -1420,8 +1420,8 @@ DRIVER_INIT_MEMBER(multigam_state,multigmt) { address_space &space = m_maincpu->space(AS_PROGRAM); - std::vector<UINT8> buf(0x80000); - UINT8 *rom; + std::vector<uint8_t> buf(0x80000); + uint8_t *rom; int size; int i; int addr; |