diff options
Diffstat (limited to 'src/mess/drivers/bbc.c')
-rw-r--r-- | src/mess/drivers/bbc.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/mess/drivers/bbc.c b/src/mess/drivers/bbc.c index fe27b2afe01..c2f53228000 100644 --- a/src/mess/drivers/bbc.c +++ b/src/mess/drivers/bbc.c @@ -293,9 +293,9 @@ static const rgb_t bbc_palette[8]= MAKE_RGB(0x000,0x000,0x000) }; -static PALETTE_INIT( bbc ) +PALETTE_INIT_MEMBER(bbc_state,bbc) { - palette_set_colors(machine, 0, bbc_palette, ARRAY_LENGTH(bbc_palette)); + palette_set_colors(machine(), 0, bbc_palette, ARRAY_LENGTH(bbc_palette)); } /* 2008-05 FP: @@ -843,8 +843,8 @@ static MACHINE_CONFIG_START( bbca, bbc_state ) MCFG_CPU_PERIODIC_INT(bbcb_keyscan, 1000) /* scan keyboard */ MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_MACHINE_START( bbca ) - MCFG_MACHINE_RESET( bbca ) + MCFG_MACHINE_START_OVERRIDE(bbc_state, bbca ) + MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbca ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -853,12 +853,12 @@ static MACHINE_CONFIG_START( bbca, bbc_state ) MCFG_SCREEN_UPDATE_DEVICE("mc6845", mc6845_device, screen_update) MCFG_PALETTE_LENGTH(16) - MCFG_PALETTE_INIT(bbc) + MCFG_PALETTE_INIT_OVERRIDE(bbc_state,bbc) MCFG_SAA505X_VIDEO_ADD("saa505x", bbc_saa505x_intf) MCFG_MC6845_ADD("mc6845",MC6845,2000000, bbc_mc6845_intf) - MCFG_VIDEO_START(bbca) + MCFG_VIDEO_START_OVERRIDE(bbc_state,bbca) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -884,9 +884,9 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( bbcb, bbca ) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( bbcb_mem) - MCFG_MACHINE_START( bbcb ) - MCFG_MACHINE_RESET( bbcb ) - MCFG_VIDEO_START( bbcb ) + MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcb ) + MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcb ) + MCFG_VIDEO_START_OVERRIDE(bbc_state, bbcb ) /* devices */ MCFG_UPD7002_ADD("upd7002", bbc_uPD7002) @@ -909,9 +909,9 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( bbcbp, bbcb ) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( bbcbp_mem) - MCFG_MACHINE_START( bbcbp ) - MCFG_MACHINE_RESET( bbcbp ) - MCFG_VIDEO_START( bbcbp ) + MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcbp ) + MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcbp ) + MCFG_VIDEO_START_OVERRIDE(bbc_state, bbcbp ) MCFG_DEVICE_REMOVE("i8271") MACHINE_CONFIG_END @@ -920,9 +920,9 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( bbcbp128, bbcbp ) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( bbcbp128_mem) - MCFG_MACHINE_START( bbcbp ) - MCFG_MACHINE_RESET( bbcbp ) - MCFG_VIDEO_START( bbcbp ) + MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcbp ) + MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcbp ) + MCFG_VIDEO_START_OVERRIDE(bbc_state, bbcbp ) MACHINE_CONFIG_END @@ -935,8 +935,8 @@ static MACHINE_CONFIG_START( bbcm, bbc_state ) MCFG_CPU_PERIODIC_INT(bbcm_keyscan, 1000) /* scan keyboard */ MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_MACHINE_START( bbcm ) - MCFG_MACHINE_RESET( bbcm ) + MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcm ) + MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcm ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -945,14 +945,14 @@ static MACHINE_CONFIG_START( bbcm, bbc_state ) MCFG_SCREEN_SIZE(800,300) MCFG_SCREEN_VISIBLE_AREA(0,800-1,0,300-1) MCFG_PALETTE_LENGTH(16) - MCFG_PALETTE_INIT(bbc) + MCFG_PALETTE_INIT_OVERRIDE(bbc_state,bbc) MCFG_SCREEN_UPDATE_DEVICE("mc6845", mc6845_device, screen_update) MCFG_SAA505X_VIDEO_ADD("saa505x", bbc_saa505x_intf) MCFG_MC6845_ADD("mc6845",MC6845,2000000, bbc_mc6845_intf) - MCFG_VIDEO_START(bbcm) + MCFG_VIDEO_START_OVERRIDE(bbc_state,bbcm) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") |