diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 6b2bcde8273..3d09cca6868 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -2553,6 +2553,7 @@ files { MAME_DIR .. "src/mame/drivers/pcipc.cpp", MAME_DIR .. "src/mame/drivers/tandy1t.cpp", MAME_DIR .. "src/mame/drivers/tosh1000.cpp", + MAME_DIR .. "src/mame/drivers/compc.cpp", MAME_DIR .. "src/mame/video/pc_t1t.cpp", MAME_DIR .. "src/mame/video/pc_t1t.h", } diff --git a/src/mame/drivers/compc.cpp b/src/mame/drivers/compc.cpp new file mode 100644 index 00000000000..46ded695064 --- /dev/null +++ b/src/mame/drivers/compc.cpp @@ -0,0 +1,206 @@ +// license:BSD-3-Clause +// copyright-holders:Carl +// Commodore PC 10 / PC 20 / PC 30 +#include "emu.h" + +#include "cpu/i86/i86.h" +#include "machine/genpc.h" +#include "machine/nvram.h" +#include "machine/pckeybrd.h" + +#include "coreutil.h" + + +class compc_state : public driver_device +{ +public: + compc_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu"), + m_mb(*this, "mb"), + m_keyboard(*this, "pc_keyboard") + { } + + required_device m_maincpu; + required_device m_mb; + required_device m_keyboard; + + void machine_reset() override; + + DECLARE_WRITE8_MEMBER(pio_w); + DECLARE_READ8_MEMBER(pio_r); + +private: + u8 m_portb; +}; + +void compc_state::machine_reset() +{ + m_portb = 0; + m_keyboard->enable(1); +} + +WRITE8_MEMBER(compc_state::pio_w) +{ + switch (offset) + { + case 1: + m_portb = data; + m_mb->m_pit8253->write_gate2(BIT(data, 0)); + m_mb->pc_speaker_set_spkrdata(BIT(data, 1)); + //m_keyboard->enable(BIT(data, 6)); + if(data & 0x80) + m_mb->m_pic8259->ir1_w(0); + break; + } +} + + +READ8_MEMBER(compc_state::pio_r) +{ + int data = 0; + switch (offset) + { + case 0: + data = m_keyboard->read(space, 0); + break; + case 2: + if(BIT(m_portb, 3)) + { + /* read hi nibble of S2 */ + data = (ioport("DSW0")->read() >> 4) & 0x0f; + } + else + { + /* read lo nibble of S2 */ + data = ioport("DSW0")->read() & 0x0f; + } + if(m_mb->pit_out2() && BIT(m_portb, 0)) + data |= 0x20; + break; + } + return data; +} + +static INPUT_PORTS_START(compc) + PORT_START("DSW0") /* IN1 */ + PORT_DIPNAME( 0xc0, 0x40, "Number of floppy drives") + PORT_DIPSETTING( 0x00, "1" ) + PORT_DIPSETTING( 0x40, "2" ) + PORT_DIPSETTING( 0x80, "3" ) + PORT_DIPSETTING( 0xc0, "4" ) + PORT_DIPNAME( 0x30, 0x30, "Graphics adapter") + PORT_DIPSETTING( 0x00, "EGA/VGA" ) + PORT_DIPSETTING( 0x10, "Color 40x25" ) + PORT_DIPSETTING( 0x20, "Color 80x25" ) + PORT_DIPSETTING( 0x30, "Monochrome" ) + PORT_DIPNAME( 0x0c, 0x0c, "RAM banks") + PORT_DIPSETTING( 0x00, "1 - 16/ 64/256K" ) + PORT_DIPSETTING( 0x04, "2 - 32/128/512K" ) + PORT_DIPSETTING( 0x08, "3 - 48/192/576K" ) + PORT_DIPSETTING( 0x0c, "4 - 64/256/640K" ) + PORT_DIPNAME( 0x02, 0x00, "8087 installed") + PORT_DIPSETTING( 0x00, DEF_STR(No) ) + PORT_DIPSETTING( 0x02, DEF_STR(Yes) ) + PORT_DIPNAME( 0x01, 0x01, "Boot from floppy") + PORT_DIPSETTING( 0x01, DEF_STR(Yes) ) + PORT_DIPSETTING( 0x00, DEF_STR(No) ) + + PORT_INCLUDE(pc_keyboard) +INPUT_PORTS_END + +static INPUT_PORTS_START(compcalt) + PORT_START("DSW0") /* IN1 */ + PORT_DIPNAME( 0x0c, 0x04, "Number of floppy drives") + PORT_DIPSETTING( 0x00, "1" ) + PORT_DIPSETTING( 0x04, "2" ) + PORT_DIPSETTING( 0x08, "3" ) + PORT_DIPSETTING( 0x0c, "4" ) + PORT_DIPNAME( 0x03, 0x03, "Graphics adapter") + PORT_DIPSETTING( 0x00, "EGA/VGA" ) + PORT_DIPSETTING( 0x01, "Color 40x25" ) + PORT_DIPSETTING( 0x02, "Color 80x25" ) + PORT_DIPSETTING( 0x03, "Monochrome" ) + PORT_DIPNAME( 0xc0, 0xc0, "RAM banks") + PORT_DIPSETTING( 0x00, "1 - 16/ 64/256K" ) + PORT_DIPSETTING( 0x40, "2 - 32/128/512K" ) + PORT_DIPSETTING( 0x80, "3 - 48/192/576K" ) + PORT_DIPSETTING( 0xc0, "4 - 64/256/640K" ) + PORT_DIPNAME( 0x20, 0x00, "8087 installed") + PORT_DIPSETTING( 0x00, DEF_STR(No) ) + PORT_DIPSETTING( 0x20, DEF_STR(Yes) ) + PORT_DIPNAME( 0x10, 0x10, "Boot from floppy") + PORT_DIPSETTING( 0x10, DEF_STR(Yes) ) + PORT_DIPSETTING( 0x00, DEF_STR(No) ) + + PORT_INCLUDE(pc_keyboard) +INPUT_PORTS_END + +static ADDRESS_MAP_START(compc_map, AS_PROGRAM, 8, compc_state) + ADDRESS_MAP_UNMAP_HIGH + AM_RANGE(0xf0000, 0xfffff) AM_ROM AM_REGION("bios", 0) +ADDRESS_MAP_END + +static ADDRESS_MAP_START(compc_io, AS_IO, 8, compc_state) + ADDRESS_MAP_UNMAP_HIGH + AM_RANGE(0x0060, 0x0063) AM_READWRITE(pio_r, pio_w) + AM_RANGE(0x0000, 0x00ff) AM_DEVICE("mb", pc_noppi_mb_device, map) +ADDRESS_MAP_END + +static MACHINE_CONFIG_START(compc) + MCFG_CPU_ADD("maincpu", I8088, 4772720*2) + MCFG_CPU_PROGRAM_MAP(compc_map) + MCFG_CPU_IO_MAP(compc_io) + MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb) + + MCFG_PCNOPPI_MOTHERBOARD_ADD("mb", "maincpu") + + MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "mda", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "lpt", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "com", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "fdc_xt", false) + + MCFG_PC_KEYB_ADD("pc_keyboard", DEVWRITELINE("mb:pic8259", pic8259_device, ir1_w)) + + /* internal ram */ + MCFG_RAM_ADD(RAM_TAG) + MCFG_RAM_DEFAULT_SIZE("256K") + MCFG_RAM_EXTRA_OPTIONS("512K, 640K") +MACHINE_CONFIG_END + +ROM_START(compc10) + ROM_REGION(0x10000, "bios", 0) + ROM_DEFAULT_BIOS("v205") + ROM_SYSTEM_BIOS(0, "v203", "v2.03") + ROMX_LOAD("380258-03", 0xc000, 0x4000, CRC(fbe53865) SHA1(a6d6433c055d1c328f71403a2ed2fd5908c23d40), ROM_BIOS(1)) + ROM_SYSTEM_BIOS(1, "v205", "v2.05") + ROMX_LOAD("380258-04", 0xc000, 0x4000, CRC(e61084da) SHA1(dfb360a6ec6cb1250d8a6243f12a0d702e8479cb), ROM_BIOS(2)) +ROM_END + +// Note: Commodore PC20-III, PC10-III and COLT share the same BIOS +ROM_START(pc10iii) + ROM_REGION(0x10000, "bios", 0) + ROM_DEFAULT_BIOS("v441") + ROM_SYSTEM_BIOS(0, "v435", "v4.35") + ROMX_LOAD("318085-01.u201", 0x8000, 0x8000, CRC(be752d1e) SHA1(5e5e63cd6d6269816cd691602e4c4d209fe3df67), ROM_BIOS(1)) + ROM_SYSTEM_BIOS(1, "v436", "v4.36") + ROMX_LOAD("318085-02.u201", 0x8000, 0x8000, CRC(db0c9d04) SHA1(1314ce606840f4f78e58e5f78909e8971387f387), ROM_BIOS(2)) + ROM_SYSTEM_BIOS(2, "v436b", "v4.36b") + ROMX_LOAD("318085-03.u201", 0x8000, 0x8000, CRC(559e6b76) SHA1(cdfd4781f3520db7f5111469ebb29c10b39ab587), ROM_BIOS(3)) + ROM_SYSTEM_BIOS(3, "v436c", "v4.36c") + ROMX_LOAD("318085-04.u201", 0x8000, 0x8000, CRC(f81e67f0) SHA1(b46613cb5c6ac4beb769778bc35f81777ebe02e1), ROM_BIOS(4)) + ROM_SYSTEM_BIOS(4, "v438", "v4.38") + ROMX_LOAD("318085-05.u201", 0x8000, 0x8000, CRC(ae9e6a31) SHA1(853ee251cf230818c407a8d13ef060a21c90a8c1), ROM_BIOS(5)) + ROM_SYSTEM_BIOS(5, "v439", "v4.39") + ROMX_LOAD("318085-06.u201", 0x8000, 0x8000, CRC(1901993c) SHA1(f75060c1c442376bd42c61e74fa9eee053351791), ROM_BIOS(6)) + ROM_SYSTEM_BIOS(6, "v440", "v4.40") + ROMX_LOAD("318085-07.u201", 0x8000, 0x8000, CRC(505d52b0) SHA1(f717c6ab791d51f35e1c38ffbc81a44075b5f2f8), ROM_BIOS(7)) + ROM_SYSTEM_BIOS(7, "v441", "v4.41") + ROMX_LOAD("318085-08.u201", 0x8000, 0x8000, CRC(7e228dc8) SHA1(958dfdd637bd31c01b949fac729d6973a7e630bc), ROM_BIOS(8)) + ROM_REGION(0x8000, "gfx1", 0) + ROM_LOAD("318086-02.u607", 0x0000, 0x8000, CRC(b406651c) SHA1(856f58353391a74a06ebb8ec9f8333d7d69e5fd6)) +ROM_END + +// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS +COMP( 1984, compc10, ibm5150, 0, compc, compc, compc_state, 0, "Commodore Business Machines", "Commodore PC 10", MACHINE_NOT_WORKING ) +COMP( 1987, pc10iii, ibm5150, 0, compc, compcalt, compc_state, 0, "Commodore Business Machines", "Commodore PC-10 III", MACHINE_NOT_WORKING ) diff --git a/src/mame/drivers/pc.cpp b/src/mame/drivers/pc.cpp index 1f8da866013..1f3ae64bc36 100644 --- a/src/mame/drivers/pc.cpp +++ b/src/mame/drivers/pc.cpp @@ -448,16 +448,6 @@ static MACHINE_CONFIG_START( cfg_single_360K ) MCFG_DEVICE_REMOVE("fdc:1") MACHINE_CONFIG_END -// Commodore PC 10 / PC 20 / PC 30 -static MACHINE_CONFIG_DERIVED( compc10, pccga ) - MCFG_DEVICE_MODIFY("isa1") - MCFG_SLOT_DEFAULT_OPTION("mda") - - MCFG_DEVICE_MODIFY(RAM_TAG) - MCFG_RAM_DEFAULT_SIZE("256K") - MCFG_RAM_EXTRA_OPTIONS("512K, 640K") -MACHINE_CONFIG_END - //Data General One static MACHINE_CONFIG_DERIVED( dgone, pccga ) MCFG_DEVICE_MODIFY("isa2") @@ -738,40 +728,6 @@ ROM_START( compc1 ) ROM_LOAD("pc1_char.bin", 0x0000, 0x4000, CRC(ee6c27f0) SHA1(e769cc3a49a1d708bd74eb4ac85bb6ea67220d38)) ROM_END -ROM_START( compc10 ) - ROM_REGION(0x10000, "bios", 0) - ROM_DEFAULT_BIOS("v205") - ROM_SYSTEM_BIOS(0, "v203", "v2.03") - ROMX_LOAD("380258-03", 0xc000, 0x4000, CRC(fbe53865) SHA1(a6d6433c055d1c328f71403a2ed2fd5908c23d40), ROM_BIOS(1)) - ROM_SYSTEM_BIOS(1, "v205", "v2.05") - ROMX_LOAD("380258-04", 0xc000, 0x4000, CRC(e61084da) SHA1(dfb360a6ec6cb1250d8a6243f12a0d702e8479cb), ROM_BIOS(2)) -ROM_END - -// Note: Commodore PC20-III, PC10-III and COLT share the same BIOS -ROM_START( pc10iii ) - ROM_REGION(0x10000, "bios", 0) - ROM_DEFAULT_BIOS("v441") - ROM_SYSTEM_BIOS(0, "v435", "v4.35") - ROMX_LOAD("318085-01.u201", 0x8000, 0x8000, CRC(be752d1e) SHA1(5e5e63cd6d6269816cd691602e4c4d209fe3df67), ROM_BIOS(1)) - ROM_SYSTEM_BIOS(1, "v436", "v4.36") - ROMX_LOAD("318085-02.u201", 0x8000, 0x8000, CRC(db0c9d04) SHA1(1314ce606840f4f78e58e5f78909e8971387f387), ROM_BIOS(2)) - ROM_SYSTEM_BIOS(2, "v436b", "v4.36b") - ROMX_LOAD("318085-03.u201", 0x8000, 0x8000, CRC(559e6b76) SHA1(cdfd4781f3520db7f5111469ebb29c10b39ab587), ROM_BIOS(3)) - ROM_SYSTEM_BIOS(3, "v436c", "v4.36c") - ROMX_LOAD("318085-04.u201", 0x8000, 0x8000, CRC(f81e67f0) SHA1(b46613cb5c6ac4beb769778bc35f81777ebe02e1), ROM_BIOS(4)) - ROM_SYSTEM_BIOS(4, "v438", "v4.38") - ROMX_LOAD("318085-05.u201", 0x8000, 0x8000, CRC(ae9e6a31) SHA1(853ee251cf230818c407a8d13ef060a21c90a8c1), ROM_BIOS(5)) - ROM_SYSTEM_BIOS(5, "v439", "v4.39") - ROMX_LOAD("318085-06.u201", 0x8000, 0x8000, CRC(1901993c) SHA1(f75060c1c442376bd42c61e74fa9eee053351791), ROM_BIOS(6)) - ROM_SYSTEM_BIOS(6, "v440", "v4.40") - ROMX_LOAD("318085-07.u201", 0x8000, 0x8000, CRC(505d52b0) SHA1(f717c6ab791d51f35e1c38ffbc81a44075b5f2f8), ROM_BIOS(7)) - ROM_SYSTEM_BIOS(7, "v441", "v4.41") - ROMX_LOAD("318085-08.u201", 0x8000, 0x8000, CRC(7e228dc8) SHA1(958dfdd637bd31c01b949fac729d6973a7e630bc), ROM_BIOS(8)) - ROM_REGION(0x8000, "gfx1", 0) - ROM_LOAD("318086-02.u607", 0x0000, 0x8000, CRC(b406651c) SHA1(856f58353391a74a06ebb8ec9f8333d7d69e5fd6)) - //ROM_LOAD("5788005.u33", 0x00000, 0x2000, BAD_DUMP CRC(0bf56d70) SHA1(c2a8b10808bf51a3c123ba3eb1e9dd608231916f)) /* temp so you can read the text */ -ROM_END - ROM_START( iskr3104 ) ROM_REGION16_LE(0x10000,"bios", 0) ROMX_LOAD( "198.bin", 0xc000, 0x2000, CRC(bcfd8e41) SHA1(e21ddf78839aa51fa5feb23f511ff5e2da31b433),ROM_SKIP(1)) @@ -925,8 +881,6 @@ ROM_END COMP( 1984, dgone, ibm5150, 0, dgone, pccga, pc_state, 0, "Data General", "Data General/One" , MACHINE_NOT_WORKING ) // CGA, 2x 3.5" disk drives COMP( 1985, bw230, ibm5150, 0, bondwell, bondwell, pc_state, bondwell, "Bondwell Holding", "BW230 (PRO28 Series)", 0 ) COMP( 1984, compc1, ibm5150, 0, pccga, pccga, pc_state, 0, "Commodore Business Machines", "Commodore PC-1" , MACHINE_NOT_WORKING ) -COMP( 1984, compc10, ibm5150, 0, compc10, pccga, pc_state, 0, "Commodore Business Machines", "Commodore PC 10", MACHINE_NOT_WORKING ) -COMP( 1987, pc10iii, ibm5150, 0, pccga, pccga, pc_state, 0, "Commodore Business Machines", "Commodore PC-10 III", MACHINE_NOT_WORKING ) COMP( 1992, iskr3104, ibm5150, 0, iskr3104, pccga, pc_state, 0, "Schetmash", "Iskra 3104", MACHINE_NOT_WORKING ) COMP( 1989, mk88, ibm5150, 0, mk88, pccga, pc_state, 0, "", "MK-88", MACHINE_NOT_WORKING ) COMP( 1991, poisk2, ibm5150, 0, poisk2, pccga, pc_state, 0, "", "Poisk-2", MACHINE_NOT_WORKING )