diff options
Diffstat (limited to 'src/mame/drivers/zx.cpp')
-rw-r--r-- | src/mame/drivers/zx.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mame/drivers/zx.cpp b/src/mame/drivers/zx.cpp index 1b2b4442568..0708b92a05c 100644 --- a/src/mame/drivers/zx.cpp +++ b/src/mame/drivers/zx.cpp @@ -318,7 +318,7 @@ PALETTE_INIT_MEMBER(zx_state, zx) /* Machine Configs */ -static MACHINE_CONFIG_START( zx80 ) +MACHINE_CONFIG_START(zx_state::zx80) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_6_5MHz/2) MCFG_CPU_PROGRAM_MAP(zx80_map) @@ -352,7 +352,7 @@ static MACHINE_CONFIG_START( zx80 ) MCFG_RAM_EXTRA_OPTIONS("1K,2K,3K,16K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( zx81, zx80 ) +MACHINE_CONFIG_DERIVED(zx_state::zx81, zx80) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(zx81_map) MCFG_CPU_IO_MAP(zx81_io_map) @@ -370,7 +370,7 @@ static MACHINE_CONFIG_DERIVED( zx81, zx80 ) MCFG_RAM_EXTRA_OPTIONS("1K,32K,48K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( zx81_spk, zx81 ) +MACHINE_CONFIG_DERIVED(zx_state::zx81_spk, zx81 ) /* sound hardware */ /* Used by pc8300/lambda/pow3000 */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -380,20 +380,20 @@ static MACHINE_CONFIG_DERIVED( zx81_spk, zx81 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ts1000, zx81 ) +MACHINE_CONFIG_DERIVED(zx_state::ts1000, zx81) /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("2K") MCFG_RAM_EXTRA_OPTIONS("1K,16K,32K,48K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ts1500, ts1000 ) +MACHINE_CONFIG_DERIVED(zx_state::ts1500, ts1000) /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("16K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc8300, zx81_spk ) +MACHINE_CONFIG_DERIVED(zx_state::pc8300, zx81_spk) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(pc8300_io_map) @@ -402,7 +402,7 @@ static MACHINE_CONFIG_DERIVED( pc8300, zx81_spk ) MCFG_RAM_DEFAULT_SIZE("16K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pow3000, zx81_spk ) +MACHINE_CONFIG_DERIVED(zx_state::pow3000, zx81_spk) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(pow3000_io_map) |