diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp index a5cada11c3d..647fb179c2e 100644 --- a/src/mame/drivers/apple2e.cpp +++ b/src/mame/drivers/apple2e.cpp @@ -374,11 +374,7 @@ public: void laser128(machine_config &config); void apple2c_iwm(machine_config &config); void apple2c_mem(machine_config &config); - void ceci(machine_config &config); - void cece(machine_config &config); - void cecg(machine_config &config); - void cecm(machine_config &config); - void cec2000(machine_config &config); + void cec(machine_config &config); void mprof3(machine_config &config); void apple2e(machine_config &config); void apple2ep(machine_config &config); @@ -966,7 +962,7 @@ void apple2e_state::machine_reset() m_page2 = false; m_video->m_page2 = false; m_video->m_monohgr = false; - if(m_iscecm) m_video->m_monohgr = true; + if(m_iscecm) m_video->m_monohgr = true; m_an0 = m_an1 = m_an2 = m_an3 = false; m_gameio->an0_w(0); m_gameio->an1_w(0); @@ -2350,14 +2346,14 @@ void apple2e_state::write_slot_rom(int slotbias, int offset, uint8_t data) { m_cec_bank = data; /* - if (data & 0x10) - { - m_video->m_monohgr = false; - } - else - { - m_video->m_monohgr = true; - } + if (data & 0x10) + { + m_video->m_monohgr = false; + } + else + { + m_video->m_monohgr = true; + } */ auxbank_update(); update_slotrom_banks(); @@ -4855,87 +4851,7 @@ void apple2e_state::laser128ex2(machine_config &config) m_ram->set_default_size("128K").set_extra_options("128K, 384K, 640K, 896K, 1152K"); } -void apple2e_state::ceci(machine_config &config) -{ - apple2e(config); - config.device_remove("sl1"); - config.device_remove("sl2"); - config.device_remove("sl3"); - config.device_remove("sl4"); - config.device_remove("sl5"); - config.device_remove("sl6"); - config.device_remove("sl7"); - - A2BUS_DISKIING(config, "sl6", A2BUS_7M_CLOCK).set_onboard(m_a2bus); - - // there is no aux slot, the "aux" side of the //e is used for additional ROM - config.device_remove("aux"); - config.device_remove(A2_AUXSLOT_TAG); - - m_ram->set_default_size("64K"); -} - -void apple2e_state::cece(machine_config &config) -{ - apple2e(config); - config.device_remove("sl1"); - config.device_remove("sl2"); - config.device_remove("sl3"); - config.device_remove("sl4"); - config.device_remove("sl5"); - config.device_remove("sl6"); - config.device_remove("sl7"); - - A2BUS_DISKIING(config, "sl6", A2BUS_7M_CLOCK).set_onboard(m_a2bus); - - // there is no aux slot, the "aux" side of the //e is used for additional ROM - config.device_remove("aux"); - config.device_remove(A2_AUXSLOT_TAG); - - m_ram->set_default_size("64K"); -} - -void apple2e_state::cecg(machine_config &config) -{ - apple2e(config); - config.device_remove("sl1"); - config.device_remove("sl2"); - config.device_remove("sl3"); - config.device_remove("sl4"); - config.device_remove("sl5"); - config.device_remove("sl6"); - config.device_remove("sl7"); - - A2BUS_DISKIING(config, "sl6", A2BUS_7M_CLOCK).set_onboard(m_a2bus); - - // there is no aux slot, the "aux" side of the //e is used for additional ROM - config.device_remove("aux"); - config.device_remove(A2_AUXSLOT_TAG); - - m_ram->set_default_size("64K"); -} - -void apple2e_state::cecm(machine_config &config) -{ - apple2e(config); - config.device_remove("sl1"); - config.device_remove("sl2"); - config.device_remove("sl3"); - config.device_remove("sl4"); - config.device_remove("sl5"); - config.device_remove("sl6"); - config.device_remove("sl7"); - - A2BUS_DISKIING(config, "sl6", A2BUS_7M_CLOCK).set_onboard(m_a2bus); - - // there is no aux slot, the "aux" side of the //e is used for additional ROM - config.device_remove("aux"); - config.device_remove(A2_AUXSLOT_TAG); - - m_ram->set_default_size("64K"); -} - -void apple2e_state::cec2000(machine_config &config) +void apple2e_state::cec(machine_config &config) { apple2e(config); config.device_remove("sl1"); @@ -5341,9 +5257,9 @@ COMP( 1988, las128e2, apple2c, 0, laser128ex2, apple2e, apple2e_state, COMP( 1985, apple2c0, apple2c, 0, apple2c_iwm, apple2c, apple2e_state, empty_init, "Apple Computer", "Apple //c (UniDisk 3.5)", MACHINE_SUPPORTS_SAVE ) COMP( 1986, apple2c3, apple2c, 0, apple2c_mem, apple2c, apple2e_state, empty_init, "Apple Computer", "Apple //c (Original Memory Expansion)", MACHINE_SUPPORTS_SAVE ) COMP( 1986, apple2c4, apple2c, 0, apple2c_mem, apple2c, apple2e_state, empty_init, "Apple Computer", "Apple //c (rev 4)", MACHINE_SUPPORTS_SAVE ) -COMP( 1987, ceci, 0, apple2, ceci, ceci, apple2e_state, empty_init, "Shaanxi Province Computer Factory", "China Education Computer I", MACHINE_SUPPORTS_SAVE ) -COMP( 1989, cece, 0, apple2, cece, cece, apple2e_state, empty_init, "Shaanxi Province Computer Factory", "China Education Computer E", MACHINE_SUPPORTS_SAVE ) -COMP( 1989, cecg, 0, apple2, cecg, cecg, apple2e_state, empty_init, "Shaanxi Province Computer Factory", "China Education Computer G", MACHINE_SUPPORTS_SAVE ) -COMP( 1989, cecm, 0, apple2, cecm, cecm, apple2e_state, empty_init, "Shaanxi Province Computer Factory", "China Education Computer M", MACHINE_SUPPORTS_SAVE ) -COMP( 1991, cec2000, 0, apple2, cec2000, cec2000, apple2e_state, empty_init, "Shaanxi Province Computer Factory", "China Education Computer 2000", MACHINE_SUPPORTS_SAVE ) +COMP( 1987, ceci, 0, apple2, cec, ceci, apple2e_state, empty_init, "Shaanxi Province Computer Factory", "China Education Computer I", MACHINE_SUPPORTS_SAVE ) +COMP( 1989, cece, 0, apple2, cec, cece, apple2e_state, empty_init, "Shaanxi Province Computer Factory", "China Education Computer E", MACHINE_SUPPORTS_SAVE ) +COMP( 1989, cecg, 0, apple2, cec, cecg, apple2e_state, empty_init, "Shaanxi Province Computer Factory", "China Education Computer G", MACHINE_SUPPORTS_SAVE ) +COMP( 1989, cecm, 0, apple2, cec, cecm, apple2e_state, empty_init, "Shaanxi Province Computer Factory", "China Education Computer M", MACHINE_SUPPORTS_SAVE ) +COMP( 1991, cec2000, 0, apple2, cec, cec2000, apple2e_state, empty_init, "Shaanxi Province Computer Factory", "China Education Computer 2000", MACHINE_SUPPORTS_SAVE ) COMP( 1988, apple2cp, apple2c, 0, apple2cp, apple2c, apple2e_state, empty_init, "Apple Computer", "Apple //c Plus", MACHINE_SUPPORTS_SAVE )