Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 17:00:53 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

small MACHINE_RESET cleanup

Browse Source
This commit is contained in:
Oliver Stöneberg 2013-08-05 11:40:00 +00:00
parent e817c41aeb
commit a9b35916ac
39 changed files with 14 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mame/drivers/psikyo.c
View File

@ -609,7 +609,7 @@ static INPUT_PORTS_START( sngkace )
1 1 1 0 Taiwan
************************************************/
#if 0 // See Patch in MACHINE_RESET, only text not logo
#if 0 // See Patch in machine_reset, only text not logo
PORT_CONFNAME( 0x000000ff, 0x000000ff, DEF_STR( Region ) )
PORT_CONFSETTING( 0x000000ff, DEF_STR( Japan ) )
PORT_CONFSETTING( 0x000000ef, "USA & Canada" )

2
src/mame/machine/megavdp.c
View File

@ -221,7 +221,7 @@ void sega_genesis_vdp_device::device_reset()
void sega_genesis_vdp_device::device_reset_old()
{
// other stuff, are we sure we want to set some of these every reset?
// it's called from MACHINE_RESET( megadriv )
// it's called from machine_reset
megadrive_total_scanlines = 262;
m_visible_scanlines = 224;
m_irq6_scanline = 224;

2
src/mame/video/cps1.c
View File

@ -2119,7 +2119,7 @@ VIDEO_START_MEMBER(cps_state,cps)
m_cps_a_regs[CPS1_SCROLL3_BASE] = 0x9080;
m_cps_a_regs[CPS1_OTHER_BASE] = 0x9100;
/* This should never be hit, since game_config is set in MACHINE_RESET */
/* This should never be hit, since game_config is set in machine_reset */
assert_always(m_game_config, "state_game_config hasn't been set up yet");

4
src/mess/drivers/abc1600.c
View File

@ -1881,10 +1881,6 @@ void abc1600_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( abc1600 )
//-------------------------------------------------
void abc1600_state::machine_reset()
{
address_space &program = m_maincpu->space(AS_PROGRAM);

4
src/mess/drivers/adam.c
View File

@ -1074,10 +1074,6 @@ void adam_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( adam )
//-------------------------------------------------
void adam_state::machine_reset()
{
device_image_interface *image = dynamic_cast<device_image_interface *>(machine().device("cart"));

4
src/mess/drivers/apricotp.c
View File

@ -584,10 +584,6 @@ void fp_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( fp )
//-------------------------------------------------
void fp_state::machine_reset()
{
m_video = 0;

2
src/mess/drivers/astrocde.c
View File

@ -267,7 +267,7 @@ static MACHINE_CONFIG_START( astrocde, astrocde_mess_state )
MCFG_SOUND_ADD("astrocade1", ASTROCADE, ASTROCADE_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* optional expansion ram (installed in MACHINE_RESET)*/
/* optional expansion ram (installed in machine_reset)*/
MCFG_RAM_ADD("ram_tag")
MCFG_RAM_DEFAULT_SIZE("32k")

8
src/mess/drivers/bullet.c
View File

@ -1180,10 +1180,6 @@ void bulletf_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( bullet )
//-------------------------------------------------
void bullet_state::machine_reset()
{
// memory banking
@ -1223,10 +1219,6 @@ void bullet_state::machine_reset()
}
//-------------------------------------------------
// MACHINE_RESET( bulletf )
//-------------------------------------------------
void bulletf_state::machine_reset()
{
// memory banking

4
src/mess/drivers/c128.c
View File

@ -1375,10 +1375,6 @@ void c128_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( c128 )
//-------------------------------------------------
void c128_state::machine_reset()
{
m_maincpu->reset();

4
src/mess/drivers/c64.c
View File

@ -1022,10 +1022,6 @@ void c64_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( c64 )
//-------------------------------------------------
void c64_state::machine_reset()
{
m_maincpu->reset();

8
src/mess/drivers/cbm2.c
View File

@ -2087,10 +2087,6 @@ MACHINE_START_MEMBER( p500_state, p500_pal )
}
//-------------------------------------------------
// MACHINE_RESET( cbm2 )
//-------------------------------------------------
MACHINE_RESET_MEMBER( cbm2_state, cbm2 )
{
m_dramon = 1;
@ -2116,10 +2112,6 @@ m_ext_cia_pb = 0xff;
}
//-------------------------------------------------
// MACHINE_RESET( p500 )
//-------------------------------------------------
MACHINE_RESET_MEMBER( p500_state, p500 )
{
MACHINE_RESET_CALL_MEMBER(cbm2);

4
src/mess/drivers/cgc7900.c
View File

@ -401,10 +401,6 @@ void cgc7900_state::machine_start()
save_pointer(NAME(m_overlay_ram.target()), 0x4000);
}
/*-------------------------------------------------
MACHINE_RESET( cgc7900 )
-------------------------------------------------*/
void cgc7900_state::machine_reset()
{
}

4
src/mess/drivers/comx35.c
View File

@ -650,10 +650,6 @@ void comx35_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( comx35 )
//-------------------------------------------------
void comx35_state::machine_reset()
{
m_exp->reset();

4
src/mess/drivers/ep64.c
View File

@ -503,10 +503,6 @@ void ep64_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( ep64 )
//-------------------------------------------------
void ep64_state::machine_reset()
{
m_dave->reset();

4
src/mess/drivers/m5.c
View File

@ -619,10 +619,6 @@ void m5_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( m5 )
//-------------------------------------------------
void m5_state::machine_reset()
{
}

4
src/mess/drivers/mikromik.c
View File

@ -750,10 +750,6 @@ void mm1_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( mm1 )
//-------------------------------------------------
void mm1_state::machine_reset()
{
address_space &program = m_maincpu->space(AS_PROGRAM);

4
src/mess/drivers/mpz80.c
View File

@ -696,10 +696,6 @@ void mpz80_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( mpz80 )
//-------------------------------------------------
void mpz80_state::machine_reset()
{
m_trap_reset = 0;

4
src/mess/drivers/ob68k1a.c
View File

@ -307,10 +307,6 @@ void ob68k1a_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( ob68k1a )
//-------------------------------------------------
void ob68k1a_state::machine_reset()
{
// initialize COM8116

8
src/mess/drivers/pc1512.c
View File

@ -1209,10 +1209,6 @@ void pc1512_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( pc1512 )
//-------------------------------------------------
void pc1512_state::machine_reset()
{
m_nmi_enable = 0;
@ -1272,10 +1268,6 @@ void pc1640_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( pc1640 )
//-------------------------------------------------
void pc1640_state::machine_reset()
{
m_nmi_enable = 0;

12
src/mess/drivers/pet.c
View File

@ -1326,10 +1326,6 @@ MACHINE_START_MEMBER( pet_state, pet2001 )
}
//-------------------------------------------------
// MACHINE_RESET( pet )
//-------------------------------------------------
MACHINE_RESET_MEMBER( pet_state, pet )
{
m_maincpu->reset();
@ -1356,10 +1352,6 @@ MACHINE_START_MEMBER( pet80_state, pet80 )
}
//-------------------------------------------------
// MACHINE_RESET( pet80 )
//-------------------------------------------------
MACHINE_RESET_MEMBER( pet80_state, pet80 )
{
MACHINE_RESET_CALL_MEMBER(pet);
@ -1382,10 +1374,6 @@ MACHINE_START_MEMBER( cbm8296_state, cbm8296 )
}
//-------------------------------------------------
// MACHINE_RESET( cbm8296 )
//-------------------------------------------------
MACHINE_RESET_MEMBER( cbm8296_state, cbm8296 )
{
MACHINE_RESET_CALL_MEMBER(pet80);

4
src/mess/drivers/plus4.c
View File

@ -683,10 +683,6 @@ void plus4_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( plus4 )
//-------------------------------------------------
void plus4_state::machine_reset()
{
m_maincpu->reset();

4
src/mess/drivers/prof80.c
View File

@ -574,10 +574,6 @@ void prof80_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( prof80 )
//-------------------------------------------------
void prof80_state::machine_reset()
{
int i;

4
src/mess/drivers/sage2.c
View File

@ -547,10 +547,6 @@ void sage2_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( sage2 )
//-------------------------------------------------
void sage2_state::machine_reset()
{
m_reset = 1;

4
src/mess/drivers/sg1000.c
View File

@ -763,10 +763,6 @@ void sf7000_state::machine_start()
membank("bank2")->configure_entry(0, m_ram->pointer());
}
/*-------------------------------------------------
MACHINE_RESET( sf7000 )
-------------------------------------------------*/
void sf7000_state::machine_reset()
{
membank("bank1")->set_entry(0);

4
src/mess/drivers/super6.c
View File

@ -547,10 +547,6 @@ void super6_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( super6 )
//-------------------------------------------------
void super6_state::machine_reset()
{
m_bank0 = m_bank1 = 0;

4
src/mess/drivers/superslave.c
View File

@ -425,10 +425,6 @@ void superslave_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( superslave )
//-------------------------------------------------
void superslave_state::machine_reset()
{
m_memctrl = 0x01;

4
src/mess/drivers/vic10.c
View File

@ -579,10 +579,6 @@ void vic10_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( vic10 )
//-------------------------------------------------
void vic10_state::machine_reset()
{
m_maincpu->reset();

4
src/mess/drivers/vic20.c
View File

@ -637,10 +637,6 @@ void vic20_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( vic20 )
//-------------------------------------------------
void vic20_state::machine_reset()
{
m_maincpu->reset();

4
src/mess/drivers/vidbrain.c
View File

@ -547,10 +547,6 @@ void vidbrain_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( vidbrain )
//-------------------------------------------------
void vidbrain_state::machine_reset()
{
m_int_enable = 0;

4
src/mess/drivers/vip.c
View File

@ -670,10 +670,6 @@ void vip_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( vip )
//-------------------------------------------------
void vip_state::machine_reset()
{
// reset the VDC

4
src/mess/drivers/vixen.c
View File

@ -769,10 +769,6 @@ void vixen_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( vixen )
//-------------------------------------------------
void vixen_state::machine_reset()
{
address_space &program = m_maincpu->space(AS_PROGRAM);

4
src/mess/drivers/wangpc.c
View File

@ -1138,10 +1138,6 @@ void wangpc_state::machine_start()
}
//-------------------------------------------------
// MACHINE_RESET( wangpc )
//-------------------------------------------------
void wangpc_state::machine_reset()
{
// initialize UART

4
src/mess/includes/wswan.h
View File

@ -94,8 +94,8 @@ struct VDP
UINT8 timer_vblank_mode; /* Vertical blank timer mode */
UINT16 timer_vblank_reload; /* Vertical blank timer reload value */
UINT16 timer_vblank_count; /* Vertical blank timer counter value */
UINT8 *vram; /* pointer to start of ram/vram (set by MACHINE_RESET) */
UINT8 *palette_vram; /* pointer to start of palette area in ram/vram (set by MACHINE_RESET), WSC only */
UINT8 *vram; /* pointer to start of ram/vram (set by machine_reset) */
UINT8 *palette_vram; /* pointer to start of palette area in ram/vram (set by machine_reset), WSC only */
int main_palette[8];
emu_timer *timer;
};

4
src/mess/machine/apple1.c
View File

@ -152,10 +152,6 @@ DRIVER_INIT_MEMBER(apple1_state,apple1)
}
/*****************************************************************************
** MACHINE_RESET: actions to perform on each cold boot.
*****************************************************************************/
void apple1_state::machine_reset()
{
/* Reset the display hardware. */

2
src/mess/machine/bbc.c
View File

@ -2152,7 +2152,7 @@ MACHINE_START_MEMBER(bbc_state,bbcb)
{
m_mc6850_clock = 0;
//removed from here because MACHINE_START can no longer read DIP swiches.
//put in MACHINE_RESET instead.
//put in machine_reset instead.
//m_DFSType= (ioport("BBCCONFIG")->read()>>0)&0x07;
//m_SWRAMtype=(ioport("BBCCONFIG")->read()>>3)&0x03;
//m_RAMSize= (ioport("BBCCONFIG")->read()>>5)&0x01;

2
src/mess/machine/dgn_beta.c
View File

@ -999,7 +999,7 @@ void dgn_beta_state::machine_reset()
pia6821_device *pia_1 = machine().device<pia6821_device>( PIA_1_TAG );
pia6821_device *pia_2 = machine().device<pia6821_device>( PIA_2_TAG );
logerror("MACHINE_RESET( dgnbeta )\n");
logerror("dgn_beta_state::machine_reset()\n");
m_system_rom = memregion(MAINCPU_TAG)->base();

4
src/mess/machine/mtx.c
View File

@ -397,10 +397,6 @@ MACHINE_START_MEMBER(mtx_state,mtx512)
membank("bank4")->configure_entries(0, messram->size()/0x4000/2, messram->pointer() + messram->size()/2, 0x4000);
}
/*-------------------------------------------------
MACHINE_RESET( mtx512 )
-------------------------------------------------*/
MACHINE_RESET_MEMBER(mtx_state,mtx512)
{
/* bank switching */

2
src/mess/machine/thomson.c
View File

@ -855,7 +855,7 @@ void thomson_state::to7_modem_reset()
LOG (( "to7_modem_reset called\n" ));
m_to7_modem_rx = 0;
m_to7_modem_tx = 0;
/* pia_reset() is called in MACHINE_RESET */
/* pia_reset() is called in machine_reset */
/* acia_6850 has no reset (?) */
}

10
src/mess/machine/z80ne.c
View File

@ -278,7 +278,7 @@ MACHINE_RESET_MEMBER(z80ne_state,z80ne_base)
{
int i;
LOG(("In MACHINE_RESET z80ne_base\n"));
LOG(("In machine_reset z80ne_base\n"));
for ( i=0; i<LX383_KEYS; i++)
m_lx383_key[i] = 0xf0 | i;
@ -329,28 +329,28 @@ MACHINE_RESET_MEMBER(z80ne_state,z80ne_base)
MACHINE_RESET_MEMBER(z80ne_state,z80ne)
{
LOG(("In MACHINE_RESET z80ne\n"));
LOG(("In machine_reset z80ne\n"));
reset_lx382_banking();
MACHINE_RESET_CALL_MEMBER( z80ne_base );
}
MACHINE_RESET_MEMBER(z80ne_state,z80net)
{
LOG(("In MACHINE_RESET z80net\n"));
LOG(("In machine_reset z80net\n"));
MACHINE_RESET_CALL_MEMBER( z80ne );
reset_lx388();
}
MACHINE_RESET_MEMBER(z80ne_state,z80netb)
{
LOG(("In MACHINE_RESET z80netb\n"));
LOG(("In machine_reset z80netb\n"));
MACHINE_RESET_CALL_MEMBER( z80ne_base );
reset_lx388();
}
MACHINE_RESET_MEMBER(z80ne_state,z80netf)
{
LOG(("In MACHINE_RESET z80netf\n"));
LOG(("In machine_reset z80netf\n"));
reset_lx390_banking();
MACHINE_RESET_CALL_MEMBER( z80ne_base );
reset_lx388();