diff options
author | 2014-04-16 07:53:39 +0000 | |
---|---|---|
committer | 2014-04-16 07:53:39 +0000 | |
commit | 72d93bb509f7ba670c27850f58fe10ce09844a93 (patch) | |
tree | 37a23297e60928c97d312f4fedc800582b5cb98f /src/mess | |
parent | 0bd507725175d4694f4e201ebf573e6f28703aae (diff) |
Added serial printer, renamed centronics printer to match. Standardised the configuration of rs232 devices. All serial devices are now connected using an rs232 port. [smf]
Diffstat (limited to 'src/mess')
94 files changed, 345 insertions, 329 deletions
diff --git a/src/mess/drivers/68ksbc.c b/src/mess/drivers/68ksbc.c index 3a29ece498e..b526c762896 100644 --- a/src/mess/drivers/68ksbc.c +++ b/src/mess/drivers/68ksbc.c @@ -78,7 +78,7 @@ static MACHINE_CONFIG_START( c68ksbc, c68ksbc_state ) MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd)) MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts)) - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts)) diff --git a/src/mess/drivers/ace.c b/src/mess/drivers/ace.c index 9145d6007e4..7aa33072eef 100644 --- a/src/mess/drivers/ace.c +++ b/src/mess/drivers/ace.c @@ -753,7 +753,7 @@ static MACHINE_CONFIG_START( ace, ace_state ) MCFG_SNAPSHOT_ADD("snapshot", ace_state, ace, "ace", 1) MCFG_I8255A_ADD(I8255_TAG, ppi_intf) MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_6_5MHz/2, pio_intf) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mess/drivers/altair.c b/src/mess/drivers/altair.c index b70c3f7dbd7..273cbdb99ce 100644 --- a/src/mess/drivers/altair.c +++ b/src/mess/drivers/altair.c @@ -107,7 +107,7 @@ static MACHINE_CONFIG_START( altair, altair_state ) MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd)) MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts)) - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("mc6850", acia6850_device, write_rxd)) MCFG_RS232_DCD_HANDLER(DEVWRITELINE("mc6850", acia6850_device, write_dcd)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("mc6850", acia6850_device, write_cts)) diff --git a/src/mess/drivers/altos5.c b/src/mess/drivers/altos5.c index acd440b2cdb..0d1826f8a4f 100644 --- a/src/mess/drivers/altos5.c +++ b/src/mess/drivers/altos5.c @@ -486,7 +486,7 @@ static MACHINE_CONFIG_START( altos5, altos5_state ) MCFG_Z80DART_ADD("z80dart", XTAL_8MHz / 2, dart_intf ) MCFG_Z80SIO0_ADD("z80sio", XTAL_8MHz / 2, sio_intf ) - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("z80sio", z80dart_device, rxb_w)) MCFG_RS232_DCD_HANDLER(DEVWRITELINE("z80sio", z80dart_device, dcdb_w)) MCFG_RS232_RI_HANDLER(DEVWRITELINE("z80sio", z80dart_device, rib_w)) diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c index ad5a2bb8f2a..e84ecd42681 100644 --- a/src/mess/drivers/amiga.c +++ b/src/mess/drivers/amiga.c @@ -580,7 +580,7 @@ static MACHINE_CONFIG_START( ntsc, amiga_state ) /* devices */ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(amiga_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(amiga_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(amiga_state, write_centronics_perror)) @@ -802,7 +802,7 @@ static MACHINE_CONFIG_START( a1200n, a1200_state ) /* devices */ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(amiga_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(amiga_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(amiga_state, write_centronics_perror)) @@ -921,7 +921,7 @@ static MACHINE_CONFIG_START( a3000n, amiga_state ) /* devices */ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(amiga_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(amiga_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(amiga_state, write_centronics_perror)) diff --git a/src/mess/drivers/ampro.c b/src/mess/drivers/ampro.c index aba74a481a1..7b2e3a6f27c 100644 --- a/src/mess/drivers/ampro.c +++ b/src/mess/drivers/ampro.c @@ -197,7 +197,7 @@ static MACHINE_CONFIG_START( ampro, ampro_state ) /* Devices */ MCFG_Z80CTC_ADD( "z80ctc", XTAL_16MHz / 4, ctc_intf ) MCFG_Z80DART_ADD("z80dart", XTAL_16MHz / 4, dart_intf ) - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("z80dart", z80dart_device, rxa_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc_tick", ampro_state, ctc_tick, attotime::from_hz(XTAL_16MHz / 8)) diff --git a/src/mess/drivers/amstrad.c b/src/mess/drivers/amstrad.c index 2a721f0a5e2..cbfe321dc01 100644 --- a/src/mess/drivers/amstrad.c +++ b/src/mess/drivers/amstrad.c @@ -895,7 +895,7 @@ static MACHINE_CONFIG_START( amstrad_nofdc, amstrad_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(amstrad_state, write_centronics_busy)) /* snapshot */ @@ -976,7 +976,7 @@ static MACHINE_CONFIG_START( cpcplus, amstrad_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(amstrad_state, write_centronics_busy)) /* snapshot */ diff --git a/src/mess/drivers/amust.c b/src/mess/drivers/amust.c index e9ad95789da..03df68e319c 100644 --- a/src/mess/drivers/amust.c +++ b/src/mess/drivers/amust.c @@ -452,7 +452,7 @@ static MACHINE_CONFIG_START( amust, amust_state ) //MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr)) //MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts)) - //MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") + //MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") //MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_rxd)) //MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_cts)) //MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_dsr)) diff --git a/src/mess/drivers/applix.c b/src/mess/drivers/applix.c index df982bd792e..6cea23d6ac3 100644 --- a/src/mess/drivers/applix.c +++ b/src/mess/drivers/applix.c @@ -896,7 +896,7 @@ static MACHINE_CONFIG_START( applix, applix_state ) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(applix_state, applix_pb_w)) MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m68000_device, write_irq2)) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("via6522", via6522_device, write_ca1)) MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("via6522", via6522_device, write_pa0)) diff --git a/src/mess/drivers/apricot.c b/src/mess/drivers/apricot.c index 0da6f42a04a..46e23d2316f 100644 --- a/src/mess/drivers/apricot.c +++ b/src/mess/drivers/apricot.c @@ -423,7 +423,7 @@ static MACHINE_CONFIG_START( apricot, apricot_state ) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ic15", z80dart_device, ctsa_w)) // centronics printer - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("ic15", z80dart_device, ctsb_w)) MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("ic15", z80dart_device, dcdb_w)) diff --git a/src/mess/drivers/apricotf.c b/src/mess/drivers/apricotf.c index a532c4aa035..0c2cb84beab 100644 --- a/src/mess/drivers/apricotf.c +++ b/src/mess/drivers/apricotf.c @@ -321,7 +321,7 @@ static MACHINE_CONFIG_START( act_f1, f1_state ) MCFG_Z80SIO2_ADD(Z80SIO2_TAG, 2500000, sio_intf) MCFG_Z80CTC_ADD(Z80CTC_TAG, 2500000, ctc_intf) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(Z80SIO2_TAG, z80dart_device, ctsa_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mess/drivers/apricotp.c b/src/mess/drivers/apricotp.c index de7307a4972..c9c71041f51 100644 --- a/src/mess/drivers/apricotp.c +++ b/src/mess/drivers/apricotp.c @@ -606,7 +606,7 @@ static MACHINE_CONFIG_START( fp, fp_state ) MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":0", fp_floppies, "35dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":1", fp_floppies, NULL, floppy_image_device::default_floppy_formats) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fp_state, write_centronics_busy)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(fp_state, write_centronics_select)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fp_state, write_centronics_fault)) diff --git a/src/mess/drivers/atarist.c b/src/mess/drivers/atarist.c index a8b141a898b..8cf6985e2c0 100644 --- a/src/mess/drivers/atarist.c +++ b/src/mess/drivers/atarist.c @@ -2126,7 +2126,7 @@ static MACHINE_CONFIG_START( st, st_state ) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, 0, st_state::floppy_formats) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i0_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -2213,7 +2213,7 @@ static MACHINE_CONFIG_START( megast, megast_state ) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, 0, st_state::floppy_formats) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i0_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -2307,7 +2307,7 @@ static MACHINE_CONFIG_START( ste, ste_state ) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, 0, st_state::floppy_formats) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i0_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -2416,7 +2416,7 @@ static MACHINE_CONFIG_START( stbook, stbook_state ) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", 0, st_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, 0, 0, st_state::floppy_formats) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i0_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mess/drivers/atom.c b/src/mess/drivers/atom.c index d661d984dc1..8b031ed9e3c 100644 --- a/src/mess/drivers/atom.c +++ b/src/mess/drivers/atom.c @@ -833,7 +833,7 @@ static MACHINE_CONFIG_START( atom, atom_state ) MCFG_I8271_IRQ_CALLBACK(WRITELINE(atom_state, atom_8271_interrupt_callback)) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(atom_floppy_interface) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(R6522_TAG, via6522_device, write_ca1)) MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(R6522_TAG, via6522_device, write_pa7)) @@ -913,7 +913,7 @@ static MACHINE_CONFIG_START( atombb, atom_state ) MCFG_I8255_ADD(INS8255_TAG, ppi_intf) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(R6522_TAG, via6522_device, write_ca1)) MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(R6522_TAG, via6522_device, write_pa7)) diff --git a/src/mess/drivers/bbc.c b/src/mess/drivers/bbc.c index 25b2c8db32f..30b0ba92d78 100644 --- a/src/mess/drivers/bbc.c +++ b/src/mess/drivers/bbc.c @@ -769,7 +769,7 @@ static MACHINE_CONFIG_DERIVED( bbcb, bbca ) MCFG_UPD7002_EOC_CB(bbc_state, BBC_uPD7002_EOC) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_ca1)) MCFG_DEVCB_INVERT /* ack seems to be inverted? */ MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -828,7 +828,7 @@ static MACHINE_CONFIG_DERIVED( bbcb_us, bbca ) MCFG_UPD7002_EOC_CB(bbc_state, BBC_uPD7002_EOC) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_ca1)) MCFG_DEVCB_INVERT /* ack seems to be inverted? */ MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -928,7 +928,7 @@ static MACHINE_CONFIG_START( bbcm, bbc_state ) MCFG_MC146818_ADD( "rtc", XTAL_32_768kHz ) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_ca1)) MCFG_DEVCB_INVERT /* ack seems to be inverted? */ MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mess/drivers/binbug.c b/src/mess/drivers/binbug.c index b3577266db1..640eec11754 100644 --- a/src/mess/drivers/binbug.c +++ b/src/mess/drivers/binbug.c @@ -63,7 +63,7 @@ class binbug_state : public driver_device public: binbug_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_keyboard(*this, KEYBOARD_TAG), + m_rs232(*this, KEYBOARD_TAG), m_cass(*this, "cassette"), m_p_videoram(*this, "videoram"), m_p_attribram(*this, "attribram"), @@ -78,7 +78,7 @@ public: UINT8 m_framecnt; virtual void video_start(); UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - optional_device<serial_keyboard_device> m_keyboard; + optional_device<rs232_port_device> m_rs232; required_device<cassette_image_device> m_cass; required_shared_ptr<UINT8> m_p_videoram; required_shared_ptr<UINT8> m_p_attribram; @@ -92,7 +92,7 @@ WRITE8_MEMBER( binbug_state::binbug_ctrl_w ) READ8_MEMBER( binbug_state::binbug_serial_r ) { - return m_keyboard->tx_r() & (m_cass->input() < 0.03); + return m_rs232->rxd_r() & (m_cass->input() < 0.03); } WRITE_LINE_MEMBER( binbug_state::binbug_serial_w ) @@ -118,11 +118,6 @@ ADDRESS_MAP_END static INPUT_PORTS_START( binbug ) INPUT_PORTS_END -static const serial_keyboard_interface keyboard_intf = -{ - DEVCB_NULL -}; - void binbug_state::video_start() { m_p_chargen = memregion("chargen")->base(); @@ -286,6 +281,14 @@ QUICKLOAD_LOAD_MEMBER( binbug_state, binbug ) return result; } +static DEVICE_INPUT_DEFAULTS_START( keyboard ) + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_300 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) +DEVICE_INPUT_DEFAULTS_END + static MACHINE_CONFIG_START( binbug, binbug_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz) @@ -306,7 +309,8 @@ static MACHINE_CONFIG_START( binbug, binbug_state ) MCFG_PALETTE_ADD_MONOCHROME_AMBER("palette") /* Keyboard */ - MCFG_SERIAL_KEYBOARD_ADD(KEYBOARD_TAG, keyboard_intf, 300) + MCFG_RS232_PORT_ADD(KEYBOARD_TAG, default_rs232_devices, "keyboard") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("keyboard", keyboard) /* Cassette */ MCFG_CASSETTE_ADD( "cassette", default_cassette_interface ) diff --git a/src/mess/drivers/bullet.c b/src/mess/drivers/bullet.c index 242cf480763..31725fc8883 100644 --- a/src/mess/drivers/bullet.c +++ b/src/mess/drivers/bullet.c @@ -1052,12 +1052,12 @@ WRITE_LINE_MEMBER( bulletf_state::req_w ) static DEVICE_INPUT_DEFAULTS_START( terminal ) - DEVICE_INPUT_DEFAULTS( "TERM_TXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_RXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_STARTBITS", 0xff, 0x01 ) // 1 - DEVICE_INPUT_DEFAULTS( "TERM_DATABITS", 0xff, 0x03 ) // 8 - DEVICE_INPUT_DEFAULTS( "TERM_PARITY", 0xff, 0x00 ) // N - DEVICE_INPUT_DEFAULTS( "TERM_STOPBITS", 0xff, 0x01 ) // 1 + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END @@ -1208,7 +1208,7 @@ static MACHINE_CONFIG_START( bullet, bullet_state ) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":6", bullet_8_floppies, NULL, floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":7", bullet_8_floppies, NULL, floppy_image_device::default_floppy_formats) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(bullet_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(bullet_state, write_centronics_perror)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(bullet_state, write_centronics_select)) @@ -1216,9 +1216,9 @@ static MACHINE_CONFIG_START( bullet, bullet_state ) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) - MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxa_w)) - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal) MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, NULL) MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxb_w)) @@ -1263,14 +1263,14 @@ static MACHINE_CONFIG_START( bulletf, bulletf_state ) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":8", bullet_35_floppies, NULL, floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":9", bullet_35_floppies, NULL, floppy_image_device::default_floppy_formats) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(bullet_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) - MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxa_w)) - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal) MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, NULL) MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxb_w)) diff --git a/src/mess/drivers/bw12.c b/src/mess/drivers/bw12.c index 0ecceaa2365..6ff2a062d2b 100644 --- a/src/mess/drivers/bw12.c +++ b/src/mess/drivers/bw12.c @@ -644,7 +644,7 @@ static MACHINE_CONFIG_START( common, bw12_state ) MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, ctsb_w)) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(PIA6821_TAG, pia6821_device, ca1_w)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(bw12_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(bw12_state, write_centronics_fault)) diff --git a/src/mess/drivers/bw2.c b/src/mess/drivers/bw2.c index 62b012d1da7..5d0ca64b2ba 100644 --- a/src/mess/drivers/bw2.c +++ b/src/mess/drivers/bw2.c @@ -622,7 +622,7 @@ static MACHINE_CONFIG_START( bw2, bw2_state ) MCFG_I8255A_ADD(I8255A_TAG, ppi_intf) MCFG_MSM6255_ADD(MSM6255_TAG, XTAL_16MHz, 0, SCREEN_TAG, lcdc_map) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(bw2_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mess/drivers/cat.c b/src/mess/drivers/cat.c index b34bb7f15f8..4b64d263996 100644 --- a/src/mess/drivers/cat.c +++ b/src/mess/drivers/cat.c @@ -370,7 +370,6 @@ ToDo: #include "machine/nvram.h" #include "sound/speaker.h" #include "bus/centronics/ctronics.h" -#include "bus/centronics/image.h" class cat_state : public driver_device { @@ -1245,7 +1244,7 @@ static MACHINE_CONFIG_START( cat, cat_state ) MCFG_MC68681_B_TX_CALLBACK(WRITELINE(cat_state, cat_duart_txb)) MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(cat_state, cat_duart_output)) - MCFG_CENTRONICS_ADD("ctx", centronics_printers, "image") + MCFG_CENTRONICS_ADD("ctx", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(cat_state, prn_ack_ff)) MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("duartn68681", mc68681_device, ip4_w)) MCFG_DEVCB_XOR(1) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("ctx_data_out", "ctx") diff --git a/src/mess/drivers/coco12.c b/src/mess/drivers/coco12.c index 5dd1780d9bf..6673473c615 100644 --- a/src/mess/drivers/coco12.c +++ b/src/mess/drivers/coco12.c @@ -261,6 +261,13 @@ MACHINE_CONFIG_FRAGMENT( coco_sound ) MACHINE_CONFIG_END +static DEVICE_INPUT_DEFAULTS_START( printer ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_600 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) +DEVICE_INPUT_DEFAULTS_END //------------------------------------------------- // MACHINE_CONFIG @@ -293,11 +300,11 @@ static MACHINE_CONFIG_START( coco, coco12_state ) MCFG_SAM6883_ADD(SAM_TAG, XTAL_3_579545MHz, coco12_state::sam6883_config) MCFG_SAM6883_RES_CALLBACK(READ8(coco12_state, sam_read)) MCFG_CASSETTE_ADD("cassette", coco_state::coco_cassette_interface) - MCFG_DEVICE_ADD(BITBANGER_TAG, BITBANGER, 0) - MCFG_BITBANGER_INPUT_CB(WRITELINE(coco_state, bitbanger_callback)) /* callback */ - MCFG_BITBANGER_DEFAULT_MODE(BITBANGER_PRINTER) /* default mode */ - MCFG_BITBANGER_DEFAULT_BAUD(BITBANGER_600) /* default output baud */ - MCFG_BITBANGER_DEFAULT_TUNE(BITBANGER_0PERCENT) /* default fine tune adjustment */ + + MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "printer") + MCFG_RS232_DCD_HANDLER(DEVWRITELINE(PIA1_TAG, pia6821_device, ca1_w)) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("printer", printer) + MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_state::cartridge_config, coco_cart, "pak") // video hardware diff --git a/src/mess/drivers/coco3.c b/src/mess/drivers/coco3.c index 88ed89d2cd2..a928a0054b9 100644 --- a/src/mess/drivers/coco3.c +++ b/src/mess/drivers/coco3.c @@ -223,6 +223,14 @@ static INPUT_PORTS_START( coco3 ) PORT_INCLUDE( coco_rtc ) INPUT_PORTS_END +static DEVICE_INPUT_DEFAULTS_START( printer ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_600 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) +DEVICE_INPUT_DEFAULTS_END + //************************************************************************** // MACHINE CONFIGURATION @@ -262,11 +270,11 @@ static MACHINE_CONFIG_START( coco3, coco3_state ) MCFG_PIA_IRQB_HANDLER(WRITELINE(coco_state, pia1_firq_b)) MCFG_CASSETTE_ADD("cassette", coco_state::coco_cassette_interface) - MCFG_DEVICE_ADD(BITBANGER_TAG, BITBANGER, 0) - MCFG_BITBANGER_INPUT_CB(WRITELINE(coco_state, bitbanger_callback)) /* callback */ - MCFG_BITBANGER_DEFAULT_MODE(BITBANGER_PRINTER) /* default mode */ - MCFG_BITBANGER_DEFAULT_BAUD(BITBANGER_600) /* default output baud */ - MCFG_BITBANGER_DEFAULT_TUNE(BITBANGER_0PERCENT) /* default fine tune adjustment */ + + MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "printer") + MCFG_RS232_DCD_HANDLER(DEVWRITELINE(PIA1_TAG, pia6821_device, ca1_w)) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("printer", printer) + MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_state::cartridge_config, coco_cart, "fdcv11") MCFG_COCO_VHD_ADD(VHD0_TAG) MCFG_COCO_VHD_ADD(VHD1_TAG) diff --git a/src/mess/drivers/compis.c b/src/mess/drivers/compis.c index 1c02da02310..236da449794 100644 --- a/src/mess/drivers/compis.c +++ b/src/mess/drivers/compis.c @@ -752,7 +752,7 @@ static MACHINE_CONFIG_START( compis, compis_state ) MCFG_RS232_DCD_HANDLER(DEVWRITELINE(I8274_TAG, z80dart_device, dcdb_w)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE(I8274_TAG, z80dart_device, ctsb_w)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(compis_state, write_centronics_busy)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(compis_state, write_centronics_select)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mess/drivers/crvision.c b/src/mess/drivers/crvision.c index e6d2ca385ff..88e773d4800 100644 --- a/src/mess/drivers/crvision.c +++ b/src/mess/drivers/crvision.c @@ -886,7 +886,7 @@ static MACHINE_CONFIG_START( creativision, crvision_state ) MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8(SN76489_TAG, sn76496_base_device, write)) MCFG_CASSETTE_ADD("cassette", crvision_cassette_interface) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7)) MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0) @@ -964,7 +964,7 @@ static MACHINE_CONFIG_START( lasr2001, laser2001_state ) MCFG_CASSETTE_ADD("cassette", lasr2001_cassette_interface) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(laser2001_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mess/drivers/dectalk.c b/src/mess/drivers/dectalk.c index 6a78e8e8bc6..a96901fdcee 100644 --- a/src/mess/drivers/dectalk.c +++ b/src/mess/drivers/dectalk.c @@ -908,7 +908,7 @@ static MACHINE_CONFIG_START( dectalk, dectalk_state ) /* Y2 is a 3.579545 MHz xtal for the dtmf decoder chip */ - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duartn68681", mc68681_device, rx_b_w)) MACHINE_CONFIG_END diff --git a/src/mess/drivers/einstein.c b/src/mess/drivers/einstein.c index c7052536777..951a64fc4cf 100644 --- a/src/mess/drivers/einstein.c +++ b/src/mess/drivers/einstein.c @@ -775,7 +775,7 @@ static MACHINE_CONFIG_START( einstein, einstein_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(IC_I063, z80pio_device, strobe_a)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(einstein_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(einstein_state, write_centronics_perror)) diff --git a/src/mess/drivers/elwro800.c b/src/mess/drivers/elwro800.c index bc0b88ee755..ffd5d8e411a 100644 --- a/src/mess/drivers/elwro800.c +++ b/src/mess/drivers/elwro800.c @@ -586,7 +586,7 @@ static MACHINE_CONFIG_START( elwro800, elwro800_state ) MCFG_I8255A_ADD( "ppi8255", elwro800jr_ppi8255_interface) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(elwro800_state, write_centronics_ack)) diff --git a/src/mess/drivers/ep64.c b/src/mess/drivers/ep64.c index c71b195ff0f..5efee2561bb 100644 --- a/src/mess/drivers/ep64.c +++ b/src/mess/drivers/ep64.c @@ -539,7 +539,7 @@ static MACHINE_CONFIG_START( ep64, ep64_state ) MCFG_EP64_EXPANSION_BUS_SLOT_NMI_CALLBACK(INPUTLINE(Z80_TAG, INPUT_LINE_NMI)) MCFG_EP64_EXPANSION_BUS_SLOT_WAIT_CALLBACK(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_WAIT)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(ep64_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mess/drivers/exp85.c b/src/mess/drivers/exp85.c index bb574febb38..674edc2d784 100644 --- a/src/mess/drivers/exp85.c +++ b/src/mess/drivers/exp85.c @@ -164,12 +164,12 @@ WRITE_LINE_MEMBER( exp85_state::sod_w ) /* Terminal Interface */ static DEVICE_INPUT_DEFAULTS_START( terminal ) - DEVICE_INPUT_DEFAULTS( "TERM_TXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_RXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_STARTBITS", 0xff, 0x01 ) // 1 - DEVICE_INPUT_DEFAULTS( "TERM_DATABITS", 0xff, 0x02 ) // 7 - DEVICE_INPUT_DEFAULTS( "TERM_PARITY", 0xff, 0x02 ) // E - DEVICE_INPUT_DEFAULTS( "TERM_STOPBITS", 0xff, 0x01 ) // 1 + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END /* Machine Initialization */ @@ -217,8 +217,8 @@ static MACHINE_CONFIG_START( exp85, exp85_state ) MCFG_I8355_OUT_PA_CB(WRITE8(exp85_state, i8355_a_w)) MCFG_CASSETTE_ADD("cassette", exp85_cassette_interface) - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/fm7.c b/src/mess/drivers/fm7.c index fd694d2b626..5dc31695774 100644 --- a/src/mess/drivers/fm7.c +++ b/src/mess/drivers/fm7.c @@ -2052,7 +2052,7 @@ static MACHINE_CONFIG_START( fm7, fm7_state ) MCFG_MB8877_ADD("fdc",fm7_mb8877a_interface) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_SLOT_OPTION_ADD( "dsjoy", DEMPA_SHINBUNSHA_JOYSTICK ) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fm7_state, write_centronics_fault)) @@ -2101,7 +2101,7 @@ static MACHINE_CONFIG_START( fm8, fm7_state ) MCFG_MB8877_ADD("fdc",fm7_mb8877a_interface) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fm7_state, write_centronics_fault)) MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(fm7_state, write_centronics_ack)) @@ -2151,7 +2151,7 @@ static MACHINE_CONFIG_START( fm77av, fm7_state ) MCFG_MB8877_ADD("fdc",fm7_mb8877a_interface) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fm7_state, write_centronics_fault)) MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(fm7_state, write_centronics_ack)) @@ -2204,7 +2204,7 @@ static MACHINE_CONFIG_START( fm11, fm7_state ) MCFG_MB8877_ADD("fdc",fm7_mb8877a_interface) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fm7_state, write_centronics_fault)) MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(fm7_state, write_centronics_ack)) @@ -2251,7 +2251,7 @@ static MACHINE_CONFIG_START( fm16beta, fm7_state ) MCFG_MB8877_ADD("fdc",fm7_mb8877a_interface) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fm7_state, write_centronics_fault)) MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(fm7_state, write_centronics_ack)) diff --git a/src/mess/drivers/h89.c b/src/mess/drivers/h89.c index 656e1bcee92..f9768fd18c9 100644 --- a/src/mess/drivers/h89.c +++ b/src/mess/drivers/h89.c @@ -109,12 +109,12 @@ WRITE8_MEMBER( h89_state::port_f2_w ) } static DEVICE_INPUT_DEFAULTS_START( terminal ) - DEVICE_INPUT_DEFAULTS( "TERM_TXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_RXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_STARTBITS", 0xff, 0x01 ) // 1 - DEVICE_INPUT_DEFAULTS( "TERM_DATABITS", 0xff, 0x03 ) // 8 - DEVICE_INPUT_DEFAULTS( "TERM_PARITY", 0xff, 0x00 ) // N - DEVICE_INPUT_DEFAULTS( "TERM_STOPBITS", 0xff, 0x01 ) // 1 + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END static const ins8250_interface h89_ins8250_interface = @@ -135,9 +135,9 @@ static MACHINE_CONFIG_START( h89, h89_state ) MCFG_INS8250_ADD( "ins8250", h89_ins8250_interface, XTAL_1_8432MHz ) - MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("ins8250", ins8250_uart_device, rx_w)) - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal) MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_timer", h89_state, h89_irq_timer, attotime::from_hz(100)) MACHINE_CONFIG_END diff --git a/src/mess/drivers/horizon.c b/src/mess/drivers/horizon.c index 3d7d080dd87..3ccb0be3edd 100644 --- a/src/mess/drivers/horizon.c +++ b/src/mess/drivers/horizon.c @@ -97,12 +97,12 @@ INPUT_PORTS_END //************************************************************************** static DEVICE_INPUT_DEFAULTS_START( terminal ) - DEVICE_INPUT_DEFAULTS( "TERM_TXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_RXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_STARTBITS", 0xff, 0x01 ) // 1 - DEVICE_INPUT_DEFAULTS( "TERM_DATABITS", 0xff, 0x03 ) // 8 - DEVICE_INPUT_DEFAULTS( "TERM_PARITY", 0xff, 0x00 ) // N - DEVICE_INPUT_DEFAULTS( "TERM_STOPBITS", 0xff, 0x01 ) // 1 + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END @@ -149,10 +149,10 @@ static MACHINE_CONFIG_START( horizon, horizon_state ) MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr)) MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) - MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_L_TAG, i8251_device, write_rxd)) MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_L_TAG, i8251_device, write_dsr)) - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal) MCFG_DEVICE_ADD(I8251_R_TAG, I8251, 0) MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd)) diff --git a/src/mess/drivers/ht68k.c b/src/mess/drivers/ht68k.c index 96c4e31117c..1bdb9011bfb 100644 --- a/src/mess/drivers/ht68k.c +++ b/src/mess/drivers/ht68k.c @@ -132,7 +132,7 @@ static MACHINE_CONFIG_START( ht68k, ht68k_state ) MCFG_MC68681_B_TX_CALLBACK(WRITELINE(ht68k_state, duart_txb)) MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(ht68k_state, duart_output)) - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart68681", mc68681_device, rx_a_w)) MCFG_WD1770x_ADD("wd1770", XTAL_8MHz ) diff --git a/src/mess/drivers/indiana.c b/src/mess/drivers/indiana.c index 49baf38afb9..0bc285e4314 100644 --- a/src/mess/drivers/indiana.c +++ b/src/mess/drivers/indiana.c @@ -71,10 +71,13 @@ SLOT_INTERFACE_START( indiana_isa_cards ) SLOT_INTERFACE("ide", ISA16_IDE) SLOT_INTERFACE_END -static struct serial_keyboard_interface keyboard_interface = -{ - DEVCB_DEVICE_LINE_MEMBER(MFP_TAG, mc68901_device, write_rx) -}; +static DEVICE_INPUT_DEFAULTS_START( keyboard ) + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_1200 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) +DEVICE_INPUT_DEFAULTS_END static MACHINE_CONFIG_START( indiana, indiana_state ) /* basic machine hardware */ @@ -93,9 +96,11 @@ static MACHINE_CONFIG_START( indiana, indiana_state ) MCFG_MC68901_TIMER_CLOCK(XTAL_16MHz/4) MCFG_MC68901_RX_CLOCK(0) MCFG_MC68901_TX_CLOCK(0) - MCFG_MC68901_OUT_SO_CB(DEVWRITELINE("keyboard", serial_keyboard_device, input_txd)) + MCFG_MC68901_OUT_SO_CB(DEVWRITELINE("keyboard", rs232_port_device, write_txd)) - MCFG_SERIAL_KEYBOARD_ADD("keyboard", keyboard_interface, 1200) + MCFG_RS232_PORT_ADD("keyboard", default_rs232_devices, "keyboard") + MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MFP_TAG, mc68901_device, write_rx)) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("keyboard", keyboard) MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mess/drivers/isbc.c b/src/mess/drivers/isbc.c index 11258b5e27d..2225230783b 100644 --- a/src/mess/drivers/isbc.c +++ b/src/mess/drivers/isbc.c @@ -136,21 +136,21 @@ static INPUT_PORTS_START( isbc ) INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( isbc86_terminal ) - DEVICE_INPUT_DEFAULTS( "TERM_TXBAUD", 0xff, 0x01 ) // 300 - DEVICE_INPUT_DEFAULTS( "TERM_RXBAUD", 0xff, 0x01 ) // 300 - DEVICE_INPUT_DEFAULTS( "TERM_STARTBITS", 0xff, 0x01 ) // 1 - DEVICE_INPUT_DEFAULTS( "TERM_DATABITS", 0xff, 0x03 ) // 8 - DEVICE_INPUT_DEFAULTS( "TERM_PARITY", 0xff, 0x00 ) // N - DEVICE_INPUT_DEFAULTS( "TERM_STOPBITS", 0xff, 0x03 ) // 2 + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_300 ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_300 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) DEVICE_INPUT_DEFAULTS_END static DEVICE_INPUT_DEFAULTS_START( isbc286_terminal ) - DEVICE_INPUT_DEFAULTS( "TERM_TXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_RXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_STARTBITS", 0xff, 0x01 ) // 1 - DEVICE_INPUT_DEFAULTS( "TERM_DATABITS", 0xff, 0x02 ) // 7 - DEVICE_INPUT_DEFAULTS( "TERM_PARITY", 0xff, 0x02 ) // E - DEVICE_INPUT_DEFAULTS( "TERM_STOPBITS", 0xff, 0x01 ) // 1 + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END WRITE_LINE_MEMBER( isbc_state::isbc86_tmr2_w ) @@ -261,11 +261,11 @@ static MACHINE_CONFIG_START( isbc86, isbc_state ) MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("pic_0", pic8259_device, ir6_w)) /* video hardware */ - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_rxd)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_cts)) MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_dsr)) - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", isbc86_terminal) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", isbc86_terminal) MACHINE_CONFIG_END static MACHINE_CONFIG_START( rpc86, isbc_state ) @@ -319,7 +319,7 @@ static MACHINE_CONFIG_START( isbc286, isbc_state ) MCFG_I8255A_ADD("ppi", isbc286_ppi_interface) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(isbc_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7)) MCFG_CENTRONICS_FAULT_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit6)) @@ -335,11 +335,11 @@ static MACHINE_CONFIG_START( isbc286, isbc_state ) MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", z80dart_device, dcda_w)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", z80dart_device, ctsa_w)) - MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8274", z80dart_device, rxb_w)) MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", z80dart_device, dcdb_w)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", z80dart_device, ctsb_w)) - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", isbc286_terminal) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", isbc286_terminal) MCFG_ISBX_SLOT_ADD("sbx1", 0, isbx_cards, NULL) MCFG_ISBX_SLOT_MINTR0_CALLBACK(DEVWRITELINE("pic_1", pic8259_device, ir3_w)) diff --git a/src/mess/drivers/jtc.c b/src/mess/drivers/jtc.c index 5b589773841..72165607cfb 100644 --- a/src/mess/drivers/jtc.c +++ b/src/mess/drivers/jtc.c @@ -743,7 +743,7 @@ static MACHINE_CONFIG_START( basic, jtc_state ) MCFG_CASSETTE_ADD("cassette", jtc_cassette_interface) /* printer */ - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(jtc_state, write_centronics_busy)) MACHINE_CONFIG_END diff --git a/src/mess/drivers/kaypro.c b/src/mess/drivers/kaypro.c index aae03beb043..eaa6186e7a4 100644 --- a/src/mess/drivers/kaypro.c +++ b/src/mess/drivers/kaypro.c @@ -222,7 +222,7 @@ static MACHINE_CONFIG_START( kayproii, kaypro_state ) /* devices */ MCFG_QUICKLOAD_ADD("quickload", kaypro_state, kaypro, "com,cpm", 3) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(kaypro_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -281,7 +281,7 @@ static MACHINE_CONFIG_START( kaypro2x, kaypro_state ) MCFG_MC6845_ADD("crtc", MC6845, "screen", 2000000, kaypro2x_crtc) /* comes out of ULA - needs to be measured */ MCFG_QUICKLOAD_ADD("quickload", kaypro_state, kaypro, "com,cpm", 3) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(kaypro_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mess/drivers/kyocera.c b/src/mess/drivers/kyocera.c index cd6df8220a8..1d65c8cfe01 100644 --- a/src/mess/drivers/kyocera.c +++ b/src/mess/drivers/kyocera.c @@ -1392,7 +1392,7 @@ static MACHINE_CONFIG_START( kc85, kc85_state ) MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, NULL) MCFG_RS232_RXD_HANDLER(DEVWRITELINE(IM6402_TAG, im6402_device, write_rri)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(kc85_state, write_centronics_busy)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(kc85_state, write_centronics_select)) @@ -1438,7 +1438,7 @@ static MACHINE_CONFIG_START( pc8201, pc8201_state ) MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, NULL) MCFG_RS232_RXD_HANDLER(DEVWRITELINE(IM6402_TAG, im6402_device, write_rri)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(kc85_state, write_centronics_busy)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(kc85_state, write_centronics_select)) @@ -1496,7 +1496,7 @@ static MACHINE_CONFIG_START( trsm100, trsm100_state ) MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, NULL) MCFG_RS232_RXD_HANDLER(DEVWRITELINE(IM6402_TAG, im6402_device, write_rri)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CASSETTE_ADD("cassette", kc85_cassette_interface) // MCFG_MC14412_ADD(MC14412_TAG, XTAL_1MHz) @@ -1555,7 +1555,7 @@ static MACHINE_CONFIG_START( tandy200, tandy200_state ) MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr)) // MCFG_MC14412_ADD(MC14412_TAG, XTAL_1MHz) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(tandy200_state, write_centronics_busy)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(tandy200_state, write_centronics_select)) diff --git a/src/mess/drivers/m5.c b/src/mess/drivers/m5.c index 5c8f960c4e1..c7f3fb67a93 100644 --- a/src/mess/drivers/m5.c +++ b/src/mess/drivers/m5.c @@ -640,7 +640,7 @@ static MACHINE_CONFIG_START( m5, m5_state ) // devices MCFG_Z80CTC_ADD(Z80CTC_TAG, XTAL_14_31818MHz/4, ctc_intf) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(m5_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mess/drivers/mbee.c b/src/mess/drivers/mbee.c index 76ea6a35020..daa8cf051b9 100644 --- a/src/mess/drivers/mbee.c +++ b/src/mess/drivers/mbee.c @@ -765,7 +765,7 @@ static MACHINE_CONFIG_START( mbee, mbee_state ) MCFG_QUICKLOAD_ADD("quickload", mbee_state, mbee, "mwb,com,bee", 2) MCFG_QUICKLOAD_ADD("quickload2", mbee_state, mbee_z80bin, "bin", 2) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -811,7 +811,7 @@ static MACHINE_CONFIG_START( mbeeic, mbee_state ) MCFG_QUICKLOAD_ADD("quickload", mbee_state, mbee, "mwb,com,bee", 2) MCFG_QUICKLOAD_ADD("quickload2", mbee_state, mbee_z80bin, "bin", 2) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mess/drivers/mc1000.c b/src/mess/drivers/mc1000.c index 96f27d6ad50..78d0997e2ae 100644 --- a/src/mess/drivers/mc1000.c +++ b/src/mess/drivers/mc1000.c @@ -468,7 +468,7 @@ static MACHINE_CONFIG_START( mc1000, mc1000_state ) /* devices */ MCFG_CASSETTE_ADD("cassette", mc1000_cassette_interface) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(mc1000_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mess/drivers/mc1502.c b/src/mess/drivers/mc1502.c index 39214f7c5b8..e04c63d6f38 100644 --- a/src/mess/drivers/mc1502.c +++ b/src/mess/drivers/mc1502.c @@ -320,7 +320,7 @@ static MACHINE_CONFIG_START( mc1502, mc1502_state ) MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit6)) MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7)) MCFG_CENTRONICS_FAULT_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit4)) diff --git a/src/mess/drivers/msx.c b/src/mess/drivers/msx.c index cba950ede8b..c224dca1c7e 100644 --- a/src/mess/drivers/msx.c +++ b/src/mess/drivers/msx.c @@ -1110,7 +1110,7 @@ static MACHINE_CONFIG_START( msx, msx_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_SLOT_OPTION_ADD( "covox", CENTRONICS_COVOX ) MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit1)) @@ -1208,7 +1208,7 @@ static MACHINE_CONFIG_START( msx2, msx_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_SLOT_OPTION_ADD( "covox", CENTRONICS_COVOX ) MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit1)) @@ -1278,7 +1278,7 @@ static MACHINE_CONFIG_START( msx2p, msx_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_SLOT_OPTION_ADD( "covox", CENTRONICS_COVOX ) MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit1)) diff --git a/src/mess/drivers/mtx.c b/src/mess/drivers/mtx.c index 40d63672171..feb642f42d2 100644 --- a/src/mess/drivers/mtx.c +++ b/src/mess/drivers/mtx.c @@ -363,7 +363,7 @@ static MACHINE_CONFIG_START( mtx512, mtx_state ) MCFG_Z80CTC_ADD(Z80CTC_TAG, XTAL_4MHz, ctc_intf ) MCFG_TIMER_DRIVER_ADD_PERIODIC("z80ctc_timer", mtx_state, ctc_tick, attotime::from_hz(XTAL_4MHz/13)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(mtx_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(mtx_state, write_centronics_fault)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(mtx_state, write_centronics_perror)) diff --git a/src/mess/drivers/mz700.c b/src/mess/drivers/mz700.c index 3b62320d44b..05248c74997 100644 --- a/src/mess/drivers/mz700.c +++ b/src/mess/drivers/mz700.c @@ -404,7 +404,7 @@ static MACHINE_CONFIG_DERIVED( mz800, mz700 ) MCFG_Z80PIO_ADD("z80pio", XTAL_17_73447MHz/5, mz800_z80pio_config) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") MACHINE_CONFIG_END diff --git a/src/mess/drivers/nc.c b/src/mess/drivers/nc.c index c8c24c7043b..1457c9de8a9 100644 --- a/src/mess/drivers/nc.c +++ b/src/mess/drivers/nc.c @@ -1428,7 +1428,7 @@ static MACHINE_CONFIG_START( nc100, nc_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(nc_state, write_nc100_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(nc_state, write_centronics_busy)) diff --git a/src/mess/drivers/ob68k1a.c b/src/mess/drivers/ob68k1a.c index f34f3a0cbd6..85574a81491 100644 --- a/src/mess/drivers/ob68k1a.c +++ b/src/mess/drivers/ob68k1a.c @@ -244,7 +244,7 @@ static MACHINE_CONFIG_START( ob68k1a, ob68k1a_state ) MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) - MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MC6850_0_TAG, acia6850_device, write_rxd)) MCFG_RS232_DCD_HANDLER(DEVWRITELINE(MC6850_0_TAG, acia6850_device, write_dcd)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE(MC6850_0_TAG, acia6850_device, write_cts)) diff --git a/src/mess/drivers/oric.c b/src/mess/drivers/oric.c index b1a09433cd0..0692ea83602 100644 --- a/src/mess/drivers/oric.c +++ b/src/mess/drivers/oric.c @@ -811,7 +811,7 @@ static MACHINE_CONFIG_START( oric, oric_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("via6522", via6522_device, write_ca1)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mess/drivers/pc1512.c b/src/mess/drivers/pc1512.c index aa5250bc6c7..24456da71e9 100644 --- a/src/mess/drivers/pc1512.c +++ b/src/mess/drivers/pc1512.c @@ -1291,7 +1291,7 @@ static MACHINE_CONFIG_START( pc1512, pc1512_state ) MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":1", pc1512_floppies, NULL, pc1512_state::floppy_formats) MCFG_INS8250_ADD(INS8250_TAG, uart_intf, XTAL_1_8432MHz) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(pc1512_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(pc1512_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(pc1512_state, write_centronics_perror)) @@ -1391,7 +1391,7 @@ static MACHINE_CONFIG_START( pc1640, pc1640_state ) MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":1", pc1512_floppies, NULL, pc1512_state::floppy_formats) MCFG_INS8250_ADD(INS8250_TAG, uart_intf, XTAL_1_8432MHz) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(pc1512_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(pc1512_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(pc1512_state, write_centronics_perror)) diff --git a/src/mess/drivers/pc8001.c b/src/mess/drivers/pc8001.c index 56f1422dca5..378e87679d3 100644 --- a/src/mess/drivers/pc8001.c +++ b/src/mess/drivers/pc8001.c @@ -555,7 +555,7 @@ static MACHINE_CONFIG_START( pc8001, pc8001_state ) MCFG_UPD3301_DRAW_CHARACTER_CALLBACK_OWNER(pc8001_state, pc8001_display_pixels) MCFG_UPD3301_VRTC_CALLBACK(DEVWRITELINE(I8257_TAG, i8257_device, i8257_drq2_w)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(pc8001_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(pc8001_state, write_centronics_busy)) @@ -611,7 +611,7 @@ static MACHINE_CONFIG_START( pc8001mk2, pc8001mk2_state ) MCFG_UPD3301_DRAW_CHARACTER_CALLBACK_OWNER(pc8001_state, pc8001_display_pixels) MCFG_UPD3301_VRTC_CALLBACK(DEVWRITELINE(I8257_TAG, i8257_device, i8257_drq2_w)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mess/drivers/pc8801.c b/src/mess/drivers/pc8801.c index 813884feb60..1bcd9d3b7f9 100644 --- a/src/mess/drivers/pc8801.c +++ b/src/mess/drivers/pc8801.c @@ -2650,7 +2650,7 @@ static MACHINE_CONFIG_START( pc8801, pc8801_state ) MCFG_I8214_ADD(I8214_TAG, MASTER_CLOCK, pic_intf) #endif MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, NULL, NULL) - //MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + //MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CASSETTE_ADD("cassette", pc8801_cassette_interface) MCFG_SOFTWARE_LIST_ADD("tape_list","pc8801_cass") diff --git a/src/mess/drivers/pencil2.c b/src/mess/drivers/pencil2.c index c5f1c2c84a6..b7fc3fefc0c 100644 --- a/src/mess/drivers/pencil2.c +++ b/src/mess/drivers/pencil2.c @@ -322,7 +322,7 @@ static MACHINE_CONFIG_START( pencil2, pencil2_state ) // MCFG_CARTSLOT_INTERFACE("pencil2_cart") /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(pencil2_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(pencil2_state, write_centronics_busy)) diff --git a/src/mess/drivers/phc25.c b/src/mess/drivers/phc25.c index 734e8d2e84c..fb77b46202f 100644 --- a/src/mess/drivers/phc25.c +++ b/src/mess/drivers/phc25.c @@ -380,7 +380,7 @@ static MACHINE_CONFIG_START( phc25, phc25_state ) /* devices */ MCFG_CASSETTE_ADD("cassette", phc25_cassette_interface) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(phc25_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mess/drivers/pipbug.c b/src/mess/drivers/pipbug.c index 06e3452e406..b4ff3876ffb 100644 --- a/src/mess/drivers/pipbug.c +++ b/src/mess/drivers/pipbug.c @@ -81,12 +81,12 @@ static INPUT_PORTS_START( pipbug ) INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( terminal ) - DEVICE_INPUT_DEFAULTS( "TERM_TXBAUD", 0xff, 0x0d ) // 110 - DEVICE_INPUT_DEFAULTS( "TERM_RXBAUD", 0xff, 0x0d ) // 110 - DEVICE_INPUT_DEFAULTS( "TERM_STARTBITS", 0xff, 0x01 ) // 1 - DEVICE_INPUT_DEFAULTS( "TERM_DATABITS", 0xff, 0x02 ) // 7 - DEVICE_INPUT_DEFAULTS( "TERM_PARITY", 0xff, 0x02 ) // E - DEVICE_INPUT_DEFAULTS( "TERM_STOPBITS", 0xff, 0x01 ) // 1 + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_110 ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_110 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END QUICKLOAD_LOAD_MEMBER( pipbug_state, pipbug ) @@ -161,9 +161,9 @@ static MACHINE_CONFIG_START( pipbug, pipbug_state ) MCFG_S2650_FLAG_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd)) /* video hardware */ - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("maincpu", s2650_device, write_sense)) - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal) /* quickload */ MCFG_QUICKLOAD_ADD("quickload", pipbug_state, pipbug, "pgm", 1) diff --git a/src/mess/drivers/portfoli.c b/src/mess/drivers/portfoli.c index 6131e182ee9..852e8fdf151 100644 --- a/src/mess/drivers/portfoli.c +++ b/src/mess/drivers/portfoli.c @@ -864,7 +864,7 @@ static MACHINE_CONFIG_START( portfolio, portfolio_state ) /* devices */ MCFG_I8255A_ADD(M82C55A_TAG, ppi_intf) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit5)) MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit4)) MCFG_CENTRONICS_FAULT_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit3)) diff --git a/src/mess/drivers/prof180x.c b/src/mess/drivers/prof180x.c index 0af303f058a..bb96eb6fe7c 100644 --- a/src/mess/drivers/prof180x.c +++ b/src/mess/drivers/prof180x.c @@ -254,7 +254,7 @@ static MACHINE_CONFIG_START( prof180x, prof180x_state ) MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":3", prof180x_floppies, "35dd", floppy_image_device::default_floppy_formats) //MCFG_RTC8583_ADD(MK3835_TAG, rtc_intf) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mess/drivers/pulsar.c b/src/mess/drivers/pulsar.c index 34831f88abe..9acc5b0341c 100644 --- a/src/mess/drivers/pulsar.c +++ b/src/mess/drivers/pulsar.c @@ -186,12 +186,12 @@ static I8255_INTERFACE( ppi_intf ) }; static DEVICE_INPUT_DEFAULTS_START( terminal ) - DEVICE_INPUT_DEFAULTS( "TERM_TXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_RXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_STARTBITS", 0xff, 0x01 ) // 1 - DEVICE_INPUT_DEFAULTS( "TERM_DATABITS", 0xff, 0x02 ) // 7 - DEVICE_INPUT_DEFAULTS( "TERM_PARITY", 0xff, 0x02 ) // E - DEVICE_INPUT_DEFAULTS( "TERM_STOPBITS", 0xff, 0x01 ) // 1 + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END static Z80DART_INTERFACE( dart_intf ) @@ -262,10 +262,10 @@ static MACHINE_CONFIG_START( pulsar, pulsar_state ) MCFG_Z80DART_ADD("z80dart", XTAL_4MHz, dart_intf ) - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("z80dart", z80dart_device, rxa_w)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("z80dart", z80dart_device, ctsa_w)) - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal) MCFG_DEVICE_ADD("brg", COM8116, XTAL_5_0688MHz) MCFG_COM8116_FR_HANDLER(WRITELINE(pulsar_state, fr_w)) diff --git a/src/mess/drivers/px4.c b/src/mess/drivers/px4.c index c10316aff21..60ecfb711c5 100644 --- a/src/mess/drivers/px4.c +++ b/src/mess/drivers/px4.c @@ -1400,7 +1400,7 @@ static MACHINE_CONFIG_START( px4, px4_state ) MCFG_RAM_DEFAULT_SIZE("64k") // centronics printer - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(px4_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(px4_state, write_centronics_perror)) diff --git a/src/mess/drivers/qx10.c b/src/mess/drivers/qx10.c index f3ac3327ea2..0d0915726cb 100644 --- a/src/mess/drivers/qx10.c +++ b/src/mess/drivers/qx10.c @@ -85,7 +85,7 @@ public: required_device<upd765a_device> m_fdc; required_device<upd7220_device> m_hgdc; required_device<mc146818_device> m_rtc; - required_device<qx10_keyboard_device> m_kbd; + required_device<rs232_port_device> m_kbd; UINT8 m_vram_bank; //required_shared_ptr<UINT8> m_video_ram; UINT8 *m_video_ram; @@ -462,7 +462,7 @@ static UPD7201_INTERFACE(qx10_upd7201_interface) { 0, 0, 0, 0, // channel b clock set by pit2 channel 2 - DEVCB_DEVICE_LINE_MEMBER("kbd", serial_keyboard_device, input_txd), + DEVCB_DEVICE_LINE_MEMBER("kbd", rs232_port_device, write_txd), DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, @@ -481,11 +481,6 @@ static UPD7201_INTERFACE(qx10_upd7201_interface) DEVCB_NULL }; -static struct serial_keyboard_interface qx10_keyboard_interface = -{ - DEVCB_DEVICE_LINE_MEMBER("upd7201", z80dart_device, rxa_w) -}; - WRITE_LINE_MEMBER(qx10_state::keyboard_irq) { m_scc->m1_r(); // always set @@ -797,6 +792,10 @@ static ADDRESS_MAP_START( upd7220_map, AS_0, 8, qx10_state ) AM_RANGE(0x00000, 0x5ffff) AM_READWRITE(vram_r,vram_w) ADDRESS_MAP_END +static SLOT_INTERFACE_START(keyboard) + SLOT_INTERFACE("qx10", QX10_KEYBOARD) +SLOT_INTERFACE_END + static MACHINE_CONFIG_START( qx10, qx10_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, MAIN_CLK / 4) @@ -867,7 +866,8 @@ static MACHINE_CONFIG_START( qx10, qx10_state ) MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, NULL) MCFG_RS232_RXD_HANDLER(DEVWRITELINE("upd7201", upd7201_device, rxb_w)) - MCFG_QX10_KEYBOARD_ADD("kbd", qx10_keyboard_interface) + MCFG_RS232_PORT_ADD("kbd", keyboard, "qx10") + MCFG_RS232_RXD_HANDLER(DEVWRITELINE("upd7201", z80dart_device, rxa_w)) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/rmnimbus.c b/src/mess/drivers/rmnimbus.c index 6f5c812d839..6fba0afbf90 100644 --- a/src/mess/drivers/rmnimbus.c +++ b/src/mess/drivers/rmnimbus.c @@ -331,7 +331,7 @@ static MACHINE_CONFIG_START( nimbus, rmnimbus_state ) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, write_strobe)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(rmnimbus_state,nimbus_via_irq_w)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(rmnimbus_state, nimbus_ack_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mess/drivers/sage2.c b/src/mess/drivers/sage2.c index 38bbdbb4994..0e21d5b9c7b 100644 --- a/src/mess/drivers/sage2.c +++ b/src/mess/drivers/sage2.c @@ -417,12 +417,12 @@ WRITE_LINE_MEMBER( sage2_state::fdc_irq ) static DEVICE_INPUT_DEFAULTS_START( terminal ) - DEVICE_INPUT_DEFAULTS( "TERM_TXBAUD", 0xff, 0x08 ) // 19200 - DEVICE_INPUT_DEFAULTS( "TERM_RXBAUD", 0xff, 0x08 ) // 19200 - DEVICE_INPUT_DEFAULTS( "TERM_STARTBITS", 0xff, 0x01 ) // 1 - DEVICE_INPUT_DEFAULTS( "TERM_DATABITS", 0xff, 0x02 ) // 7 - DEVICE_INPUT_DEFAULTS( "TERM_PARITY", 0xff, 0x02 ) // E - DEVICE_INPUT_DEFAULTS( "TERM_STOPBITS", 0xff, 0x01 ) // 1 + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_19200 ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_19200 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END @@ -490,10 +490,10 @@ static MACHINE_CONFIG_START( sage2, sage2_state ) MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE(M68000_TAG, m68000_base_device, write_irq5)) MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE(I8259_TAG, pic8259_device, ir2_w)) - MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_0_TAG, i8251_device, write_rxd)) MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_0_TAG, i8251_device, write_dsr)) - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal) MCFG_DEVICE_ADD(I8251_1_TAG, I8251, 0) MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd)) @@ -509,7 +509,7 @@ static MACHINE_CONFIG_START( sage2, sage2_state ) MCFG_UPD765A_ADD(UPD765_TAG, false, false) MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(sage2_state, fdc_irq)) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(sage2_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(sage2_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(sage2_state, write_centronics_perror)) diff --git a/src/mess/drivers/samcoupe.c b/src/mess/drivers/samcoupe.c index 5b2bf820979..0e45a08ceaa 100644 --- a/src/mess/drivers/samcoupe.c +++ b/src/mess/drivers/samcoupe.c @@ -552,12 +552,12 @@ static MACHINE_CONFIG_START( samcoupe, samcoupe_state ) MCFG_PALETTE_INIT_OWNER(samcoupe_state, samcoupe) /* devices */ - MCFG_CENTRONICS_ADD("lpt1", centronics_printers, "image") + MCFG_CENTRONICS_ADD("lpt1", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(samcoupe_state, write_lpt1_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("lpt1_data_out", "lpt1") - MCFG_CENTRONICS_ADD("lpt2", centronics_printers, "image") + MCFG_CENTRONICS_ADD("lpt2", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(samcoupe_state, write_lpt2_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("lpt2_data_out", "lpt2") diff --git a/src/mess/drivers/sdk86.c b/src/mess/drivers/sdk86.c index af26134794e..f993fb8157a 100644 --- a/src/mess/drivers/sdk86.c +++ b/src/mess/drivers/sdk86.c @@ -138,12 +138,12 @@ WRITE_LINE_MEMBER( sdk86_state::write_usart_clock ) } static DEVICE_INPUT_DEFAULTS_START( terminal ) - DEVICE_INPUT_DEFAULTS( "TERM_TXBAUD", 0xff, 0x05 ) // 4800 - DEVICE_INPUT_DEFAULTS( "TERM_RXBAUD", 0xff, 0x05 ) // 4800 - DEVICE_INPUT_DEFAULTS( "TERM_STARTBITS", 0xff, 0x01 ) // 1 - DEVICE_INPUT_DEFAULTS( "TERM_DATABITS", 0xff, 0x03 ) // 8 - DEVICE_INPUT_DEFAULTS( "TERM_PARITY", 0xff, 0x00 ) // N - DEVICE_INPUT_DEFAULTS( "TERM_STOPBITS", 0xff, 0x03 ) // 2 + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_4800 ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_4800 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) DEVICE_INPUT_DEFAULTS_END static MACHINE_CONFIG_START( sdk86, sdk86_state ) @@ -161,10 +161,10 @@ static MACHINE_CONFIG_START( sdk86, sdk86_state ) MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr)) MCFG_I8251_RTS_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_cts)) - MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxd)) MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr)) - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal) MCFG_DEVICE_ADD("usart_clock", CLOCK, 307200) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(sdk86_state, write_usart_clock)) diff --git a/src/mess/drivers/sg1000.c b/src/mess/drivers/sg1000.c index fb139a2986a..9a821d1d754 100644 --- a/src/mess/drivers/sg1000.c +++ b/src/mess/drivers/sg1000.c @@ -879,7 +879,7 @@ static MACHINE_CONFIG_START( sf7000, sf7000_state ) MCFG_UPD765A_ADD(UPD765_TAG, false, false) MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", sf7000_floppies, "3ssdd", sf7000_state::floppy_formats) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mess/drivers/sgi_ip2.c b/src/mess/drivers/sgi_ip2.c index 24cdc3ea419..9f2faab7c8c 100644 --- a/src/mess/drivers/sgi_ip2.c +++ b/src/mess/drivers/sgi_ip2.c @@ -37,11 +37,11 @@ ****************************************************************************/ #include "emu.h" +#include "bus/rs232/rs232.h" #include "sound/dac.h" #include "cpu/m68000/m68000.h" #include "machine/mc146818.h" /* TOD clock */ #include "machine/mc68681.h" /* DUART0, DUART1 */ -#include "bus/rs232/rs232.h" #include "machine/terminal.h" #define TERMINAL_TAG "terminal" @@ -409,12 +409,12 @@ WRITE_LINE_MEMBER(sgi_ip2_state::duartb_irq_handler) }; static DEVICE_INPUT_DEFAULTS_START( ip2_terminal ) - DEVICE_INPUT_DEFAULTS( "TERM_TXBAUD", 0xff, 0x08 ) // 19200 - DEVICE_INPUT_DEFAULTS( "TERM_RXBAUD", 0xff, 0x08 ) // 19200 - DEVICE_INPUT_DEFAULTS( "TERM_STARTBITS", 0xff, 0x01 ) // 1 - DEVICE_INPUT_DEFAULTS( "TERM_DATABITS", 0xff, 0x03 ) // 8 - DEVICE_INPUT_DEFAULTS( "TERM_PARITY", 0xff, 0x00 ) // N - DEVICE_INPUT_DEFAULTS( "TERM_STOPBITS", 0xff, 0x01 ) // 1 + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_19200 ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_19200 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END static MACHINE_CONFIG_START( sgi_ip2, sgi_ip2_state ) @@ -431,9 +431,9 @@ static MACHINE_CONFIG_START( sgi_ip2, sgi_ip2_state ) MCFG_MC146818_ADD( "rtc", XTAL_4_194304Mhz ) - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart68681a", mc68681_device, rx_b_w)) - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", ip2_terminal) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", ip2_terminal) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mess/drivers/softbox.c b/src/mess/drivers/softbox.c index 31dcb6375ac..ff4640f1c6d 100644 --- a/src/mess/drivers/softbox.c +++ b/src/mess/drivers/softbox.c @@ -319,12 +319,12 @@ static I8255A_INTERFACE( ppi1_intf ) static DEVICE_INPUT_DEFAULTS_START( terminal ) - DEVICE_INPUT_DEFAULTS( "TERM_TXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_RXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_STARTBITS", 0xff, 0x01 ) // 1 - DEVICE_INPUT_DEFAULTS( "TERM_DATABITS", 0xff, 0x02 ) // 7 - DEVICE_INPUT_DEFAULTS( "TERM_PARITY", 0xff, 0x02 ) // E - DEVICE_INPUT_DEFAULTS( "TERM_STOPBITS", 0xff, 0x01 ) // 1 + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END @@ -400,10 +400,10 @@ static MACHINE_CONFIG_START( softbox, softbox_state ) MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr)) MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts)) - MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxd)) MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr)) - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal) MCFG_I8255A_ADD(I8255_0_TAG, ppi0_intf) MCFG_I8255A_ADD(I8255_1_TAG, ppi1_intf) diff --git a/src/mess/drivers/super6.c b/src/mess/drivers/super6.c index 0d9c2320d0b..935b84d08db 100644 --- a/src/mess/drivers/super6.c +++ b/src/mess/drivers/super6.c @@ -498,12 +498,12 @@ static const z80_daisy_config super6_daisy_chain[] = static DEVICE_INPUT_DEFAULTS_START( terminal ) - DEVICE_INPUT_DEFAULTS( "TERM_TXBAUD", 0xff, 0x08 ) // 19200 - DEVICE_INPUT_DEFAULTS( "TERM_RXBAUD", 0xff, 0x08 ) // 19200 - DEVICE_INPUT_DEFAULTS( "TERM_STARTBITS", 0xff, 0x01 ) // 1 - DEVICE_INPUT_DEFAULTS( "TERM_DATABITS", 0xff, 0x03 ) // 8 - DEVICE_INPUT_DEFAULTS( "TERM_PARITY", 0xff, 0x00 ) // N - DEVICE_INPUT_DEFAULTS( "TERM_STOPBITS", 0xff, 0x01 ) // 1 + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_19200 ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_19200 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END @@ -568,9 +568,9 @@ static MACHINE_CONFIG_START( super6, super6_state ) MCFG_Z80DART_ADD(Z80DART_TAG, XTAL_24MHz/4, dart_intf) - MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxa_w)) - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal) MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, NULL) MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxb_w)) diff --git a/src/mess/drivers/super80.c b/src/mess/drivers/super80.c index 9239649b3a6..b0631e8bf62 100644 --- a/src/mess/drivers/super80.c +++ b/src/mess/drivers/super80.c @@ -664,7 +664,7 @@ static MACHINE_CONFIG_START( super80, super80_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -740,7 +740,7 @@ static MACHINE_CONFIG_START( super80v, super80_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mess/drivers/superslave.c b/src/mess/drivers/superslave.c index 68853d585f9..3af36db8f92 100644 --- a/src/mess/drivers/superslave.c +++ b/src/mess/drivers/superslave.c @@ -341,12 +341,12 @@ static Z80PIO_INTERFACE( pio_intf ) static DEVICE_INPUT_DEFAULTS_START( terminal ) - DEVICE_INPUT_DEFAULTS( "TERM_TXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_RXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_STARTBITS", 0xff, 0x01 ) // 1 - DEVICE_INPUT_DEFAULTS( "TERM_DATABITS", 0xff, 0x03 ) // 8 - DEVICE_INPUT_DEFAULTS( "TERM_PARITY", 0xff, 0x00 ) // N - DEVICE_INPUT_DEFAULTS( "TERM_STOPBITS", 0xff, 0x01 ) // 1 + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END @@ -409,11 +409,11 @@ static MACHINE_CONFIG_START( superslave, superslave_state ) MCFG_Z80DART_ADD(Z80DART_0_TAG, XTAL_8MHz/2, dart0_intf) - MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, rxa_w)) MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, dcda_w)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, ctsa_w)) - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal) MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, NULL) MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, rxb_w)) diff --git a/src/mess/drivers/svi318.c b/src/mess/drivers/svi318.c index 1cb6e61b277..501f87495b4 100644 --- a/src/mess/drivers/svi318.c +++ b/src/mess/drivers/svi318.c @@ -336,7 +336,7 @@ static MACHINE_CONFIG_START( svi318, svi318_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(svi318_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -469,7 +469,7 @@ static MACHINE_CONFIG_START( svi328_806, svi318_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(svi318_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mess/drivers/swtpc09.c b/src/mess/drivers/swtpc09.c index 7737b479308..e5820033d48 100644 --- a/src/mess/drivers/swtpc09.c +++ b/src/mess/drivers/swtpc09.c @@ -151,7 +151,7 @@ static MACHINE_CONFIG_START( swtpc09, swtpc09_state ) MCFG_CPU_PROGRAM_MAP(swtpc09_mem) /* video hardware */ - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts)) @@ -183,7 +183,7 @@ static MACHINE_CONFIG_START( swtpc09i, swtpc09_state ) MCFG_CPU_PROGRAM_MAP(swtpc09_mem) /* video hardware */ - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts)) @@ -225,7 +225,7 @@ static MACHINE_CONFIG_START( swtpc09d3, swtpc09_state ) MCFG_CPU_PROGRAM_MAP(swtpc09_mem) /* video hardware */ - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts)) diff --git a/src/mess/drivers/tandy2k.c b/src/mess/drivers/tandy2k.c index 8b779140efe..84ad7b5c5ec 100644 --- a/src/mess/drivers/tandy2k.c +++ b/src/mess/drivers/tandy2k.c @@ -840,7 +840,7 @@ static MACHINE_CONFIG_START( tandy2k, tandy2k_state ) MCFG_FLOPPY_DRIVE_ADD(I8272A_TAG ":0", tandy2k_floppies, "525qd", tandy2k_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(I8272A_TAG ":1", tandy2k_floppies, "525qd", tandy2k_state::floppy_formats) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(tandy2k_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(tandy2k_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(tandy2k_state, write_centronics_perror)) diff --git a/src/mess/drivers/tavernie.c b/src/mess/drivers/tavernie.c index 8b525779a6f..6dd97bb79e3 100644 --- a/src/mess/drivers/tavernie.c +++ b/src/mess/drivers/tavernie.c @@ -350,7 +350,7 @@ static MACHINE_CONFIG_START( cpu09, tavernie_state ) MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd)) MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts)) - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts)) diff --git a/src/mess/drivers/thomson.c b/src/mess/drivers/thomson.c index cfba620d8de..4e8ad9251ac 100644 --- a/src/mess/drivers/thomson.c +++ b/src/mess/drivers/thomson.c @@ -1496,7 +1496,7 @@ static MACHINE_CONFIG_DERIVED( to9, to7 ) MCFG_DEVICE_MODIFY("mc6846") MCFG_MC6846_OUT_PORT_CB(WRITE8(thomson_state, to9_timer_port_out)) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(thomson_state, write_centronics_busy)) /* internal ram */ @@ -1715,7 +1715,7 @@ static MACHINE_CONFIG_DERIVED( to8, to7 ) MCFG_PIA_CB2_HANDLER(NULL) MCFG_PIA_IRQA_HANDLER(NULL) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(thomson_state, write_centronics_busy)) MCFG_DEVICE_MODIFY("mc6846") @@ -1871,7 +1871,7 @@ static MACHINE_CONFIG_DERIVED( to9p, to7 ) MCFG_PIA_IRQA_HANDLER(NULL) MCFG_PIA_IRQB_HANDLER(WRITELINE(thomson_state, thom_firq_1)) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(thomson_state, write_centronics_busy)) MCFG_DEVICE_MODIFY("mc6846") @@ -2220,7 +2220,7 @@ static MACHINE_CONFIG_DERIVED( mo6, to7 ) MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, mo6_game_porta_out)) MCFG_PIA_CB2_HANDLER(WRITELINE(thomson_state, mo6_game_cb2_out)) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(thomson_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -2459,7 +2459,7 @@ static MACHINE_CONFIG_DERIVED( mo5nr, to7 ) MCFG_DEVICE_MODIFY(THOM_PIA_GAME) MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, mo6_game_porta_out)) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(thomson_state, write_centronics_busy)) diff --git a/src/mess/drivers/tiki100.c b/src/mess/drivers/tiki100.c index 09ebfa24a90..e13bb952858 100644 --- a/src/mess/drivers/tiki100.c +++ b/src/mess/drivers/tiki100.c @@ -731,7 +731,7 @@ static MACHINE_CONFIG_START( tiki100, tiki100_state ) MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, NULL) MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxb_w)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(tiki100_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(tiki100_state, write_centronics_busy)) diff --git a/src/mess/drivers/tmc600.c b/src/mess/drivers/tmc600.c index 23eb76e59ca..65903982034 100644 --- a/src/mess/drivers/tmc600.c +++ b/src/mess/drivers/tmc600.c @@ -276,7 +276,7 @@ static MACHINE_CONFIG_START( tmc600, tmc600_state ) MCFG_FRAGMENT_ADD(tmc600_video) /* devices */ - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mess/drivers/trs80.c b/src/mess/drivers/trs80.c index 2bf14cfd6e3..aee78ec01c3 100644 --- a/src/mess/drivers/trs80.c +++ b/src/mess/drivers/trs80.c @@ -610,7 +610,7 @@ static MACHINE_CONFIG_DERIVED( model1, trs80 ) // model I, level II MCFG_FD1793_ADD("wd179x", trs80_wd17xx_interface ) // should be FD1771 or FD1791 but inverted data lines are too tricky to fix now MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(trs80_floppy_interface) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7)) MCFG_CENTRONICS_PERROR_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit6)) MCFG_CENTRONICS_SELECT_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit5)) diff --git a/src/mess/drivers/trs80m2.c b/src/mess/drivers/trs80m2.c index ec1eea77028..544f91878ae 100644 --- a/src/mess/drivers/trs80m2.c +++ b/src/mess/drivers/trs80m2.c @@ -827,7 +827,7 @@ static MACHINE_CONFIG_START( trs80m2, trs80m2_state ) MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_8MHz/2, pio_intf) MCFG_Z80SIO0_ADD(Z80SIO_TAG, XTAL_8MHz/2, sio_intf) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(Z80PIO_TAG, z80pio_device, strobe_b)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(trs80m2_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(trs80m2_state, write_centronics_fault)) @@ -892,7 +892,7 @@ static MACHINE_CONFIG_START( trs80m16, trs80m16_state ) MCFG_Z80SIO0_ADD(Z80SIO_TAG, XTAL_8MHz/2, sio_intf) MCFG_PIC8259_ADD(AM9519A_TAG, INPUTLINE(M68000_TAG, M68K_IRQ_5), VCC, NULL ) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(Z80PIO_TAG, z80pio_device, strobe_b)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(trs80m2_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(trs80m2_state, write_centronics_fault)) diff --git a/src/mess/drivers/tutor.c b/src/mess/drivers/tutor.c index 15b016c89fc..8e533f304ec 100644 --- a/src/mess/drivers/tutor.c +++ b/src/mess/drivers/tutor.c @@ -774,7 +774,7 @@ static MACHINE_CONFIG_START( tutor, tutor_state ) MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette") MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(tutor_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mess/drivers/tvc.c b/src/mess/drivers/tvc.c index 1e069f30cdb..47230c3bb87 100644 --- a/src/mess/drivers/tvc.c +++ b/src/mess/drivers/tvc.c @@ -692,7 +692,7 @@ static MACHINE_CONFIG_START( tvc, tvc_state ) MCFG_TVC_SOUND_SNDINT_CALLBACK(WRITELINE(tvc_state, tvc_int_ff_set)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(tvc_state, tvc_centronics_ack)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mess/drivers/v1050.c b/src/mess/drivers/v1050.c index 432a65c2193..79d839844a1 100644 --- a/src/mess/drivers/v1050.c +++ b/src/mess/drivers/v1050.c @@ -1154,7 +1154,7 @@ static MACHINE_CONFIG_START( v1050, v1050_state ) MCFG_SOFTWARE_LIST_ADD("hdd_list", "v1050_hdd") // printer - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(v1050_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(v1050_state, write_centronics_perror)) diff --git a/src/mess/drivers/votrtnt.c b/src/mess/drivers/votrtnt.c index 0c58ed43111..6d289338cd9 100644 --- a/src/mess/drivers/votrtnt.c +++ b/src/mess/drivers/votrtnt.c @@ -115,7 +115,7 @@ static MACHINE_CONFIG_START( votrtnt, votrtnt_state ) MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd)) MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts)) - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts)) diff --git a/src/mess/drivers/vtech1.c b/src/mess/drivers/vtech1.c index b91a5fa528e..3d11484fcb0 100644 --- a/src/mess/drivers/vtech1.c +++ b/src/mess/drivers/vtech1.c @@ -974,7 +974,7 @@ static MACHINE_CONFIG_START( laser110, vtech1_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(vtech1_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mess/drivers/wangpc.c b/src/mess/drivers/wangpc.c index f228c55f066..66ff6d034c2 100644 --- a/src/mess/drivers/wangpc.c +++ b/src/mess/drivers/wangpc.c @@ -1147,7 +1147,7 @@ static MACHINE_CONFIG_START( wangpc, wangpc_state ) MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", wangpc_floppies, "525dd", wangpc_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", wangpc_floppies, "525dd", wangpc_state::floppy_formats) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(wangpc_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(wangpc_state, write_centronics_busy)) diff --git a/src/mess/drivers/x68k.c b/src/mess/drivers/x68k.c index 4c3f6654454..033fb6cfb68 100644 --- a/src/mess/drivers/x68k.c +++ b/src/mess/drivers/x68k.c @@ -1337,11 +1337,6 @@ WRITE_LINE_MEMBER( x68k_state::mfp_tbo_w ) m_mfpdev->clock_w(state); } -static struct serial_keyboard_interface x68k_keyboard_interface = -{ - DEVCB_DEVICE_LINE_MEMBER(MC68901_TAG, mc68901_device, write_rx) -}; - static I8255A_INTERFACE( ppi_interface ) { DEVCB_DRIVER_MEMBER(x68k_state,ppi_port_a_r), @@ -1795,6 +1790,10 @@ static SLOT_INTERFACE_START( x68k_floppies ) SLOT_INTERFACE( "525hd", FLOPPY_525_HD ) SLOT_INTERFACE_END +static SLOT_INTERFACE_START(keyboard) + SLOT_INTERFACE("x68k", X68K_KEYBOARD) +SLOT_INTERFACE_END + static MACHINE_CONFIG_FRAGMENT( x68000_base ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */ @@ -1811,9 +1810,10 @@ static MACHINE_CONFIG_FRAGMENT( x68000_base ) MCFG_MC68901_TX_CLOCK(0) MCFG_MC68901_OUT_IRQ_CB(WRITELINE(x68k_state, mfp_irq_callback)) MCFG_MC68901_OUT_TBO_CB(WRITELINE(x68k_state, mfp_tbo_w)) - MCFG_MC68901_OUT_SO_CB(DEVWRITELINE("keyboard", serial_keyboard_device, input_txd)) + MCFG_MC68901_OUT_SO_CB(DEVWRITELINE("keyboard", rs232_port_device, write_txd)) - MCFG_X68K_KEYBOARD_ADD("keyboard", x68k_keyboard_interface) + MCFG_RS232_PORT_ADD("keyboard", keyboard, "x68k") + MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, write_rx)) MCFG_I8255A_ADD( "ppi8255", ppi_interface ) diff --git a/src/mess/drivers/xor100.c b/src/mess/drivers/xor100.c index 40f6fb7d70e..f21246eaecc 100644 --- a/src/mess/drivers/xor100.c +++ b/src/mess/drivers/xor100.c @@ -474,12 +474,12 @@ void xor100_state::fdc_drq_w(bool state) static DEVICE_INPUT_DEFAULTS_START( terminal ) - DEVICE_INPUT_DEFAULTS( "TERM_TXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_RXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_STARTBITS", 0xff, 0x01 ) // 1 - DEVICE_INPUT_DEFAULTS( "TERM_DATABITS", 0xff, 0x03 ) // 8 - DEVICE_INPUT_DEFAULTS( "TERM_PARITY", 0xff, 0x00 ) // N - DEVICE_INPUT_DEFAULTS( "TERM_STOPBITS", 0xff, 0x01 ) // 1 + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END static SLOT_INTERFACE_START( xor100_s100_cards ) @@ -539,10 +539,10 @@ static MACHINE_CONFIG_START( xor100, xor100_state ) MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr)) MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts)) - MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_B_TAG, i8251_device, write_rxd)) MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_B_TAG, i8251_device, write_dsr)) - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal) MCFG_DEVICE_ADD(COM5016_TAG, COM8116, XTAL_5_0688MHz) MCFG_COM8116_FR_HANDLER(WRITELINE(xor100_state, com5016_fr_w)) @@ -556,7 +556,7 @@ static MACHINE_CONFIG_START( xor100, xor100_state ) MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":2", xor100_floppies, NULL, floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":3", xor100_floppies, NULL, floppy_image_device::default_floppy_formats) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "image") + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(I8255A_TAG, i8255_device, pc4_w)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(xor100_state, write_centronics_busy)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(xor100_state, write_centronics_select)) diff --git a/src/mess/includes/coco.h b/src/mess/includes/coco.h index 92e622a9dec..065c628c3e5 100644 --- a/src/mess/includes/coco.h +++ b/src/mess/includes/coco.h @@ -14,7 +14,7 @@ #include "emu.h" #include "imagedev/cassette.h" -#include "imagedev/bitbngr.h" +#include "bus/rs232/rs232.h" #include "machine/6821pia.h" #include "bus/coco/cococart.h" #include "machine/coco_vhd.h" @@ -47,7 +47,7 @@ SLOT_INTERFACE_EXTERN( coco_cart ); #define SCREEN_TAG "screen" #define DAC_TAG "dac" #define CARTRIDGE_TAG "ext" -#define BITBANGER_TAG "bitbanger" +#define RS232_TAG "rs232" #define VHD0_TAG "vhd0" #define VHD1_TAG "vhd1" @@ -92,7 +92,7 @@ public: required_device<cococart_slot_device> m_cococart; required_device<ram_device> m_ram; required_device<cassette_image_device> m_cassette; - optional_device<bitbanger_device> m_bitbanger; + optional_device<rs232_port_device> m_rs232; optional_device<coco_vhd_image_device> m_vhd_0; optional_device<coco_vhd_image_device> m_vhd_1; @@ -102,7 +102,6 @@ public: // driver update handlers DECLARE_INPUT_CHANGED_MEMBER(keyboard_changed); DECLARE_INPUT_CHANGED_MEMBER(joystick_mode_changed); - static void bitbanger_callback(running_machine &machine, UINT8 bit); // IO virtual DECLARE_READ8_MEMBER( ff00_read ); @@ -135,9 +134,6 @@ public: // floating bus DECLARE_READ8_MEMBER( floating_bus_read ) { return floating_bus_read(); } - // bitbanger - DECLARE_WRITE_LINE_MEMBER( bitbanger_callback ); - protected: // device-level overrides virtual void device_start(); @@ -153,7 +149,6 @@ protected: // changed handlers virtual void pia1_pa_changed(void); virtual void pia1_pb_changed(void); - virtual void bitbanger_changed(bool newvalue); // miscellaneous virtual void update_keyboard_input(UINT8 value, UINT8 z); diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c index e062f65b65c..d2b830c0b2b 100644 --- a/src/mess/machine/apollo.c +++ b/src/mess/machine/apollo.c @@ -846,12 +846,12 @@ MACHINE_CONFIG_FRAGMENT( apollo ) MACHINE_CONFIG_END static DEVICE_INPUT_DEFAULTS_START( apollo_terminal ) - DEVICE_INPUT_DEFAULTS( "TERM_TXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_RXBAUD", 0xff, 0x06 ) // 9600 - DEVICE_INPUT_DEFAULTS( "TERM_STARTBITS", 0xff, 0x01 ) // 1 - DEVICE_INPUT_DEFAULTS( "TERM_DATABITS", 0xff, 0x03 ) // 8 - DEVICE_INPUT_DEFAULTS( "TERM_PARITY", 0xff, 0x00 ) // N - DEVICE_INPUT_DEFAULTS( "TERM_STOPBITS", 0xff, 0x01 ) // 1 + DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) + DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) + DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) + DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) + DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END // for headless machines using a serial console @@ -863,9 +863,9 @@ MACHINE_CONFIG_FRAGMENT( apollo_terminal ) MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(apollo_state, sio_output)) MCFG_MC68681_B_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd)) - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_b_w)) - MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", apollo_terminal) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", apollo_terminal) MACHINE_CONFIG_END DRIVER_INIT_MEMBER(apollo_state,apollo) diff --git a/src/mess/machine/coco.c b/src/mess/machine/coco.c index efd32826169..a20827733ff 100644 --- a/src/mess/machine/coco.c +++ b/src/mess/machine/coco.c @@ -88,7 +88,7 @@ coco_state::coco_state(const machine_config &mconfig, device_type type, const ch m_cococart(*this, CARTRIDGE_TAG), m_ram(*this, RAM_TAG), m_cassette(*this, "cassette"), - m_bitbanger(*this, BITBANGER_TAG), + m_rs232(*this, RS232_TAG), m_vhd_0(*this, VHD0_TAG), m_vhd_1(*this, VHD1_TAG) { @@ -479,7 +479,7 @@ READ8_MEMBER( coco_state::pia1_pb_r ) || (ram_size >= 0x8000 && (m_pia_0->b_output() & 0x80)); // serial in (PB0) - bool serial_in = (m_bitbanger != NULL) && (m_bitbanger->input() ? true : false); + bool serial_in = (m_rs232 != NULL) && (m_rs232->rxd_r() ? true : false); // composite the results return (memory_sense ? 0x04 : 0x00) @@ -963,9 +963,9 @@ void coco_state::update_prinout(bool prinout) else { /* output bitbanger if present (only on CoCos) */ - if (m_bitbanger != NULL) + if (m_rs232 != NULL) { - m_bitbanger->output(prinout ? 1 : 0); + m_rs232->write_txd(prinout ? 1 : 0); } } } @@ -1020,26 +1020,6 @@ INPUT_CHANGED_MEMBER(coco_state::joystick_mode_changed) //------------------------------------------------- -// bitbanger_changed -//------------------------------------------------- - -void coco_state::bitbanger_changed(bool newvalue) -{ - // do nothing -} - - - -//------------------------------------------------- -// bitbanger_callback -//------------------------------------------------- - -WRITE_LINE_MEMBER( coco_state::bitbanger_callback ) -{ - bitbanger_changed(state ? true : false); -} - -//------------------------------------------------- // poll_hires_joystick //------------------------------------------------- diff --git a/src/mess/machine/qx10kbd.c b/src/mess/machine/qx10kbd.c index 13a5a702468..3087a7835c1 100644 --- a/src/mess/machine/qx10kbd.c +++ b/src/mess/machine/qx10kbd.c @@ -257,11 +257,25 @@ static INPUT_PORTS_START( qx10_keyboard ) PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("CLS/LINE") PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_UNUSED) - PORT_START("TERM_FRAME") - PORT_CONFNAME(0x0f, 0x03, "Baud") PORT_CHANGED_MEMBER(DEVICE_SELF, serial_keyboard_device, update_frame, 0) - PORT_CONFSETTING( 0x03, "1200") - PORT_CONFNAME(0x30, 0x30, "Format") PORT_CHANGED_MEMBER(DEVICE_SELF, serial_keyboard_device, update_frame, 0) - PORT_CONFSETTING( 0x30, "8E1") + PORT_START("RS232_TXBAUD") + PORT_CONFNAME(0xff, RS232_BAUD_1200, "TX Baud") PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, serial_keyboard_device, update_serial) + PORT_CONFSETTING( RS232_BAUD_1200, "1200") + + PORT_START("RS232_STARTBITS") + PORT_CONFNAME(0xff, RS232_STARTBITS_1, "Start Bits") PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, serial_keyboard_device, update_serial) + PORT_CONFSETTING( RS232_STARTBITS_1, "1") + + PORT_START("RS232_DATABITS") + PORT_CONFNAME(0xff, RS232_DATABITS_8, "Data Bits") PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, serial_keyboard_device, update_serial) + PORT_CONFSETTING( RS232_DATABITS_8, "8") + + PORT_START("RS232_PARITY") + PORT_CONFNAME(0xff, RS232_PARITY_EVEN, "Parity") PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, serial_keyboard_device, update_serial) + PORT_CONFSETTING( RS232_PARITY_EVEN, "Even") + + PORT_START("RS232_STOPBITS") + PORT_CONFNAME(0xff, RS232_STOPBITS_1, "Stop Bits") PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, serial_keyboard_device, update_serial) + PORT_CONFSETTING( RS232_STOPBITS_1, "1") INPUT_PORTS_END ioport_constructor qx10_keyboard_device::device_input_ports() const diff --git a/src/mess/machine/qx10kbd.h b/src/mess/machine/qx10kbd.h index 07e83a397da..b548e6d2c53 100644 --- a/src/mess/machine/qx10kbd.h +++ b/src/mess/machine/qx10kbd.h @@ -1,13 +1,8 @@ #ifndef QX10KBD_H_ #define QX10KBD_H_ -#include "emu.h" #include "bus/rs232/keyboard.h" -#define MCFG_QX10_KEYBOARD_ADD(_tag, _intrf) \ - MCFG_DEVICE_ADD(_tag, QX10_KEYBOARD, 1200) \ - MCFG_DEVICE_CONFIG(_intrf) - class qx10_keyboard_device : public serial_keyboard_device { public: diff --git a/src/mess/machine/thomson.c b/src/mess/machine/thomson.c index 118d8d19f1b..e2896a81e03 100644 --- a/src/mess/machine/thomson.c +++ b/src/mess/machine/thomson.c @@ -638,7 +638,7 @@ static MACHINE_CONFIG_FRAGMENT( to7_io_line ) MCFG_RS232_CTS_HANDLER(WRITELINE(to7_io_line_device, write_cts)) MCFG_RS232_DSR_HANDLER(WRITELINE(to7_io_line_device, write_dsr)) - MCFG_CENTRONICS_ADD("centronics", centronics_printers, "image") + MCFG_CENTRONICS_ADD("centronics", centronics_printers, "printer") MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(THOM_PIA_IO, pia6821_device, cb1_w)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(to7_io_line_device, write_centronics_busy)) diff --git a/src/mess/machine/x68k_kbd.c b/src/mess/machine/x68k_kbd.c index 6888867c092..775955743e7 100644 --- a/src/mess/machine/x68k_kbd.c +++ b/src/mess/machine/x68k_kbd.c @@ -304,11 +304,25 @@ static INPUT_PORTS_START( x68k_keyboard ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Opt. 1") PORT_CODE(KEYCODE_PRTSCR) /* Opt1 */ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Opt. 2") PORT_CODE(KEYCODE_PAUSE) /* Opt2 */ - PORT_START("TERM_FRAME") - PORT_CONFNAME(0x0f, 0x0a, "Baud") PORT_CHANGED_MEMBER(DEVICE_SELF, serial_keyboard_device, update_frame, 0) - PORT_CONFSETTING( 0x0a, "38400") // TODO: Should be 2400 but MC68901 doesn't support divide by 16 - PORT_CONFNAME(0x30, 0x00, "Format") PORT_CHANGED_MEMBER(DEVICE_SELF, serial_keyboard_device, update_frame, 0) - PORT_CONFSETTING( 0x00, "8N1") + PORT_START("RS232_TXBAUD") + PORT_CONFNAME(0xff, RS232_BAUD_38400, "TX Baud") PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, serial_keyboard_device, update_serial) + PORT_CONFSETTING( RS232_BAUD_38400, "38400") // TODO: Should be 2400 but MC68901 doesn't support divide by 16 + + PORT_START("RS232_STARTBITS") + PORT_CONFNAME(0xff, RS232_STARTBITS_1, "Start Bits") PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, serial_keyboard_device, update_serial) + PORT_CONFSETTING( RS232_STARTBITS_1, "1") + + PORT_START("RS232_DATABITS") + PORT_CONFNAME(0xff, RS232_DATABITS_8, "Data Bits") PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, serial_keyboard_device, update_serial) + PORT_CONFSETTING( RS232_DATABITS_8, "8") + + PORT_START("RS232_PARITY") + PORT_CONFNAME(0xff, RS232_PARITY_NONE, "Parity") PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, serial_keyboard_device, update_serial) + PORT_CONFSETTING( RS232_PARITY_NONE, "None") + + PORT_START("RS232_STOPBITS") + PORT_CONFNAME(0xff, RS232_STOPBITS_1, "Stop Bits") PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, serial_keyboard_device, update_serial) + PORT_CONFSETTING( RS232_STOPBITS_1, "1") INPUT_PORTS_END ioport_constructor x68k_keyboard_device::device_input_ports() const diff --git a/src/mess/machine/x68k_kbd.h b/src/mess/machine/x68k_kbd.h index 81917fba18b..fb47f920487 100644 --- a/src/mess/machine/x68k_kbd.h +++ b/src/mess/machine/x68k_kbd.h @@ -1,13 +1,8 @@ #ifndef X68K_KBD_H_ #define X68K_KBD_H_ -#include "emu.h" #include "bus/rs232/keyboard.h" -#define MCFG_X68K_KEYBOARD_ADD(_tag, _intrf) \ - MCFG_DEVICE_ADD(_tag, X68K_KEYBOARD, 1200) \ - MCFG_DEVICE_CONFIG(_intrf) - class x68k_keyboard_device : public serial_keyboard_device { public: |