(mess) genpc: also video is in the devices now (nw)

This commit is contained in:
cracyc 2013-03-20 22:26:02 +00:00
parent 930f097d54
commit c6d106bd07

View File

@ -14,7 +14,7 @@
#include "cpu/nec/nec.h"
#include "cpu/i86/i86.h"
#include "video/pc_cga.h"
#include "video/isa_cga.h"
#include "video/isa_ega.h"
#include "video/isa_mda.h"
#include "video/isa_svga_tseng.h"
@ -79,10 +79,6 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( pcgen )
INPUT_PORTS_END
static INPUT_PORTS_START( pccga )
PORT_INCLUDE( pcvideo_cga )
INPUT_PORTS_END
static const unsigned i86_address_mask = 0x000fffff;
static DEVICE_INPUT_DEFAULTS_START(cga)
@ -95,6 +91,7 @@ DEVICE_INPUT_DEFAULTS_END
static SLOT_INTERFACE_START(pc_isa8_cards)
SLOT_INTERFACE("mda", ISA8_MDA)
SLOT_INTERFACE("cga", ISA8_CGA)
SLOT_INTERFACE("ega", ISA8_EGA)
SLOT_INTERFACE("svga_et4k", ISA8_SVGA_ET4K)
SLOT_INTERFACE("com", ISA8_COM)
@ -125,9 +122,6 @@ static MACHINE_CONFIG_START( pcmda, genpc_state )
MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu")
/* video hardware */
MCFG_PALETTE_LENGTH( 256 )
MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "mda", NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "com", NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "fdc_xt", NULL, false)
@ -159,9 +153,6 @@ static MACHINE_CONFIG_START( pcherc, genpc_state )
MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, "adlib", NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, NULL, NULL, false)
/* video hardware */
MCFG_PALETTE_LENGTH( 256 )
/* keyboard */
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL)
@ -181,15 +172,11 @@ static MACHINE_CONFIG_START( pccga, genpc_state )
MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(cga)
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_cga )
MCFG_PALETTE_LENGTH( 256 )
MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "com", NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "fdc_xt", NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "hdc", NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "sblaster1_0", NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, NULL, NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "cga", NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "com", NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "fdc_xt", NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "hdc", NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, "sblaster1_0", NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, NULL, NULL, false)
/* keyboard */
@ -218,9 +205,6 @@ static MACHINE_CONFIG_START( pcega, genpc_state )
MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, "ega", NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, NULL, NULL, false)
/* video hardware */
MCFG_PALETTE_LENGTH( 256 )
/* keyboard */
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL)
@ -247,9 +231,6 @@ static MACHINE_CONFIG_START( xtvga, genpc_state )
MCFG_ISA8_SLOT_ADD("mb:isa","isa5", pc_isa8_cards, "svga_et4k", NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa","isa6", pc_isa8_cards, NULL, NULL, false)
/* video hardware */
MCFG_PALETTE_LENGTH( 256 )
/* keyboard */
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL)
@ -319,8 +300,8 @@ ROM_END
***************************************************************************/
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
COMP( 1987, pc, ibm5150, 0, pccga, pccga, driver_device, 0, "<generic>", "PC (CGA)" , 0)
COMP( 1987, pcega, ibm5150, 0, pcega, pccga, driver_device, 0, "<generic>", "PC (EGA)" , 0)
COMP( 1987, pc, ibm5150, 0, pccga, pcgen, driver_device, 0, "<generic>", "PC (CGA)" , 0)
COMP( 1987, pcega, ibm5150, 0, pcega, pcgen, driver_device, 0, "<generic>", "PC (EGA)" , 0)
COMP ( 1987, pcmda, ibm5150, 0, pcmda, pcgen, driver_device, 0, "<generic>", "PC (MDA)" , 0)
COMP ( 1987, pcherc, ibm5150, 0, pcherc, pcgen, driver_device, 0, "<generic>", "PC (Hercules)" , 0)
COMP ( 1987, xtvga, ibm5150, 0, xtvga, pcgen, driver_device, 0, "<generic>", "PC (VGA)" , GAME_NOT_WORKING)