summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/jupiter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/jupiter.cpp')
-rw-r--r--src/mame/drivers/jupiter.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mame/drivers/jupiter.cpp b/src/mame/drivers/jupiter.cpp
index fa8e63511d8..f429a35de49 100644
--- a/src/mame/drivers/jupiter.cpp
+++ b/src/mame/drivers/jupiter.cpp
@@ -46,7 +46,7 @@ static ADDRESS_MAP_START( jupiter_m6800_mem, AS_PROGRAM, 8, jupiter2_state )
// AM_RANGE(0xff58, 0xff5c) Cartridge Disk Controller PIA
// AM_RANGE(0xff60, 0xff76) DMA Controller
// AM_RANGE(0xff80, 0xff83) Floppy PIA
- AM_RANGE(0xff84, 0xff87) AM_DEVREADWRITE(INS1771N1_TAG, wd_fdc_t, read, write)
+ AM_RANGE(0xff84, 0xff87) AM_DEVREADWRITE(INS1771N1_TAG, wd_fdc_device_base, read, write)
// AM_RANGE(0xff90, 0xff93) Hytype Parallel Printer PIA
// AM_RANGE(0xffa0, 0xffa7) Persci Floppy Disk Controller
// AM_RANGE(0xffb0, 0xffb3) Video PIA
@@ -120,7 +120,7 @@ READ8_MEMBER( jupiter3_state::status_r )
return (m_term_data) ? 0x80 : 0x00;
}
-WRITE8_MEMBER( jupiter3_state::kbd_put )
+void jupiter3_state::kbd_put(u8 data)
{
if (data)
m_term_data = data ^ 0x80;
@@ -213,7 +213,7 @@ void jupiter3_state::machine_reset()
// MACHINE_CONFIG( jupiter )
//-------------------------------------------------
-static MACHINE_CONFIG_START( jupiter, jupiter2_state )
+static MACHINE_CONFIG_START( jupiter )
// basic machine hardware
MCFG_CPU_ADD(MCM6571AP_TAG, M6800, 2000000)
MCFG_CPU_PROGRAM_MAP(jupiter_m6800_mem)
@@ -236,7 +236,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( jupiter3 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( jupiter3, jupiter3_state )
+static MACHINE_CONFIG_START( jupiter3 )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, 4000000)
MCFG_CPU_PROGRAM_MAP(jupiter3_mem)
@@ -259,7 +259,7 @@ static MACHINE_CONFIG_START( jupiter3, jupiter3_state )
MCFG_FLOPPY_DRIVE_ADD(INS1771N1_TAG":1", jupiter_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(jupiter3_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(jupiter3_state, kbd_put))
// internal ram
MCFG_RAM_ADD(RAM_TAG)
@@ -355,6 +355,6 @@ DRIVER_INIT_MEMBER(jupiter3_state,jupiter3)
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1976, jupiter2, 0, 0, jupiter, jupiter, jupiter2_state, jupiter, "Wave Mate", "Jupiter II", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
-COMP( 1976, jupiter3, 0, 0, jupiter3, jupiter, jupiter3_state, jupiter3,"Wave Mate", "Jupiter III", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1976, jupiter2, 0, 0, jupiter, jupiter, jupiter2_state, jupiter, "Wave Mate", "Jupiter II", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 1976, jupiter3, 0, 0, jupiter3, jupiter, jupiter3_state, jupiter3,"Wave Mate", "Jupiter III", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )