From ff3e49d66fceb30519f2473f31011ec891cd5ad6 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 26 Dec 2012 12:57:49 +0000 Subject: [PATCH] Changed isa device cpu search, fixes -listxml (no whatsnew) Added some addtional XT and AT bioses Added -mwindows flag to windows sdl build with QT --- src/mess/drivers/at.c | 21 ++++++++------- src/mess/drivers/genpc.c | 56 +++++++++++++++++++++++++++------------ src/mess/drivers/pc1512.c | 4 +-- src/mess/machine/genpc.c | 2 +- src/mess/machine/isa.c | 2 +- src/osd/sdl/sdl.mak | 2 +- 6 files changed, 56 insertions(+), 31 deletions(-) diff --git a/src/mess/drivers/at.c b/src/mess/drivers/at.c index 4296948dd6c..b518a9e9981 100644 --- a/src/mess/drivers/at.c +++ b/src/mess/drivers/at.c @@ -419,7 +419,7 @@ static MACHINE_CONFIG_START( ibm5170, at_state ) MCFG_QUANTUM_TIME(attotime::from_hz(60)) MCFG_FRAGMENT_ADD( at_motherboard ) - MCFG_ISA16_BUS_ADD("isabus", "maincpu", isabus_intf) + MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "ega", NULL, false) MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "fdc", NULL, false) MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", NULL, false) @@ -456,7 +456,7 @@ static MACHINE_CONFIG_START( ibm5162, at_state ) MCFG_FRAGMENT_ADD( at_motherboard ) - MCFG_ISA16_BUS_ADD("isabus", "maincpu", isabus_intf) + MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "fdc", NULL, false) MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "ide", NULL, false) MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", NULL, false) @@ -479,7 +479,7 @@ static MACHINE_CONFIG_START( ps2m30286, at_state ) MCFG_FRAGMENT_ADD( at_motherboard ) - MCFG_ISA16_BUS_ADD("isabus", "maincpu", isabus_intf) + MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "fdc", NULL, false) MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "ide", NULL, false) MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", NULL, false) @@ -501,7 +501,7 @@ static MACHINE_CONFIG_START( neat, at_state ) MCFG_FRAGMENT_ADD( at_motherboard ) - MCFG_ISA16_BUS_ADD("isabus", "maincpu", isabus_intf) + MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) MCFG_ISA16_SLOT_ADD("isabus", "isa1", pc_isa16_cards, "fdc", NULL, false) MCFG_ISA16_SLOT_ADD("isabus", "isa2", pc_isa16_cards, "ide", NULL, false) MCFG_ISA16_SLOT_ADD("isabus", "isa3", pc_isa16_cards, "comat", NULL, false) @@ -525,7 +525,7 @@ static MACHINE_CONFIG_START( atvga, at_state ) MCFG_FRAGMENT_ADD( at_motherboard ) - MCFG_ISA16_BUS_ADD("isabus", "maincpu", isabus_intf) + MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "fdcsmc", NULL, false) MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "ide", NULL, false) MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", NULL, false) @@ -547,7 +547,7 @@ static MACHINE_CONFIG_START( xb42639, at_state ) MCFG_FRAGMENT_ADD( at_motherboard ) - MCFG_ISA16_BUS_ADD("isabus", "maincpu", isabus_intf) + MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "fdc", NULL, false) MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "ide", NULL, false) MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", NULL, false) @@ -575,7 +575,7 @@ static MACHINE_CONFIG_START( at386, at_state ) MCFG_FRAGMENT_ADD( at_motherboard ) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_ISA16_BUS_ADD("isabus", "maincpu", isabus_intf) + MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) // on board devices MCFG_ISA16_SLOT_ADD("isabus","board1", pc_isa16_cards, "fdcsmc", NULL, true) MCFG_ISA16_SLOT_ADD("isabus","board2", pc_isa16_cards, "comat", NULL, true) @@ -627,7 +627,7 @@ static MACHINE_CONFIG_START( k286i, at_state ) MCFG_QUANTUM_TIME(attotime::from_hz(60)) MCFG_FRAGMENT_ADD( at_motherboard ) - MCFG_ISA16_BUS_ADD("isabus", "maincpu", isabus_intf) + MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "cga", NULL, false) MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "fdc", NULL, false) MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", NULL, false) @@ -1009,9 +1009,12 @@ ROM_START( at ) ROM_SYSTEM_BIOS(11, "aw201", "Award 201") ROMX_LOAD( "83201-5h.bin", 0xf0001, 0x8000, CRC(968d1fc0) SHA1(dc4122a6c696f0b43e7894dc1b669346eed755d5),ROM_SKIP(1) | ROM_BIOS(12) ) ROMX_LOAD( "83201-5l.bin", 0xf0000, 0x8000, CRC(bf50a89a) SHA1(2349a1db6017a7fb0673e99d3680c8753407be8d),ROM_SKIP(1) | ROM_BIOS(12) ) - ROM_SYSTEM_BIOS(12, "aw303", "Award 303") + ROM_SYSTEM_BIOS(12, "aw303", "Award 303 NFS") ROMX_LOAD( "aw303-hi.bin", 0xf8001, 0x4000, CRC(78f32d7e) SHA1(1c88398fb171b33b7e6191bad63704ae85bfed8b), ROM_SKIP(1) | ROM_BIOS(13) ) ROMX_LOAD( "aw303-lo.bin", 0xf8000, 0x4000, CRC(3d2a70c0) SHA1(1329113bec514ed2a6d803067b1132744ef534dd), ROM_SKIP(1) | ROM_BIOS(13) ) + ROM_SYSTEM_BIOS(13, "aw303gs", "Award 303GS") + ROMX_LOAD( "aw303gs-hi.bin", 0xf8001, 0x4000, CRC(82392e18) SHA1(042453b7b29933a1b72301d21fcf8fa6b293c9c9), ROM_SKIP(1) | ROM_BIOS(14) ) + ROMX_LOAD( "aw303gs-lo.bin", 0xf8000, 0x4000, CRC(a4cf8ba1) SHA1(b73e34be3b2754aaed1ac06471f4441fea06c67c), ROM_SKIP(1) | ROM_BIOS(14) ) /* Character rom */ ROM_REGION(0x2000,"gfx1", 0) ROM_LOAD("5788005.u33", 0x00000, 0x2000, CRC(0bf56d70) SHA1(c2a8b10808bf51a3c123ba3eb1e9dd608231916f)) diff --git a/src/mess/drivers/genpc.c b/src/mess/drivers/genpc.c index 661befc901e..6809aa18b8c 100644 --- a/src/mess/drivers/genpc.c +++ b/src/mess/drivers/genpc.c @@ -261,34 +261,56 @@ MACHINE_CONFIG_END ROM_START( pcmda ) ROM_REGION(0x100000,"maincpu", 0) - ROM_LOAD("pcxt.rom", 0xfe000, 0x02000, CRC(031aafad) SHA1(a641b505bbac97b8775f91fe9b83d9afdf4d038f)) + ROM_SYSTEM_BIOS(0, "anon", "XT Anonymous Generic Turbo BIOS") + ROMX_LOAD("pcxt.rom", 0xfe000, 0x02000, CRC(031aafad) SHA1(a641b505bbac97b8775f91fe9b83d9afdf4d038f),ROM_BIOS(1)) + ROM_SYSTEM_BIOS(1, "anon2007", "XT Anonymous Generic Turbo BIOS 2007") + ROMX_LOAD( "pcxt2007.bin", 0xfe000, 0x2000, CRC(1d7bd86c) SHA1(33a500f599b4dad2fe6d7a5c3e89b13bd5dd2987),ROM_BIOS(2)) + ROM_SYSTEM_BIOS(2, "ami", "XT AMI") + ROMX_LOAD( "ami.bin", 0xfe000, 0x2000, CRC(b381eb22) SHA1(9735193de119270c946a17ed58c3ab9554e0852e),ROM_BIOS(3)) + ROM_SYSTEM_BIOS(3, "award", "XT Award 2.05") + ROMX_LOAD( "award2.05.bin", 0xfe000, 0x2000, CRC(5b3953e5) SHA1(4a36171aa8d993008187f39f732b9296401b7b6c),ROM_BIOS(4)) + ROM_SYSTEM_BIOS(4, "dtk", "XT DTK Erso bios 2.42") + ROMX_LOAD( "dtk2.42.bin", 0xfe000, 0x2000, CRC(3f2d2a76) SHA1(02fa057f2c22ab199a8d9795ab1ae570f2b13a36),ROM_BIOS(5)) + ROM_SYSTEM_BIOS(5, "peter", "XT Peter Kohlman 3.75") // V20 Rom only + ROMX_LOAD( "peterv203.75.bin", 0xfe000, 0x2000, CRC(b053a6a4) SHA1(f53218ad3d725f12d9149b22d8afcf6a8869a3bd),ROM_BIOS(6)) + ROM_SYSTEM_BIOS(6, "pho227", "XT Phoenix Bios 2.27") + ROMX_LOAD( "phoenix2.27.bin", 0xfe000, 0x2000, CRC(168ffef0) SHA1(69465db2f9246a614044d1f433d374506a13a07f),ROM_BIOS(7)) + ROM_SYSTEM_BIOS(7, "pho227", "XT Phoenix Bios 2.51") + ROMX_LOAD( "phoenix2.51.bin", 0xfe000, 0x2000, CRC(9b7e9c40) SHA1(c948a8d3d715e469105c6e2acd8b46ec274b25a8),ROM_BIOS(8)) + ROM_SYSTEM_BIOS(8, "turbo", "XT Turbo Bios 3.10") + ROMX_LOAD( "turbo3.10.bin", 0xfe000, 0x2000, CRC(8aaca1e3) SHA1(9c03da16713e08c0112a04c8bdfa394e7341c1fc),ROM_BIOS(9)) ROM_END +#define rom_pcherc rom_pcmda -ROM_START( pcherc ) - ROM_REGION(0x100000,"maincpu", 0) - ROM_LOAD("pcxt.rom", 0xfe000, 0x02000, CRC(031aafad) SHA1(a641b505bbac97b8775f91fe9b83d9afdf4d038f)) -ROM_END - -ROM_START( pcega ) - ROM_REGION(0x100000,"maincpu", 0) - ROM_LOAD("xtbios.bin", 0xfe000, 0x02000, CRC(1d7bd86c) SHA1(33a500f599b4dad2fe6d7a5c3e89b13bd5dd2987)) -ROM_END +#define rom_pcega rom_pcmda ROM_START( pc ) ROM_REGION(0x100000,"maincpu", 0) -// ROM_LOAD("xthdd.rom", 0xc8000, 0x02000, CRC(a96317da)) - ROM_LOAD("pcxt.rom", 0xfe000, 0x02000, CRC(031aafad) SHA1(a641b505bbac97b8775f91fe9b83d9afdf4d038f)) - + ROM_SYSTEM_BIOS(0, "anon", "XT Anonymous Generic Turbo BIOS") + ROMX_LOAD("pcxt.rom", 0xfe000, 0x02000, CRC(031aafad) SHA1(a641b505bbac97b8775f91fe9b83d9afdf4d038f),ROM_BIOS(1)) + ROM_SYSTEM_BIOS(1, "anon2007", "XT Anonymous Generic Turbo BIOS 2007") + ROMX_LOAD( "pcxt2007.bin", 0xfe000, 0x2000, CRC(1d7bd86c) SHA1(33a500f599b4dad2fe6d7a5c3e89b13bd5dd2987),ROM_BIOS(2)) + ROM_SYSTEM_BIOS(2, "ami", "XT AMI") + ROMX_LOAD( "ami.bin", 0xfe000, 0x2000, CRC(b381eb22) SHA1(9735193de119270c946a17ed58c3ab9554e0852e),ROM_BIOS(3)) + ROM_SYSTEM_BIOS(3, "award", "XT Award 2.05") + ROMX_LOAD( "award2.05.bin", 0xfe000, 0x2000, CRC(5b3953e5) SHA1(4a36171aa8d993008187f39f732b9296401b7b6c),ROM_BIOS(4)) + ROM_SYSTEM_BIOS(4, "dtk", "XT DTK Erso bios 2.42") + ROMX_LOAD( "dtk2.42.bin", 0xfe000, 0x2000, CRC(3f2d2a76) SHA1(02fa057f2c22ab199a8d9795ab1ae570f2b13a36),ROM_BIOS(5)) + ROM_SYSTEM_BIOS(5, "peter", "XT Peter Kohlman 3.75") + ROMX_LOAD( "peterv203.75.bin", 0xfe000, 0x2000, CRC(b053a6a4) SHA1(f53218ad3d725f12d9149b22d8afcf6a8869a3bd),ROM_BIOS(6)) + ROM_SYSTEM_BIOS(6, "pho227", "XT Phoenix Bios 2.27") + ROMX_LOAD( "phoenix2.27.bin", 0xfe000, 0x2000, CRC(168ffef0) SHA1(69465db2f9246a614044d1f433d374506a13a07f),ROM_BIOS(7)) + ROM_SYSTEM_BIOS(7, "pho227", "XT Phoenix Bios 2.51") + ROMX_LOAD( "phoenix2.51.bin", 0xfe000, 0x2000, CRC(9b7e9c40) SHA1(c948a8d3d715e469105c6e2acd8b46ec274b25a8),ROM_BIOS(8)) + ROM_SYSTEM_BIOS(8, "turbo", "XT Turbo Bios 3.10") + ROMX_LOAD( "turbo3.10.bin", 0xfe000, 0x2000, CRC(8aaca1e3) SHA1(9c03da16713e08c0112a04c8bdfa394e7341c1fc),ROM_BIOS(9)) /* IBM 1501981(CGA) and 1501985(MDA) Character rom */ ROM_REGION(0x2000,"gfx1", 0) ROM_LOAD("5788005.u33", 0x00000, 0x2000, CRC(0bf56d70) SHA1(c2a8b10808bf51a3c123ba3eb1e9dd608231916f)) /* "AMI 8412PI // 5788005 // (C) IBM CORP. 1981 // KOREA" */ ROM_END -ROM_START( xtvga ) - ROM_REGION(0x100000,"maincpu", 0) - ROM_LOAD("pcxt.rom", 0xfe000, 0x02000, CRC(031aafad) SHA1(a641b505bbac97b8775f91fe9b83d9afdf4d038f)) -ROM_END +#define rom_xtvga rom_pcmda /*************************************************************************** diff --git a/src/mess/drivers/pc1512.c b/src/mess/drivers/pc1512.c index 4cba8f670c2..948a250c848 100644 --- a/src/mess/drivers/pc1512.c +++ b/src/mess/drivers/pc1512.c @@ -1256,7 +1256,7 @@ static MACHINE_CONFIG_START( pc1512, pc1512_state ) MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":1", ibmpc_floppies, "525dd", 0, pc1512_state::floppy_formats) // ISA8 bus - MCFG_ISA8_BUS_ADD(ISA_BUS_TAG, I8086_TAG, isabus_intf) + MCFG_ISA8_BUS_ADD(ISA_BUS_TAG, ":" I8086_TAG, isabus_intf) MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa1", pc1512_isa8_cards, NULL, NULL, false) MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa2", pc1512_isa8_cards, NULL, NULL, false) MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa3", pc1512_isa8_cards, NULL, NULL, false) @@ -1301,7 +1301,7 @@ static MACHINE_CONFIG_START( pc1640, pc1640_state ) MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":1", ibmpc_floppies, "525dd", 0, pc1512_state::floppy_formats) // ISA8 bus - MCFG_ISA8_BUS_ADD(ISA_BUS_TAG, I8086_TAG, isabus_intf) + MCFG_ISA8_BUS_ADD(ISA_BUS_TAG, ":" I8086_TAG, isabus_intf) MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa1", pc1512_isa8_cards, "wdxt_gen", NULL, false) MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa2", pc1512_isa8_cards, NULL, NULL, false) MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa3", pc1512_isa8_cards, NULL, NULL, false) diff --git a/src/mess/machine/genpc.c b/src/mess/machine/genpc.c index 88e185e1745..142b8165fb6 100644 --- a/src/mess/machine/genpc.c +++ b/src/mess/machine/genpc.c @@ -485,7 +485,7 @@ static MACHINE_CONFIG_FRAGMENT( ibm5160_mb_config ) MCFG_I8255A_ADD( "ppi8255", pc_ppi8255_interface ) - MCFG_ISA8_BUS_ADD("isa", "maincpu", isabus_intf) + MCFG_ISA8_BUS_ADD("isa", ":maincpu", isabus_intf) MCFG_PC_KBDC_ADD("pc_kbdc", pc_kbdc_intf) diff --git a/src/mess/machine/isa.c b/src/mess/machine/isa.c index c6f2d7c199d..edc6944ccd2 100644 --- a/src/mess/machine/isa.c +++ b/src/mess/machine/isa.c @@ -133,7 +133,7 @@ void isa8_device::device_config_complete() memset(&m_out_drq2_cb, 0, sizeof(m_out_drq2_cb)); memset(&m_out_drq3_cb, 0, sizeof(m_out_drq3_cb)); } - m_maincpu = mconfig().device(m_cputag); + m_maincpu = subdevice(m_cputag); } //************************************************************************** diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index f73cb5e7862..e05d389b84a 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -303,7 +303,7 @@ LDFLAGS += -municode ifdef USE_QTDEBUG QT_INSTALL_HEADERS = $(shell qmake -query QT_INSTALL_HEADERS) INCPATH += -I$(QT_INSTALL_HEADERS)/QtCore -I$(QT_INSTALL_HEADERS)/QtGui -I$(QT_INSTALL_HEADERS) -LIBS += -L$(shell qmake -query QT_INSTALL_LIBS) -lqtmain -lQtGui4 -lQtCore4 -lcomdlg32 -loleaut32 -limm32 -lwinspool -lmsimg32 -lole32 -luuid -lws2_32 -lshell32 -lkernel32 +LIBS += -L$(shell qmake -query QT_INSTALL_LIBS) -lqtmain -lQtGui4 -lQtCore4 -lcomdlg32 -loleaut32 -limm32 -lwinspool -lmsimg32 -lole32 -luuid -lws2_32 -lshell32 -lkernel32 -mwindows endif endif