diff options
Diffstat (limited to 'src/mame/drivers/famibox.c')
-rw-r--r-- | src/mame/drivers/famibox.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/mame/drivers/famibox.c b/src/mame/drivers/famibox.c index 968d8f1705d..844d5acd6c7 100644 --- a/src/mame/drivers/famibox.c +++ b/src/mame/drivers/famibox.c @@ -80,16 +80,16 @@ public: UINT32 m_in_0_shift; UINT32 m_in_1_shift; - UINT8 m_exception_mask; - UINT8 m_exception_cause; + UINT8 m_exception_mask; + UINT8 m_exception_cause; - emu_timer* m_attract_timer; - UINT8 m_attract_timer_period; + emu_timer* m_attract_timer; + UINT8 m_attract_timer_period; - UINT32 m_coins; + UINT32 m_coins; - emu_timer* m_gameplay_timer; - UINT8 m_money_reg; + emu_timer* m_gameplay_timer; + UINT8 m_money_reg; DECLARE_WRITE8_MEMBER(famibox_nt_w); DECLARE_READ8_MEMBER(famibox_nt_r); @@ -268,7 +268,7 @@ static void famicombox_bankswitch(running_machine &machine, UINT8 bank) for (int i = 0; i < sizeof(famicombox_banks)/sizeof(famicombox_banks[0]); i++ ) { if ( bank == famicombox_banks[i].bank || - famicombox_banks[i].bank == 0 ) + famicombox_banks[i].bank == 0 ) { machine.root_device().membank("cpubank1")->set_base(machine.root_device().memregion(famicombox_banks[i].memory_region)->base() + famicombox_banks[i].bank1_offset); machine.root_device().membank("cpubank2")->set_base(machine.root_device().memregion(famicombox_banks[i].memory_region)->base() + famicombox_banks[i].bank2_offset); @@ -390,11 +390,11 @@ WRITE8_MEMBER(famibox_state::famibox_system_w) static ADDRESS_MAP_START( famibox_map, AS_PROGRAM, 8, famibox_state ) AM_RANGE(0x0000, 0x1fff) AM_RAM AM_RANGE(0x2000, 0x3fff) AM_DEVREADWRITE("ppu", ppu2c0x_device, read, write) - AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE_LEGACY("nes", nes_psg_r, nes_psg_w) /* PSG primary registers */ + AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE_LEGACY("nes", nes_psg_r, nes_psg_w) /* PSG primary registers */ AM_RANGE(0x4014, 0x4014) AM_WRITE(sprite_dma_w) - AM_RANGE(0x4015, 0x4015) AM_READWRITE(psg_4015_r, psg_4015_w) /* PSG status / first control register */ - AM_RANGE(0x4016, 0x4016) AM_READWRITE(famibox_IN0_r, famibox_IN0_w) /* IN0 - input port 1 */ - AM_RANGE(0x4017, 0x4017) AM_READ(famibox_IN1_r) AM_WRITE(psg_4017_w) /* IN1 - input port 2 / PSG second control register */ + AM_RANGE(0x4015, 0x4015) AM_READWRITE(psg_4015_r, psg_4015_w) /* PSG status / first control register */ + AM_RANGE(0x4016, 0x4016) AM_READWRITE(famibox_IN0_r, famibox_IN0_w) /* IN0 - input port 1 */ + AM_RANGE(0x4017, 0x4017) AM_READ(famibox_IN1_r) AM_WRITE(psg_4017_w) /* IN1 - input port 2 / PSG second control register */ AM_RANGE(0x5000, 0x5fff) AM_READWRITE(famibox_system_r, famibox_system_w) AM_RANGE(0x6000, 0x7fff) AM_RAM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("cpubank1") @@ -445,7 +445,7 @@ static INPUT_PORTS_START( famibox ) PORT_START("P1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) /* Select */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) /* Select */ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START1 ) PORT_PLAYER(1) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) @@ -455,7 +455,7 @@ static INPUT_PORTS_START( famibox ) PORT_START("P2") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) /* Select */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) /* Select */ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START2 ) PORT_PLAYER(2) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) @@ -529,10 +529,10 @@ static const ppu2c0x_interface ppu_interface = { "maincpu", "screen", - 0, /* gfxlayout num */ - 0, /* color base */ - PPU_MIRROR_NONE, /* mirroring */ - ppu_irq /* irq */ + 0, /* gfxlayout num */ + 0, /* color base */ + PPU_MIRROR_NONE, /* mirroring */ + ppu_irq /* irq */ }; void famibox_state::video_start() @@ -648,4 +648,3 @@ ROM_START(famibox) ROM_END GAME( 1986, famibox, 0, famibox, famibox, driver_device, 0, ROT0, "Nintendo", "FamicomBox", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND) - |