summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/binbug.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/binbug.cpp')
-rw-r--r--src/mame/drivers/binbug.cpp28
1 files changed, 13 insertions, 15 deletions
diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp
index ddf5fbace5f..0641116823a 100644
--- a/src/mame/drivers/binbug.cpp
+++ b/src/mame/drivers/binbug.cpp
@@ -53,8 +53,12 @@
#include "emu.h"
#include "bus/rs232/keyboard.h"
#include "cpu/s2650/s2650.h"
+#include "cpu/z80/z80daisy.h"
+#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
+#include "machine/z80ctc.h"
+#include "machine/z80pio.h"
#include "sound/wave.h"
#include "screen.h"
#include "speaker.h"
@@ -289,7 +293,7 @@ static DEVICE_INPUT_DEFAULTS_START( keyboard )
DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 )
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( binbug, binbug_state )
+static MACHINE_CONFIG_START( binbug )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz)
MCFG_CPU_PROGRAM_MAP(binbug_mem)
@@ -335,8 +339,8 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, binbug, pipbug, 0, binbug, binbug, driver_device, 0, "MicroByte", "BINBUG 3.6", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1980, binbug, pipbug, 0, binbug, binbug, binbug_state, 0, "MicroByte", "BINBUG 3.6", 0 )
@@ -399,12 +403,6 @@ ToDo:
*/
-#include "cpu/z80/z80.h"
-#include "machine/z80ctc.h"
-#include "machine/z80pio.h"
-#include "cpu/z80/z80daisy.h"
-
-
class dg680_state : public binbug_state
{
public:
@@ -419,7 +417,7 @@ public:
DECLARE_WRITE8_MEMBER(portb_w);
DECLARE_READ8_MEMBER(port08_r);
DECLARE_WRITE8_MEMBER(port08_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
TIMER_DEVICE_CALLBACK_MEMBER(time_tick);
TIMER_DEVICE_CALLBACK_MEMBER(uart_tick);
@@ -470,7 +468,7 @@ static const z80_daisy_config dg680_daisy_chain[] =
static INPUT_PORTS_START( dg680 )
INPUT_PORTS_END
-WRITE8_MEMBER( dg680_state::kbd_put )
+void dg680_state::kbd_put(u8 data)
{
m_term_data = data;
/* strobe in keyboard data */
@@ -526,7 +524,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(dg680_state::uart_tick)
m_ctc->trg3(0);
}
-static MACHINE_CONFIG_START( dg680, dg680_state )
+static MACHINE_CONFIG_START( dg680 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz / 4)
MCFG_CPU_PROGRAM_MAP(dg680_mem)
@@ -547,7 +545,7 @@ static MACHINE_CONFIG_START( dg680, dg680_state )
/* Keyboard */
MCFG_DEVICE_ADD("keyb", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(dg680_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(dg680_state, kbd_put))
/* Cassette */
MCFG_CASSETTE_ADD( "cassette" )
@@ -586,5 +584,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, dg680, 0, 0, dg680, dg680, driver_device, 0, "David Griffiths", "DG680 with DGOS-Z80 1.4", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1980, dg680, 0, 0, dg680, dg680, dg680_state, 0, "David Griffiths", "DG680 with DGOS-Z80 1.4", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )