summaryrefslogtreecommitdiffstats
path: root/src/mame/machine/nes.cpp
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-10-22 13:13:17 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-10-22 13:13:17 +0200
commitddb290d5f615019c33c42b8d94e5a5254cabcf33 (patch)
treea70f688b0df3acd19da7b1151e5902e3c6af3fa5 /src/mame/machine/nes.cpp
parent333bff8de64dfaeb98134000412796b4fdef970b (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/machine/nes.cpp')
-rw-r--r--src/mame/machine/nes.cpp14
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) ||