diff options
Diffstat (limited to 'src/mame/drivers/apple2e.cpp')
-rw-r--r-- | src/mame/drivers/apple2e.cpp | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp index cefc26e00a7..8fb88629dd6 100644 --- a/src/mame/drivers/apple2e.cpp +++ b/src/mame/drivers/apple2e.cpp @@ -361,6 +361,19 @@ public: DECLARE_WRITE8_MEMBER(memexp_w); DECLARE_READ8_MEMBER(nsc_backing_r); + void apple2cp(machine_config &config); + void laser128ex2(machine_config &config); + void spectred(machine_config &config); + void laser128(machine_config &config); + void apple2c_iwm(machine_config &config); + void apple2c_mem(machine_config &config); + void ceci(machine_config &config); + void mprof3(machine_config &config); + void apple2e(machine_config &config); + void apple2ep(machine_config &config); + void apple2c(machine_config &config); + void tk3000(machine_config &config); + void apple2ee(machine_config &config); private: int m_speaker_state; int m_cassette_state, m_cassette_out; @@ -3833,7 +3846,7 @@ static SLOT_INTERFACE_START(apple2eaux_cards) SLOT_INTERFACE("rw3", A2EAUX_RAMWORKS3) /* Applied Engineering RamWorks III */ SLOT_INTERFACE_END -static MACHINE_CONFIG_START( apple2e ) +MACHINE_CONFIG_START(apple2e_state::apple2e) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(apple2e_map) @@ -3993,18 +4006,18 @@ static MACHINE_CONFIG_START( apple2e ) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mprof3, apple2e ) +MACHINE_CONFIG_DERIVED(apple2e_state::mprof3, apple2e) /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("128K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apple2ee, apple2e ) +MACHINE_CONFIG_DERIVED(apple2e_state::apple2ee, apple2e) MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(apple2e_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spectred, apple2e ) +MACHINE_CONFIG_DERIVED(apple2e_state::spectred, apple2e) MCFG_CPU_ADD("keyb_mcu", I8035, XTAL_4MHz) /* guessed frequency */ MCFG_CPU_PROGRAM_MAP(spectred_keyb_map) @@ -4012,7 +4025,7 @@ static MACHINE_CONFIG_DERIVED( spectred, apple2e ) // and then remove the keyb CPU inherited from apple2e MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tk3000, apple2e ) +MACHINE_CONFIG_DERIVED(apple2e_state::tk3000, apple2e) MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(apple2e_map) @@ -4020,12 +4033,12 @@ static MACHINE_CONFIG_DERIVED( tk3000, apple2e ) // MCFG_CPU_PROGRAM_MAP(tk3000_kbd_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apple2ep, apple2e ) +MACHINE_CONFIG_DERIVED(apple2e_state::apple2ep, apple2e) MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(apple2e_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apple2c, apple2ee ) +MACHINE_CONFIG_DERIVED(apple2e_state::apple2c, apple2ee) MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(apple2c_map) @@ -4089,20 +4102,20 @@ static const floppy_interface apple2cp_floppy35_floppy_interface = "floppy_3_5" }; -static MACHINE_CONFIG_DERIVED( apple2cp, apple2c ) +MACHINE_CONFIG_DERIVED(apple2e_state::apple2cp, apple2c) MCFG_A2BUS_SLOT_REMOVE("sl4") MCFG_A2BUS_SLOT_REMOVE("sl6") MCFG_IWM_ADD(IICP_IWM_TAG, a2cp_interface) MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADD(apple2cp_floppy35_floppy_interface) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apple2c_iwm, apple2c ) +MACHINE_CONFIG_DERIVED(apple2e_state::apple2c_iwm, apple2c) MCFG_A2BUS_SLOT_REMOVE("sl6") MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl6", A2BUS_IWM_FDC, NOOP) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apple2c_mem, apple2c ) +MACHINE_CONFIG_DERIVED(apple2e_state::apple2c_mem, apple2c) MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(apple2c_memexp_map) @@ -4131,7 +4144,7 @@ static const floppy_interface floppy_interface = "floppy_5_25" }; -static MACHINE_CONFIG_DERIVED( laser128, apple2c ) +MACHINE_CONFIG_DERIVED(apple2e_state::laser128, apple2c) MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(laser128_map) @@ -4154,7 +4167,7 @@ static MACHINE_CONFIG_DERIVED( laser128, apple2c ) MCFG_RAM_EXTRA_OPTIONS("128K, 384K, 640K, 896K, 1152K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( laser128ex2, apple2c ) +MACHINE_CONFIG_DERIVED(apple2e_state::laser128ex2, apple2c) MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(laser128_map) @@ -4177,7 +4190,7 @@ static MACHINE_CONFIG_DERIVED( laser128ex2, apple2c ) MCFG_RAM_EXTRA_OPTIONS("128K, 384K, 640K, 896K, 1152K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ceci, apple2e ) +MACHINE_CONFIG_DERIVED(apple2e_state::ceci, apple2e) MCFG_A2BUS_SLOT_REMOVE("sl1") MCFG_A2BUS_SLOT_REMOVE("sl2") MCFG_A2BUS_SLOT_REMOVE("sl3") |