From 15386fab3d106f117de2bb5fd414b7c53cae92d1 Mon Sep 17 00:00:00 2001 From: Curt Coder Date: Fri, 22 May 2015 22:37:05 +0300 Subject: [PATCH] Cleanup. (nw) --- src/emu/bus/ieee488/c2040.c | 126 ++++++++++++++-------------- src/emu/bus/ieee488/c2040.h | 22 ++--- src/emu/bus/ieee488/c8050.c | 158 ++++++++++++++++++------------------ src/emu/bus/ieee488/c8050.h | 28 +++---- 4 files changed, 167 insertions(+), 167 deletions(-) diff --git a/src/emu/bus/ieee488/c2040.c b/src/emu/bus/ieee488/c2040.c index 0a46c238c00..8ce2856e371 100644 --- a/src/emu/bus/ieee488/c2040.c +++ b/src/emu/bus/ieee488/c2040.c @@ -69,9 +69,9 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type C2040 = &device_creator; -const device_type C3040 = &device_creator; -const device_type C4040 = &device_creator; +const device_type C2040 = &device_creator; +const device_type C3040 = &device_creator; +const device_type C4040 = &device_creator; //------------------------------------------------- @@ -96,7 +96,7 @@ ROM_END // rom_region - device-specific ROM region //------------------------------------------------- -const rom_entry *c2040_device::device_rom_region() const +const rom_entry *c2040_t::device_rom_region() const { return ROM_NAME( c2040 ); } @@ -123,7 +123,7 @@ ROM_END // rom_region - device-specific ROM region //------------------------------------------------- -const rom_entry *c3040_device::device_rom_region() const +const rom_entry *c3040_t::device_rom_region() const { return ROM_NAME( c3040 ); } @@ -158,7 +158,7 @@ ROM_END // rom_region - device-specific ROM region //------------------------------------------------- -const rom_entry *c4040_device::device_rom_region() const +const rom_entry *c4040_t::device_rom_region() const { return ROM_NAME( c4040 ); } @@ -168,7 +168,7 @@ const rom_entry *c4040_device::device_rom_region() const // ADDRESS_MAP( c2040_main_mem ) //------------------------------------------------- -static ADDRESS_MAP_START( c2040_main_mem, AS_PROGRAM, 8, c2040_device ) +static ADDRESS_MAP_START( c2040_main_mem, AS_PROGRAM, 8, c2040_t ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0100) AM_DEVICE(M6532_0_TAG, mos6532_t, ram_map) AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x0100) AM_DEVICE(M6532_1_TAG, mos6532_t, ram_map) @@ -186,7 +186,7 @@ ADDRESS_MAP_END // ADDRESS_MAP( c2040_fdc_mem ) //------------------------------------------------- -static ADDRESS_MAP_START( c2040_fdc_mem, AS_PROGRAM, 8, c2040_device ) +static ADDRESS_MAP_START( c2040_fdc_mem, AS_PROGRAM, 8, c2040_t ) ADDRESS_MAP_GLOBAL_MASK(0x1fff) AM_RANGE(0x0000, 0x003f) AM_MIRROR(0x0300) AM_DEVICE(M6530_TAG, mos6530_t, ram_map) AM_RANGE(0x0040, 0x004f) AM_MIRROR(0x0330) AM_DEVICE(M6522_TAG, via6522_device, map) @@ -203,7 +203,7 @@ ADDRESS_MAP_END // riot6532 uc1 //------------------------------------------------- -READ8_MEMBER( c2040_device::dio_r ) +READ8_MEMBER( c2040_t::dio_r ) { /* @@ -223,7 +223,7 @@ READ8_MEMBER( c2040_device::dio_r ) return m_bus->dio_r(); } -WRITE8_MEMBER( c2040_device::dio_w ) +WRITE8_MEMBER( c2040_t::dio_w ) { /* @@ -248,7 +248,7 @@ WRITE8_MEMBER( c2040_device::dio_w ) // riot6532 ue1 //------------------------------------------------- -READ8_MEMBER( c2040_device::riot1_pa_r ) +READ8_MEMBER( c2040_t::riot1_pa_r ) { /* @@ -279,7 +279,7 @@ READ8_MEMBER( c2040_device::riot1_pa_r ) return data; } -WRITE8_MEMBER( c2040_device::riot1_pa_w ) +WRITE8_MEMBER( c2040_t::riot1_pa_w ) { /* @@ -314,7 +314,7 @@ WRITE8_MEMBER( c2040_device::riot1_pa_w ) update_ieee_signals(); } -READ8_MEMBER( c2040_device::riot1_pb_r ) +READ8_MEMBER( c2040_t::riot1_pb_r ) { /* @@ -345,7 +345,7 @@ READ8_MEMBER( c2040_device::riot1_pb_r ) return data; } -WRITE8_MEMBER( c2040_device::riot1_pb_w ) +WRITE8_MEMBER( c2040_t::riot1_pb_w ) { /* @@ -373,7 +373,7 @@ WRITE8_MEMBER( c2040_device::riot1_pb_w ) } -WRITE8_MEMBER( c2040_device::via_pb_w ) +WRITE8_MEMBER( c2040_t::via_pb_w ) { /* @@ -417,7 +417,7 @@ SLOT_INTERFACE_END // FLOPPY_FORMATS( floppy_formats ) //------------------------------------------------- -FLOPPY_FORMATS_MEMBER( c2040_device::floppy_formats ) +FLOPPY_FORMATS_MEMBER( c2040_t::floppy_formats ) FLOPPY_C3040_FORMAT, FLOPPY_G64_FORMAT FLOPPY_FORMATS_END @@ -427,7 +427,7 @@ FLOPPY_FORMATS_END // FLOPPY_FORMATS( floppy_formats ) //------------------------------------------------- -FLOPPY_FORMATS_MEMBER( c3040_device::floppy_formats ) +FLOPPY_FORMATS_MEMBER( c3040_t::floppy_formats ) FLOPPY_C3040_FORMAT, FLOPPY_G64_FORMAT FLOPPY_FORMATS_END @@ -437,7 +437,7 @@ FLOPPY_FORMATS_END // FLOPPY_FORMATS( floppy_formats ) //------------------------------------------------- -FLOPPY_FORMATS_MEMBER( c4040_device::floppy_formats ) +FLOPPY_FORMATS_MEMBER( c4040_t::floppy_formats ) FLOPPY_C4040_FORMAT, FLOPPY_G64_FORMAT FLOPPY_FORMATS_END @@ -453,14 +453,14 @@ static MACHINE_CONFIG_FRAGMENT( c2040 ) MCFG_CPU_PROGRAM_MAP(c2040_main_mem) MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532n, XTAL_16MHz/16) - MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, dio_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, dio_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(c2040_t, dio_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_t, dio_w)) MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532n, XTAL_16MHz/16) - MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, riot1_pa_r)) - MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_device, riot1_pa_w)) - MCFG_MOS6530n_IN_PB_CB(READ8(c2040_device, riot1_pb_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, riot1_pb_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(c2040_t, riot1_pa_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_t, riot1_pa_w)) + MCFG_MOS6530n_IN_PB_CB(READ8(c2040_t, riot1_pb_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_t, riot1_pb_w)) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller @@ -469,7 +469,7 @@ static MACHINE_CONFIG_FRAGMENT( c2040 ) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_16MHz/16) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c2040_fdc_t, read)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_device, via_pb_w)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_t, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_t, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_t, rw_sel_w)) @@ -485,8 +485,8 @@ static MACHINE_CONFIG_FRAGMENT( c2040 ) MCFG_C2040_SYNC_CALLBACK(DEVWRITELINE(M6530_TAG, mos6530_t, pb6_w)) MCFG_C2040_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C2040_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) - MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":0", c2040_floppies, "525ssqd", c2040_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":1", c2040_floppies, "525ssqd", c2040_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":0", c2040_floppies, "525ssqd", c2040_t::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":1", c2040_floppies, "525ssqd", c2040_t::floppy_formats) MACHINE_CONFIG_END @@ -495,7 +495,7 @@ MACHINE_CONFIG_END // machine configurations //------------------------------------------------- -machine_config_constructor c2040_device::device_mconfig_additions() const +machine_config_constructor c2040_t::device_mconfig_additions() const { return MACHINE_CONFIG_NAME( c2040 ); } @@ -511,14 +511,14 @@ static MACHINE_CONFIG_FRAGMENT( c3040 ) MCFG_CPU_PROGRAM_MAP(c2040_main_mem) MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532n, XTAL_16MHz/16) - MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, dio_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, dio_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(c2040_t, dio_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_t, dio_w)) MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532n, XTAL_16MHz/16) - MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, riot1_pa_r)) - MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_device, riot1_pa_w)) - MCFG_MOS6530n_IN_PB_CB(READ8(c2040_device, riot1_pb_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, riot1_pb_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(c2040_t, riot1_pa_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_t, riot1_pa_w)) + MCFG_MOS6530n_IN_PB_CB(READ8(c2040_t, riot1_pb_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_t, riot1_pb_w)) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller @@ -527,7 +527,7 @@ static MACHINE_CONFIG_FRAGMENT( c3040 ) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_16MHz/16) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c2040_fdc_t, read)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_device, via_pb_w)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_t, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_t, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_t, rw_sel_w)) @@ -543,8 +543,8 @@ static MACHINE_CONFIG_FRAGMENT( c3040 ) MCFG_C2040_SYNC_CALLBACK(DEVWRITELINE(M6530_TAG, mos6530_t, pb6_w)) MCFG_C2040_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C2040_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) - MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":0", c2040_floppies, "525ssqd", c3040_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":1", c2040_floppies, "525ssqd", c3040_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":0", c2040_floppies, "525ssqd", c3040_t::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":1", c2040_floppies, "525ssqd", c3040_t::floppy_formats) MACHINE_CONFIG_END @@ -553,7 +553,7 @@ MACHINE_CONFIG_END // machine configurations //------------------------------------------------- -machine_config_constructor c3040_device::device_mconfig_additions() const +machine_config_constructor c3040_t::device_mconfig_additions() const { return MACHINE_CONFIG_NAME( c3040 ); } @@ -569,14 +569,14 @@ static MACHINE_CONFIG_FRAGMENT( c4040 ) MCFG_CPU_PROGRAM_MAP(c2040_main_mem) MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532n, XTAL_16MHz/16) - MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, dio_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, dio_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(c2040_t, dio_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_t, dio_w)) MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532n, XTAL_16MHz/16) - MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, riot1_pa_r)) - MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_device, riot1_pa_w)) - MCFG_MOS6530n_IN_PB_CB(READ8(c2040_device, riot1_pb_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, riot1_pb_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(c2040_t, riot1_pa_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_t, riot1_pa_w)) + MCFG_MOS6530n_IN_PB_CB(READ8(c2040_t, riot1_pb_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_t, riot1_pb_w)) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller @@ -585,7 +585,7 @@ static MACHINE_CONFIG_FRAGMENT( c4040 ) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_16MHz/16) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c2040_fdc_t, read)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_device, via_pb_w)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_t, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_t, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_t, rw_sel_w)) @@ -601,8 +601,8 @@ static MACHINE_CONFIG_FRAGMENT( c4040 ) MCFG_C2040_SYNC_CALLBACK(DEVWRITELINE(M6530_TAG, mos6530_t, pb6_w)) MCFG_C2040_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C2040_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) - MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":0", c2040_floppies, "525ssqd", c4040_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":1", c2040_floppies, "525ssqd", c4040_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":0", c2040_floppies, "525ssqd", c4040_t::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":1", c2040_floppies, "525ssqd", c4040_t::floppy_formats) MACHINE_CONFIG_END @@ -611,7 +611,7 @@ MACHINE_CONFIG_END // machine configurations //------------------------------------------------- -machine_config_constructor c4040_device::device_mconfig_additions() const +machine_config_constructor c4040_t::device_mconfig_additions() const { return MACHINE_CONFIG_NAME( c4040 ); } @@ -639,7 +639,7 @@ INPUT_PORTS_END // input_ports - device-specific input ports //------------------------------------------------- -ioport_constructor c2040_device::device_input_ports() const +ioport_constructor c2040_t::device_input_ports() const { return INPUT_PORTS_NAME( c2040 ); } @@ -654,7 +654,7 @@ ioport_constructor c2040_device::device_input_ports() const // update_ieee_signals - //------------------------------------------------- -inline void c2040_device::update_ieee_signals() +inline void c2040_t::update_ieee_signals() { int atn = m_bus->atn_r(); int nrfd = !(!(!(atn && m_atna) && m_rfdo) || !(atn || m_atna)); @@ -671,10 +671,10 @@ inline void c2040_device::update_ieee_signals() //************************************************************************** //------------------------------------------------- -// c2040_device - constructor +// c2040_t - constructor //------------------------------------------------- -c2040_device::c2040_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +c2040_t::c2040_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_TAG), @@ -694,7 +694,7 @@ c2040_device::c2040_device(const machine_config &mconfig, device_type type, cons { } -c2040_device::c2040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c2040_t::c2040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C2040, "C2040", tag, owner, clock, "c2040", __FILE__), device_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_TAG), @@ -716,26 +716,26 @@ c2040_device::c2040_device(const machine_config &mconfig, const char *tag, devic //------------------------------------------------- -// c3040_device - constructor +// c3040_t - constructor //------------------------------------------------- -c3040_device::c3040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - c2040_device(mconfig, C3040, "C3040", tag, owner, clock, "c3040", __FILE__) { } +c3040_t::c3040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + c2040_t(mconfig, C3040, "C3040", tag, owner, clock, "c3040", __FILE__) { } //------------------------------------------------- -// c4040_device - constructor +// c4040_t - constructor //------------------------------------------------- -c4040_device::c4040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - c2040_device(mconfig, C4040, "C4040", tag, owner, clock, "c4040", __FILE__) { } +c4040_t::c4040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + c2040_t(mconfig, C4040, "C4040", tag, owner, clock, "c4040", __FILE__) { } //------------------------------------------------- // device_start - device-specific startup //------------------------------------------------- -void c2040_device::device_start() +void c2040_t::device_start() { // install image callbacks m_fdc->set_floppy(m_floppy0, m_floppy1); @@ -752,7 +752,7 @@ void c2040_device::device_start() // device_reset - device-specific reset //------------------------------------------------- -void c2040_device::device_reset() +void c2040_t::device_reset() { m_maincpu->reset(); @@ -779,7 +779,7 @@ void c2040_device::device_reset() // ieee488_atn - //------------------------------------------------- -void c2040_device::ieee488_atn(int state) +void c2040_t::ieee488_atn(int state) { update_ieee_signals(); @@ -791,7 +791,7 @@ void c2040_device::ieee488_atn(int state) // ieee488_ifc - //------------------------------------------------- -void c2040_device::ieee488_ifc(int state) +void c2040_t::ieee488_ifc(int state) { if (!m_ifc && state) { diff --git a/src/emu/bus/ieee488/c2040.h b/src/emu/bus/ieee488/c2040.h index 7b82857764e..3f63b30b4b6 100644 --- a/src/emu/bus/ieee488/c2040.h +++ b/src/emu/bus/ieee488/c2040.h @@ -25,15 +25,15 @@ // TYPE DEFINITIONS //************************************************************************** -// ======================> c2040_device +// ======================> c2040_t -class c2040_device : public device_t, - public device_ieee488_interface +class c2040_t : public device_t, + public device_ieee488_interface { public: // construction/destruction - c2040_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - c2040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c2040_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + c2040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const; @@ -91,13 +91,13 @@ protected: }; -// ======================> c3040_device +// ======================> c3040_t -class c3040_device : public c2040_device +class c3040_t : public c2040_t { public: // construction/destruction - c3040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c3040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const; @@ -107,13 +107,13 @@ public: }; -// ======================> c4040_device +// ======================> c4040_t -class c4040_device : public c2040_device +class c4040_t : public c2040_t { public: // construction/destruction - c4040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c4040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const; diff --git a/src/emu/bus/ieee488/c8050.c b/src/emu/bus/ieee488/c8050.c index 20026009c43..e60386db689 100644 --- a/src/emu/bus/ieee488/c8050.c +++ b/src/emu/bus/ieee488/c8050.c @@ -53,10 +53,10 @@ enum // DEVICE DEFINITIONS //************************************************************************** -const device_type C8050 = &device_creator; -const device_type C8250 = &device_creator; -const device_type C8250LP = &device_creator; -const device_type SFD1001 = &device_creator; +const device_type C8050 = &device_creator; +const device_type C8250 = &device_creator; +const device_type C8250LP = &device_creator; +const device_type SFD1001 = &device_creator; //------------------------------------------------- @@ -109,7 +109,7 @@ ROM_END // rom_region - device-specific ROM region //------------------------------------------------- -const rom_entry *c8050_device::device_rom_region() const +const rom_entry *c8050_t::device_rom_region() const { return ROM_NAME( c8050 ); } @@ -143,7 +143,7 @@ ROM_END // rom_region - device-specific ROM region //------------------------------------------------- -const rom_entry *c8250lp_device::device_rom_region() const +const rom_entry *c8250lp_t::device_rom_region() const { return ROM_NAME( c8250lp ); } @@ -173,7 +173,7 @@ ROM_END // rom_region - device-specific ROM region //------------------------------------------------- -const rom_entry *sfd1001_device::device_rom_region() const +const rom_entry *sfd1001_t::device_rom_region() const { return ROM_NAME( sfd1001 ); } @@ -183,7 +183,7 @@ const rom_entry *sfd1001_device::device_rom_region() const // ADDRESS_MAP( c8050_main_mem ) //------------------------------------------------- -static ADDRESS_MAP_START( c8050_main_mem, AS_PROGRAM, 8, c8050_device ) +static ADDRESS_MAP_START( c8050_main_mem, AS_PROGRAM, 8, c8050_t ) AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0100) AM_DEVICE(M6532_0_TAG, mos6532_t, ram_map) AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x0100) AM_DEVICE(M6532_1_TAG, mos6532_t, ram_map) AM_RANGE(0x0200, 0x021f) AM_MIRROR(0x0d60) AM_DEVICE(M6532_0_TAG, mos6532_t, io_map) @@ -200,7 +200,7 @@ ADDRESS_MAP_END // ADDRESS_MAP( c8050_fdc_mem ) //------------------------------------------------- -static ADDRESS_MAP_START( c8050_fdc_mem, AS_PROGRAM, 8, c8050_device ) +static ADDRESS_MAP_START( c8050_fdc_mem, AS_PROGRAM, 8, c8050_t ) ADDRESS_MAP_GLOBAL_MASK(0x1fff) AM_RANGE(0x0000, 0x003f) AM_MIRROR(0x0300) AM_DEVICE(M6530_TAG, mos6530_t, ram_map) AM_RANGE(0x0040, 0x004f) AM_MIRROR(0x0330) AM_DEVICE(M6522_TAG, via6522_device, map) @@ -217,7 +217,7 @@ ADDRESS_MAP_END // ADDRESS_MAP( c8250lp_fdc_mem ) //------------------------------------------------- -static ADDRESS_MAP_START( c8250lp_fdc_mem, AS_PROGRAM, 8, c8050_device ) +static ADDRESS_MAP_START( c8250lp_fdc_mem, AS_PROGRAM, 8, c8050_t ) ADDRESS_MAP_GLOBAL_MASK(0x1fff) AM_RANGE(0x0000, 0x003f) AM_MIRROR(0x0300) AM_DEVICE(M6530_TAG, mos6530_t, ram_map) AM_RANGE(0x0040, 0x004f) AM_MIRROR(0x0330) AM_DEVICE(M6522_TAG, via6522_device, map) @@ -234,7 +234,7 @@ ADDRESS_MAP_END // ADDRESS_MAP( sfd1001_fdc_mem ) //------------------------------------------------- -static ADDRESS_MAP_START( sfd1001_fdc_mem, AS_PROGRAM, 8, c8050_device ) +static ADDRESS_MAP_START( sfd1001_fdc_mem, AS_PROGRAM, 8, c8050_t ) ADDRESS_MAP_GLOBAL_MASK(0x1fff) AM_RANGE(0x0000, 0x003f) AM_MIRROR(0x0300) AM_DEVICE(M6530_TAG, mos6530_t, ram_map) AM_RANGE(0x0040, 0x004f) AM_MIRROR(0x0330) AM_DEVICE(M6522_TAG, via6522_device, map) @@ -251,7 +251,7 @@ ADDRESS_MAP_END // riot6532 uc1 //------------------------------------------------- -READ8_MEMBER( c8050_device::dio_r ) +READ8_MEMBER( c8050_t::dio_r ) { /* @@ -271,7 +271,7 @@ READ8_MEMBER( c8050_device::dio_r ) return m_bus->dio_r(); } -WRITE8_MEMBER( c8050_device::dio_w ) +WRITE8_MEMBER( c8050_t::dio_w ) { /* @@ -295,7 +295,7 @@ WRITE8_MEMBER( c8050_device::dio_w ) // riot6532 ue1 //------------------------------------------------- -READ8_MEMBER( c8050_device::riot1_pa_r ) +READ8_MEMBER( c8050_t::riot1_pa_r ) { /* @@ -326,7 +326,7 @@ READ8_MEMBER( c8050_device::riot1_pa_r ) return data; } -WRITE8_MEMBER( c8050_device::riot1_pa_w ) +WRITE8_MEMBER( c8050_t::riot1_pa_w ) { /* @@ -361,7 +361,7 @@ WRITE8_MEMBER( c8050_device::riot1_pa_w ) update_ieee_signals(); } -READ8_MEMBER( c8050_device::riot1_pb_r ) +READ8_MEMBER( c8050_t::riot1_pb_r ) { /* @@ -392,7 +392,7 @@ READ8_MEMBER( c8050_device::riot1_pb_r ) return data; } -WRITE8_MEMBER( c8050_device::riot1_pb_w ) +WRITE8_MEMBER( c8050_t::riot1_pb_w ) { /* @@ -419,7 +419,7 @@ WRITE8_MEMBER( c8050_device::riot1_pb_w ) output_set_led_value(LED_ERR, BIT(data, 5)); } -WRITE8_MEMBER( c8050_device::via_pb_w ) +WRITE8_MEMBER( c8050_t::via_pb_w ) { /* @@ -466,7 +466,7 @@ SLOT_INTERFACE_END // FLOPPY_FORMATS( floppy_formats ) //------------------------------------------------- -FLOPPY_FORMATS_MEMBER( c8050_device::floppy_formats ) +FLOPPY_FORMATS_MEMBER( c8050_t::floppy_formats ) FLOPPY_D80_FORMAT FLOPPY_FORMATS_END @@ -493,7 +493,7 @@ SLOT_INTERFACE_END // FLOPPY_FORMATS( floppy_formats ) //------------------------------------------------- -FLOPPY_FORMATS_MEMBER( c8250_device::floppy_formats ) +FLOPPY_FORMATS_MEMBER( c8250_t::floppy_formats ) FLOPPY_D80_FORMAT, FLOPPY_D82_FORMAT FLOPPY_FORMATS_END @@ -503,7 +503,7 @@ FLOPPY_FORMATS_END // FLOPPY_FORMATS( floppy_formats ) //------------------------------------------------- -FLOPPY_FORMATS_MEMBER( c8250lp_device::floppy_formats ) +FLOPPY_FORMATS_MEMBER( c8250lp_t::floppy_formats ) FLOPPY_D80_FORMAT, FLOPPY_D82_FORMAT FLOPPY_FORMATS_END @@ -513,7 +513,7 @@ FLOPPY_FORMATS_END // FLOPPY_FORMATS( floppy_formats ) //------------------------------------------------- -FLOPPY_FORMATS_MEMBER( sfd1001_device::floppy_formats ) +FLOPPY_FORMATS_MEMBER( sfd1001_t::floppy_formats ) FLOPPY_D80_FORMAT, FLOPPY_D82_FORMAT FLOPPY_FORMATS_END @@ -529,14 +529,14 @@ static MACHINE_CONFIG_FRAGMENT( c8050 ) MCFG_CPU_PROGRAM_MAP(c8050_main_mem) MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532n, XTAL_12MHz/12) - MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(c8050_t, dio_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_t, dio_w)) MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532n, XTAL_12MHz/12) - MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r)) - MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w)) - MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, riot1_pb_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(c8050_t, riot1_pa_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_t, riot1_pa_w)) + MCFG_MOS6530n_IN_PB_CB(READ8(c8050_t, riot1_pb_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_t, riot1_pb_w)) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller @@ -545,7 +545,7 @@ static MACHINE_CONFIG_FRAGMENT( c8050 ) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_12MHz/12) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_t, read)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_t, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_t, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_t, rw_sel_w)) @@ -563,8 +563,8 @@ static MACHINE_CONFIG_FRAGMENT( c8050 ) MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1) MCFG_C8050_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) - MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", c8050_floppies, "525ssqd", c8050_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":1", c8050_floppies, "525ssqd", c8050_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", c8050_floppies, "525ssqd", c8050_t::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":1", c8050_floppies, "525ssqd", c8050_t::floppy_formats) MACHINE_CONFIG_END @@ -573,7 +573,7 @@ MACHINE_CONFIG_END // machine configurations //------------------------------------------------- -machine_config_constructor c8050_device::device_mconfig_additions() const +machine_config_constructor c8050_t::device_mconfig_additions() const { return MACHINE_CONFIG_NAME( c8050 ); } @@ -589,14 +589,14 @@ static MACHINE_CONFIG_FRAGMENT( c8250 ) MCFG_CPU_PROGRAM_MAP(c8050_main_mem) MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532n, XTAL_12MHz/12) - MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(c8050_t, dio_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_t, dio_w)) MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532n, XTAL_12MHz/12) - MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r)) - MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w)) - MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, riot1_pb_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(c8050_t, riot1_pa_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_t, riot1_pa_w)) + MCFG_MOS6530n_IN_PB_CB(READ8(c8050_t, riot1_pb_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_t, riot1_pb_w)) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller @@ -605,7 +605,7 @@ static MACHINE_CONFIG_FRAGMENT( c8250 ) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_12MHz/12) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_t, read)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_t, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_t, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_t, rw_sel_w)) @@ -624,8 +624,8 @@ static MACHINE_CONFIG_FRAGMENT( c8250 ) MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1) MCFG_C8050_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) - MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", c8250_floppies, "525qd", c8250_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":1", c8250_floppies, "525qd", c8250_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", c8250_floppies, "525qd", c8250_t::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":1", c8250_floppies, "525qd", c8250_t::floppy_formats) MACHINE_CONFIG_END @@ -634,7 +634,7 @@ MACHINE_CONFIG_END // machine configurations //------------------------------------------------- -machine_config_constructor c8250_device::device_mconfig_additions() const +machine_config_constructor c8250_t::device_mconfig_additions() const { return MACHINE_CONFIG_NAME( c8250 ); } @@ -650,14 +650,14 @@ static MACHINE_CONFIG_FRAGMENT( c8250lp ) MCFG_CPU_PROGRAM_MAP(c8050_main_mem) MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532n, XTAL_12MHz/12) - MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(c8050_t, dio_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_t, dio_w)) MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532n, XTAL_12MHz/12) - MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r)) - MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w)) - MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, riot1_pb_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(c8050_t, riot1_pa_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_t, riot1_pa_w)) + MCFG_MOS6530n_IN_PB_CB(READ8(c8050_t, riot1_pb_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_t, riot1_pb_w)) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller @@ -666,7 +666,7 @@ static MACHINE_CONFIG_FRAGMENT( c8250lp ) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_12MHz/12) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_t, read)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_t, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_t, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_t, rw_sel_w)) @@ -685,8 +685,8 @@ static MACHINE_CONFIG_FRAGMENT( c8250lp ) MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1) MCFG_C8050_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) - MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", c8250_floppies, "525qd", c8250lp_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":1", c8250_floppies, "525qd", c8250lp_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", c8250_floppies, "525qd", c8250lp_t::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":1", c8250_floppies, "525qd", c8250lp_t::floppy_formats) MACHINE_CONFIG_END @@ -695,7 +695,7 @@ MACHINE_CONFIG_END // machine configurations //------------------------------------------------- -machine_config_constructor c8250lp_device::device_mconfig_additions() const +machine_config_constructor c8250lp_t::device_mconfig_additions() const { return MACHINE_CONFIG_NAME( c8250lp ); } @@ -711,14 +711,14 @@ static MACHINE_CONFIG_FRAGMENT( sfd1001 ) MCFG_CPU_PROGRAM_MAP(c8050_main_mem) MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532n, XTAL_12MHz/12) - MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(c8050_t, dio_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_t, dio_w)) MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532n, XTAL_12MHz/12) - MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r)) - MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w)) - MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, riot1_pb_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(c8050_t, riot1_pa_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_t, riot1_pa_w)) + MCFG_MOS6530n_IN_PB_CB(READ8(c8050_t, riot1_pb_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_t, riot1_pb_w)) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller @@ -727,7 +727,7 @@ static MACHINE_CONFIG_FRAGMENT( sfd1001 ) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_12MHz/12) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_t, read)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_t, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_t, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_t, rw_sel_w)) @@ -745,7 +745,7 @@ static MACHINE_CONFIG_FRAGMENT( sfd1001 ) MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1) MCFG_C8050_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) - MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", sfd1001_floppies, "525qd", sfd1001_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", sfd1001_floppies, "525qd", sfd1001_t::floppy_formats) MACHINE_CONFIG_END @@ -754,7 +754,7 @@ MACHINE_CONFIG_END // machine configurations //------------------------------------------------- -machine_config_constructor sfd1001_device::device_mconfig_additions() const +machine_config_constructor sfd1001_t::device_mconfig_additions() const { return MACHINE_CONFIG_NAME( sfd1001 ); } @@ -782,7 +782,7 @@ INPUT_PORTS_END // input_ports - device-specific input ports //------------------------------------------------- -ioport_constructor c8050_device::device_input_ports() const +ioport_constructor c8050_t::device_input_ports() const { return INPUT_PORTS_NAME( c8050 ); } @@ -797,7 +797,7 @@ ioport_constructor c8050_device::device_input_ports() const // update_ieee_signals - //------------------------------------------------- -inline void c8050_device::update_ieee_signals() +inline void c8050_t::update_ieee_signals() { int atn = m_bus->atn_r(); int nrfd = !(!(!(atn && m_atna) && m_rfdo) || !(atn || m_atna)); @@ -814,10 +814,10 @@ inline void c8050_device::update_ieee_signals() //************************************************************************** //------------------------------------------------- -// c8050_device - constructor +// c8050_t - constructor //------------------------------------------------- -c8050_device::c8050_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +c8050_t::c8050_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_TAG), @@ -836,7 +836,7 @@ c8050_device::c8050_device(const machine_config &mconfig, device_type type, cons { } -c8050_device::c8050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +c8050_t::c8050_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C8050, "C8050", tag, owner, clock, "c8050", __FILE__), device_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_TAG), @@ -857,34 +857,34 @@ c8050_device::c8050_device(const machine_config &mconfig, const char *tag, devic //------------------------------------------------- -// c8250_device - constructor +// c8250_t - constructor //------------------------------------------------- -c8250_device::c8250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - c8050_device(mconfig, C8250, "C8250", tag, owner, clock, "c8250", __FILE__) { } +c8250_t::c8250_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + c8050_t(mconfig, C8250, "C8250", tag, owner, clock, "c8250", __FILE__) { } //------------------------------------------------- -// c8250lp_device - constructor +// c8250lp_t - constructor //------------------------------------------------- -c8250lp_device::c8250lp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - c8050_device(mconfig, C8250LP, "C8250LP", tag, owner, clock, "c8250lp", __FILE__) { } +c8250lp_t::c8250lp_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + c8050_t(mconfig, C8250LP, "C8250LP", tag, owner, clock, "c8250lp", __FILE__) { } //------------------------------------------------- -// sfd1001_device - constructor +// sfd1001_t - constructor //------------------------------------------------- -sfd1001_device::sfd1001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - c8050_device(mconfig, SFD1001, "SFD1001", tag, owner, clock, "sfd1001", __FILE__) { } +sfd1001_t::sfd1001_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + c8050_t(mconfig, SFD1001, "SFD1001", tag, owner, clock, "sfd1001", __FILE__) { } //------------------------------------------------- // device_start - device-specific startup //------------------------------------------------- -void c8050_device::device_start() +void c8050_t::device_start() { // install image callbacks m_fdc->set_floppy(m_floppy0, m_floppy1); @@ -900,7 +900,7 @@ void c8050_device::device_start() // device_reset - device-specific reset //------------------------------------------------- -void c8050_device::device_reset() +void c8050_t::device_reset() { m_maincpu->reset(); @@ -927,7 +927,7 @@ void c8050_device::device_reset() // ieee488_atn - //------------------------------------------------- -void c8050_device::ieee488_atn(int state) +void c8050_t::ieee488_atn(int state) { update_ieee_signals(); @@ -939,7 +939,7 @@ void c8050_device::ieee488_atn(int state) // ieee488_ifc - //------------------------------------------------- -void c8050_device::ieee488_ifc(int state) +void c8050_t::ieee488_ifc(int state) { if (!m_ifc && state) { diff --git a/src/emu/bus/ieee488/c8050.h b/src/emu/bus/ieee488/c8050.h index 1ca90511025..818461828b4 100644 --- a/src/emu/bus/ieee488/c8050.h +++ b/src/emu/bus/ieee488/c8050.h @@ -25,15 +25,15 @@ // TYPE DEFINITIONS //************************************************************************** -// ======================> c8050_device +// ======================> c8050_t -class c8050_device : public device_t, - public device_ieee488_interface +class c8050_t : public device_t, + public device_ieee488_interface { public: // construction/destruction - c8050_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - c8050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c8050_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + c8050_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const; @@ -82,13 +82,13 @@ protected: }; -// ======================> c8250_device +// ======================> c8250_t -class c8250_device : public c8050_device +class c8250_t : public c8050_t { public: // construction/destruction - c8250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c8250_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const; @@ -97,13 +97,13 @@ public: }; -// ======================> c8250lp_device +// ======================> c8250lp_t -class c8250lp_device : public c8050_device +class c8250lp_t : public c8050_t { public: // construction/destruction - c8250lp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + c8250lp_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const; @@ -113,13 +113,13 @@ public: }; -// ======================> sfd1001_device +// ======================> sfd1001_t -class sfd1001_device : public c8050_device +class sfd1001_t : public c8050_t { public: // construction/destruction - sfd1001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + sfd1001_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const;