diff options
Diffstat (limited to 'src/mame/drivers/rc759.cpp')
-rw-r--r-- | src/mame/drivers/rc759.cpp | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp index 6e0b2f11b1a..7e0c06c70e2 100644 --- a/src/mame/drivers/rc759.cpp +++ b/src/mame/drivers/rc759.cpp @@ -38,34 +38,34 @@ class rc759_state : public driver_device { public: rc759_state(const machine_config &mconfig, device_type type, const char *tag) : - driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_pic(*this, "pic"), - m_nvram(*this, "nvram"), - m_ppi(*this, "ppi"), - m_txt(*this, "txt"), - m_cas(*this, "cas"), - m_isbx(*this, "isbx"), - m_speaker(*this, "speaker"), - m_snd(*this, "snd"), - m_rtc(*this, "rtc"), - m_centronics(*this, "centronics"), - m_fdc(*this, "fdc"), - m_floppy0(*this, "fdc:0"), - m_floppy1(*this, "fdc:1"), - m_vram(*this, "vram"), - m_config(*this, "config"), - m_cas_enabled(0), m_cas_data(0), - m_drq_source(0), - m_nvram_bank(0), - m_gfx_mode(0), - m_keyboard_enable(0), m_keyboard_key(0x00), - m_centronics_strobe(0), m_centronics_init(0), m_centronics_select_in(0), m_centronics_busy(0), - m_centronics_ack(0), m_centronics_fault(0), m_centronics_perror(0), m_centronics_select(0), - m_centronics_data(0xff) + driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu"), + m_pic(*this, "pic"), + m_nvram(*this, "nvram"), + m_ppi(*this, "ppi"), + m_txt(*this, "txt"), + m_cas(*this, "cas"), + m_isbx(*this, "isbx"), + m_speaker(*this, "speaker"), + m_snd(*this, "snd"), + m_rtc(*this, "rtc"), + m_centronics(*this, "centronics"), + m_fdc(*this, "fdc"), + m_floppy0(*this, "fdc:0"), + m_floppy1(*this, "fdc:1"), + m_vram(*this, "vram"), + m_config(*this, "config"), + m_cas_enabled(0), m_cas_data(0), + m_drq_source(0), + m_nvram_bank(0), + m_gfx_mode(0), + m_keyboard_enable(0), m_keyboard_key(0x00), + m_centronics_strobe(0), m_centronics_init(0), m_centronics_select_in(0), m_centronics_busy(0), + m_centronics_ack(0), m_centronics_fault(0), m_centronics_perror(0), m_centronics_select(0), + m_centronics_data(0xff) { } - DECLARE_WRITE8_MEMBER(keyb_put); + void keyb_put(u8 data); DECLARE_READ8_MEMBER(keyboard_r); DECLARE_WRITE8_MEMBER(floppy_control_w); @@ -121,7 +121,7 @@ private: required_device<sn76489a_device> m_snd; required_device<mm58167_device> m_rtc; required_device<centronics_device> m_centronics; - required_device<wd2797_t> m_fdc; + required_device<wd2797_device> m_fdc; required_device<floppy_connector> m_floppy0; required_device<floppy_connector> m_floppy1; required_shared_ptr<uint16_t> m_vram; @@ -153,7 +153,7 @@ private: // I/O //************************************************************************** -WRITE8_MEMBER( rc759_state::keyb_put ) +void rc759_state::keyb_put(u8 data) { m_keyboard_key = data; m_pic->ir1_w(1); @@ -486,7 +486,7 @@ static ADDRESS_MAP_START( rc759_io, AS_IO, 16, rc759_state ) AM_RANGE(0x240, 0x241) AM_WRITE(txt_ca_w) AM_RANGE(0x250, 0x251) AM_READWRITE8(centronics_data_r, centronics_data_w, 0x00ff) AM_RANGE(0x260, 0x261) AM_READWRITE8(centronics_control_r, centronics_control_w, 0x00ff) - AM_RANGE(0x280, 0x287) AM_DEVREADWRITE8("fdc", wd2797_t, read, write, 0x00ff) + AM_RANGE(0x280, 0x287) AM_DEVREADWRITE8("fdc", wd2797_device, read, write, 0x00ff) AM_RANGE(0x288, 0x289) AM_WRITE8(floppy_control_w, 0x00ff) // AM_RANGE(0x28a, 0x28b) external printer data // AM_RANGE(0x28d, 0x28d) external printer control @@ -524,7 +524,7 @@ static SLOT_INTERFACE_START( rc759_floppies ) SLOT_INTERFACE("hd", FLOPPY_525_HD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( rc759, rc759_state ) +static MACHINE_CONFIG_START( rc759 ) MCFG_CPU_ADD("maincpu", I80186, 6000000) MCFG_CPU_PROGRAM_MAP(rc759_map) MCFG_CPU_IO_MAP(rc759_io) @@ -560,7 +560,7 @@ static MACHINE_CONFIG_START( rc759, rc759_state ) // keyboard MCFG_DEVICE_ADD("keyb", GENERIC_KEYBOARD, 0) - MCFG_GENERIC_KEYBOARD_CB(WRITE8(rc759_state, keyb_put)) + MCFG_GENERIC_KEYBOARD_CB(PUT(rc759_state, keyb_put)) // cassette MCFG_CASSETTE_ADD("cas") @@ -619,4 +619,4 @@ ROM_END // SYSTEM DRIVERS //************************************************************************** -COMP( 1984, rc759, 0, 0, rc759, rc759, driver_device, 0, "Regnecentralen", "RC759 Piccoline", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) +COMP( 1984, rc759, 0, 0, rc759, rc759, rc759_state, 0, "Regnecentralen", "RC759 Piccoline", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) |