diff options
Diffstat (limited to 'src/mame/machine/nes.cpp')
-rw-r--r-- | src/mame/machine/nes.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mame/machine/nes.cpp b/src/mame/machine/nes.cpp index 65479795398..97f6070c020 100644 --- a/src/mame/machine/nes.cpp +++ b/src/mame/machine/nes.cpp @@ -47,7 +47,7 @@ void nes_state::machine_start() // NES has 2KB of internal RAM which can be used to fill the 4x1KB banks of PPU RAM at $2000-$2fff // Line A10 is exposed to the carts, so that games can change CIRAM mapping in PPU (we emulate this with the set_nt_mirroring // function). CIRAM can also be disabled by the game (if e.g. VROM or cart RAM has to be used in PPU... - m_ciram = std::make_unique<UINT8[]>(0x800); + m_ciram = std::make_unique<uint8_t[]>(0x800); // other pointers got set in the loading routine, because they 'belong' to the cart itself m_io_disksel = ioport("FLIPDISK"); @@ -114,7 +114,7 @@ void nes_state::machine_start() READ8_MEMBER(nes_state::nes_in0_r) { - UINT8 ret = 0x40; + uint8_t ret = 0x40; ret |= m_ctrl1->read_bit0(); ret |= m_ctrl1->read_bit34(); return ret; @@ -122,7 +122,7 @@ READ8_MEMBER(nes_state::nes_in0_r) READ8_MEMBER(nes_state::nes_in1_r) { - UINT8 ret = 0x40; + uint8_t ret = 0x40; ret |= m_ctrl2->read_bit0(); ret |= m_ctrl2->read_bit34(); return ret; @@ -137,7 +137,7 @@ WRITE8_MEMBER(nes_state::nes_in0_w) READ8_MEMBER(nes_state::fc_in0_r) { - UINT8 ret = 0x40; + uint8_t ret = 0x40; // bit 0 to controller port ret |= m_ctrl1->read_bit0(); @@ -158,7 +158,7 @@ READ8_MEMBER(nes_state::fc_in0_r) READ8_MEMBER(nes_state::fc_in1_r) { - UINT8 ret = 0x40; + uint8_t ret = 0x40; // bit 0 to controller port ret |= m_ctrl2->read_bit0(); @@ -194,10 +194,10 @@ DRIVER_INIT_MEMBER(nes_state,famicom) NESCTRL_BRIGHTPIXEL_CB(nes_state::bright_pixel) { // get the pixel at the gun position - UINT32 pix = m_ppu->get_pixel(x, y); + uint32_t pix = m_ppu->get_pixel(x, y); // get the color base from the ppu - UINT32 color_base = m_ppu->get_colorbase(); + uint32_t color_base = m_ppu->get_colorbase(); // check if the cursor is over a bright pixel if ((pix == color_base + 0x20) || (pix == color_base + 0x30) || |