summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/amstr_pc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/amstr_pc.cpp')
-rw-r--r--src/mame/drivers/amstr_pc.cpp23
1 files changed, 13 insertions, 10 deletions
diff --git a/src/mame/drivers/amstr_pc.cpp b/src/mame/drivers/amstr_pc.cpp
index b0fc7a62038..aa773ecfab1 100644
--- a/src/mame/drivers/amstr_pc.cpp
+++ b/src/mame/drivers/amstr_pc.cpp
@@ -34,6 +34,7 @@ More information can be found at http://www.seasip.info/AmstradXT/1640tech/index
#include "machine/genpc.h"
#include "bus/isa/isa.h"
#include "bus/isa/isa_cards.h"
+#include "bus/pc_joy/pc_joy.h"
#include "machine/pckeybrd.h"
#include "machine/pc_lpt.h"
@@ -47,8 +48,10 @@ public:
m_mb(*this, "mb"),
m_keyboard(*this, "pc_keyboard"),
m_lpt1(*this, "lpt_1"),
- m_lpt2(*this, "lpt_2")
- { m_mouse.x =0; m_mouse.y=0;}
+ m_lpt2(*this, "lpt_2"),
+ m_mouse{ 0, 0 }
+ {
+ }
required_device<cpu_device> m_maincpu;
required_device<pc_noppi_mb_device> m_mb;
@@ -466,7 +469,7 @@ static MACHINE_CONFIG_FRAGMENT( cfg_com )
MCFG_SLOT_DEFAULT_OPTION(nullptr)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pc200, amstrad_pc_state )
+static MACHINE_CONFIG_START( pc200 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, 8000000)
MCFG_CPU_PROGRAM_MAP(ppc640_map)
@@ -629,10 +632,10 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1987, ppc512, ibm5150, 0, ppc512, pc200, driver_device, 0, "Amstrad plc", "Amstrad PPC512", MACHINE_NOT_WORKING)
-COMP( 1987, ppc640, ibm5150, 0, ppc640, pc200, driver_device, 0, "Amstrad plc", "Amstrad PPC640", MACHINE_NOT_WORKING)
-COMP( 1988, pc20, ibm5150, 0, pc200, pc200, driver_device, 0, "Amstrad plc", "Amstrad PC20" , MACHINE_NOT_WORKING)
-COMP( 1988, pc200, ibm5150, 0, pc200, pc200, driver_device, 0, "Sinclair Research Ltd", "PC200 Professional Series", MACHINE_NOT_WORKING)
-COMP( 1988, pc2086, ibm5150, 0, pc2086, pc200, driver_device, 0, "Amstrad plc", "Amstrad PC2086", MACHINE_NOT_WORKING )
-COMP( 1990, pc3086, ibm5150, 0, pc2086, pc200, driver_device, 0, "Amstrad plc", "Amstrad PC3086", MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP( 1987, ppc512, ibm5150, 0, ppc512, pc200, amstrad_pc_state, 0, "Amstrad plc", "Amstrad PPC512", MACHINE_NOT_WORKING)
+COMP( 1987, ppc640, ibm5150, 0, ppc640, pc200, amstrad_pc_state, 0, "Amstrad plc", "Amstrad PPC640", MACHINE_NOT_WORKING)
+COMP( 1988, pc20, ibm5150, 0, pc200, pc200, amstrad_pc_state, 0, "Amstrad plc", "Amstrad PC20" , MACHINE_NOT_WORKING)
+COMP( 1988, pc200, ibm5150, 0, pc200, pc200, amstrad_pc_state, 0, "Sinclair Research Ltd", "PC200 Professional Series", MACHINE_NOT_WORKING)
+COMP( 1988, pc2086, ibm5150, 0, pc2086, pc200, amstrad_pc_state, 0, "Amstrad plc", "Amstrad PC2086", MACHINE_NOT_WORKING )
+COMP( 1990, pc3086, ibm5150, 0, pc2086, pc200, amstrad_pc_state, 0, "Amstrad plc", "Amstrad PC3086", MACHINE_NOT_WORKING )