diff options
Diffstat (limited to 'src')
32 files changed, 319 insertions, 322 deletions
diff --git a/src/emu/machine/68307.c b/src/emu/machine/68307.c index 479f2aa0eaf..652f29d6010 100644 --- a/src/emu/machine/68307.c +++ b/src/emu/machine/68307.c @@ -137,7 +137,7 @@ void m68307_set_port_callbacks(m68307cpu_device *device, m68307_porta_read_callb device->m_m68307_portb_w = portb_w; } -void m68307_set_duart68681(m68307cpu_device* cpudev, duartn68681_device *duart68681) +void m68307_set_duart68681(m68307cpu_device* cpudev, mc68681_device *duart68681) { if (cpudev->m68307SERIAL) cpudev->m68307SERIAL->m68307ser_set_duart68681(duart68681); diff --git a/src/emu/machine/68307.h b/src/emu/machine/68307.h index 40c50647049..da9c057317a 100644 --- a/src/emu/machine/68307.h +++ b/src/emu/machine/68307.h @@ -88,7 +88,7 @@ protected: static const device_type M68307 = &device_creator<m68307cpu_device>; extern void m68307_set_port_callbacks(m68307cpu_device *device, m68307_porta_read_callback porta_r, m68307_porta_write_callback porta_w, m68307_portb_read_callback portb_r, m68307_portb_write_callback portb_w); -extern void m68307_set_duart68681(m68307cpu_device* cpudev, duartn68681_device *duart68681); +extern void m68307_set_duart68681(m68307cpu_device* cpudev, mc68681_device *duart68681); extern UINT16 m68307_get_cs(m68307cpu_device *device, offs_t address); extern void m68307_timer0_interrupt(m68307cpu_device *cpudev); extern void m68307_timer1_interrupt(m68307cpu_device *cpudev); diff --git a/src/emu/machine/68307ser.h b/src/emu/machine/68307ser.h index b95c2e3452a..2bd4defa36e 100644 --- a/src/emu/machine/68307ser.h +++ b/src/emu/machine/68307ser.h @@ -1,5 +1,5 @@ #include "cpu/m68000/m68000.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" #define m68307SER_UMR1_UMR2 (0x01) #define m68307SER_USR_UCSR (0x03) @@ -24,10 +24,10 @@ class m68307_serial void reset(void); UINT8 m_uivr; - void m68307ser_set_duart68681(duartn68681_device *duart68681) + void m68307ser_set_duart68681(mc68681_device *duart68681) { m_duart68681 = duart68681; } - duartn68681_device * m_duart68681; + mc68681_device * m_duart68681; }; diff --git a/src/emu/machine/machine.mak b/src/emu/machine/machine.mak index 992d272d51b..4026e39be67 100644 --- a/src/emu/machine/machine.mak +++ b/src/emu/machine/machine.mak @@ -118,11 +118,11 @@ endif #------------------------------------------------- # -#@src/emu/machine/n68681.h,MACHINES += 68681 +#@src/emu/machine/mc68681.h,MACHINES += 68681 #------------------------------------------------- ifneq ($(filter 68681,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/n68681.o +MACHINEOBJS += $(MACHINEOBJ)/mc68681.o endif #------------------------------------------------- diff --git a/src/emu/machine/n68681.c b/src/emu/machine/mc68681.c index 461aa1d608d..39961a519a0 100644 --- a/src/emu/machine/n68681.c +++ b/src/emu/machine/mc68681.c @@ -8,7 +8,7 @@ */ #include "emu.h" -#include "n68681.h" +#include "mc68681.h" #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) @@ -50,20 +50,20 @@ static const int baud_rate_ACR_1[] = { 75, 110, 134, 150, 300, 600, 1200, 2000, #define CHANB_TAG "chb" // device type definition -const device_type DUARTN68681 = &device_creator<duartn68681_device>; -const device_type DUART68681CHANNEL = &device_creator<duart68681_channel>; +const device_type MC68681 = &device_creator<mc68681_device>; +const device_type MC68681_CHANNEL = &device_creator<mc68681_channel>; MACHINE_CONFIG_FRAGMENT( duart68681 ) - MCFG_DEVICE_ADD(CHANA_TAG, DUART68681CHANNEL, 0) - MCFG_DEVICE_ADD(CHANB_TAG, DUART68681CHANNEL, 0) + MCFG_DEVICE_ADD(CHANA_TAG, MC68681_CHANNEL, 0) + MCFG_DEVICE_ADD(CHANB_TAG, MC68681_CHANNEL, 0) MACHINE_CONFIG_END //************************************************************************** // LIVE DEVICE //************************************************************************** -duartn68681_device::duartn68681_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, DUARTN68681, "DUART 68681 (new)", tag, owner, clock, "dun68681", __FILE__), +mc68681_device::mc68681_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : device_t(mconfig, MC68681, "MC68681", tag, owner, clock, "mc68681", __FILE__), m_chanA(*this, CHANA_TAG), m_chanB(*this, CHANB_TAG), write_irq(*this), @@ -84,9 +84,9 @@ duartn68681_device::duartn68681_device(const machine_config &mconfig, const char // the external clocks //------------------------------------------------- -void duartn68681_device::static_set_clocks(device_t &device, int clk3, int clk4, int clk5, int clk6) +void mc68681_device::static_set_clocks(device_t &device, int clk3, int clk4, int clk5, int clk6) { - duartn68681_device &duart = downcast<duartn68681_device &>(device); + mc68681_device &duart = downcast<mc68681_device &>(device); duart.ip3clk = clk3; duart.ip4clk = clk4; duart.ip5clk = clk5; @@ -97,7 +97,7 @@ void duartn68681_device::static_set_clocks(device_t &device, int clk3, int clk4, device start callback -------------------------------------------------*/ -void duartn68681_device::device_start() +void mc68681_device::device_start() { write_irq.resolve_safe(); write_a_tx.resolve_safe(); @@ -105,7 +105,7 @@ void duartn68681_device::device_start() read_inport.resolve(); write_outport.resolve_safe(); - duart_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(duartn68681_device::duart_timer_callback),this), NULL); + duart_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(mc68681_device::duart_timer_callback),this), NULL); save_item(NAME(ACR)); save_item(NAME(IMR)); @@ -121,7 +121,7 @@ void duartn68681_device::device_start() device reset callback -------------------------------------------------*/ -void duartn68681_device::device_reset() +void mc68681_device::device_reset() { ACR = 0; /* Interrupt Vector Register */ IVR = 0x0f; /* Interrupt Vector Register */ @@ -136,12 +136,12 @@ void duartn68681_device::device_reset() write_outport(OPR ^ 0xff); } -machine_config_constructor duartn68681_device::device_mconfig_additions() const +machine_config_constructor mc68681_device::device_mconfig_additions() const { return MACHINE_CONFIG_NAME( duart68681 ); } -void duartn68681_device::update_interrupts() +void mc68681_device::update_interrupts() { /* update SR state and update interrupt ISR state for the following bits: SRn: bits 7-4: handled elsewhere. @@ -171,7 +171,7 @@ void duartn68681_device::update_interrupts() } }; -double duartn68681_device::duart68681_get_ct_rate() +double mc68681_device::duart68681_get_ct_rate() { double rate = 0.0f; @@ -213,19 +213,19 @@ double duartn68681_device::duart68681_get_ct_rate() return rate; } -UINT16 duartn68681_device::duart68681_get_ct_count() +UINT16 mc68681_device::duart68681_get_ct_count() { double clock = duart68681_get_ct_rate(); return (duart_timer->remaining() * clock).as_double(); } -void duartn68681_device::duart68681_start_ct(int count) +void mc68681_device::duart68681_start_ct(int count) { double clock = duart68681_get_ct_rate(); duart_timer->adjust(attotime::from_hz(clock) * count, 0); } -TIMER_CALLBACK_MEMBER( duartn68681_device::duart_timer_callback ) +TIMER_CALLBACK_MEMBER( mc68681_device::duart_timer_callback ) { if (ACR & 0x40) { @@ -258,7 +258,7 @@ TIMER_CALLBACK_MEMBER( duartn68681_device::duart_timer_callback ) }; -READ8_MEMBER( duartn68681_device::read ) +READ8_MEMBER( mc68681_device::read ) { UINT8 r = 0xff; @@ -362,7 +362,7 @@ READ8_MEMBER( duartn68681_device::read ) return r; } -WRITE8_MEMBER( duartn68681_device::write ) +WRITE8_MEMBER( mc68681_device::write ) { offset &= 0x0f; LOG(( "Writing 68681 (%s) reg %x (%s) with %04x\n", tag(), offset, duart68681_reg_write_names[offset], data )); @@ -454,7 +454,7 @@ WRITE8_MEMBER( duartn68681_device::write ) } } -WRITE_LINE_MEMBER( duartn68681_device::ip0_w ) +WRITE_LINE_MEMBER( mc68681_device::ip0_w ) { UINT8 newIP = (IP_last_state & ~0x01) | ((state == ASSERT_LINE) ? 1 : 0); @@ -474,7 +474,7 @@ WRITE_LINE_MEMBER( duartn68681_device::ip0_w ) IP_last_state = newIP; } -WRITE_LINE_MEMBER( duartn68681_device::ip1_w ) +WRITE_LINE_MEMBER( mc68681_device::ip1_w ) { UINT8 newIP = (IP_last_state & ~0x02) | ((state == ASSERT_LINE) ? 2 : 0); @@ -494,7 +494,7 @@ WRITE_LINE_MEMBER( duartn68681_device::ip1_w ) IP_last_state = newIP; } -WRITE_LINE_MEMBER( duartn68681_device::ip2_w ) +WRITE_LINE_MEMBER( mc68681_device::ip2_w ) { UINT8 newIP = (IP_last_state & ~0x04) | ((state == ASSERT_LINE) ? 4 : 0); @@ -514,7 +514,7 @@ WRITE_LINE_MEMBER( duartn68681_device::ip2_w ) IP_last_state = newIP; } -WRITE_LINE_MEMBER( duartn68681_device::ip3_w ) +WRITE_LINE_MEMBER( mc68681_device::ip3_w ) { UINT8 newIP = (IP_last_state & ~0x08) | ((state == ASSERT_LINE) ? 8 : 0); @@ -534,21 +534,21 @@ WRITE_LINE_MEMBER( duartn68681_device::ip3_w ) IP_last_state = newIP; } -WRITE_LINE_MEMBER( duartn68681_device::ip4_w ) +WRITE_LINE_MEMBER( mc68681_device::ip4_w ) { UINT8 newIP = (IP_last_state & ~0x10) | ((state == ASSERT_LINE) ? 0x10 : 0); // TODO: special mode for ip4 (Ch. A Rx clock) IP_last_state = newIP; } -WRITE_LINE_MEMBER( duartn68681_device::ip5_w ) +WRITE_LINE_MEMBER( mc68681_device::ip5_w ) { UINT8 newIP = (IP_last_state & ~0x20) | ((state == ASSERT_LINE) ? 0x20 : 0); // TODO: special mode for ip5 (Ch. B Tx clock) IP_last_state = newIP; } -duart68681_channel *duartn68681_device::get_channel(int chan) +mc68681_channel *mc68681_device::get_channel(int chan) { if (chan == 0) { @@ -558,7 +558,7 @@ duart68681_channel *duartn68681_device::get_channel(int chan) return m_chanB; } -int duartn68681_device::calc_baud(int ch, UINT8 data) +int mc68681_device::calc_baud(int ch, UINT8 data) { int baud_rate = 0; @@ -602,20 +602,20 @@ int duartn68681_device::calc_baud(int ch, UINT8 data) return baud_rate; }; -void duartn68681_device::clear_ISR_bits(int mask) +void mc68681_device::clear_ISR_bits(int mask) { ISR &= ~mask; } -void duartn68681_device::set_ISR_bits(int mask) +void mc68681_device::set_ISR_bits(int mask) { ISR |= mask; } // DUART channel class stuff -duart68681_channel::duart68681_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, DUART68681CHANNEL, "DUART 68681 channel", tag, owner, clock, "duart68681_channel", __FILE__), +mc68681_channel::mc68681_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : device_t(mconfig, MC68681_CHANNEL, "DUART 68681 channel", tag, owner, clock, "mc68681_channel", __FILE__), device_serial_interface(mconfig, *this), MR1(0), MR2(0), @@ -625,9 +625,9 @@ duart68681_channel::duart68681_channel(const machine_config &mconfig, const char { } -void duart68681_channel::device_start() +void mc68681_channel::device_start() { - m_uart = downcast<duartn68681_device *>(owner()); + m_uart = downcast<mc68681_device *>(owner()); m_ch = m_uart->get_ch(this); // get our channel number save_item(NAME(CR)); @@ -648,7 +648,7 @@ void duart68681_channel::device_start() save_item(NAME(tx_ready)); } -void duart68681_channel::device_reset() +void mc68681_channel::device_reset() { write_CR(0x10); // reset MR write_CR(0x20); // reset Rx @@ -661,13 +661,13 @@ void duart68681_channel::device_reset() CSR = 0; } -void duart68681_channel::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) +void mc68681_channel::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { device_serial_interface::device_timer(timer, id, param, ptr); } // serial device virtual overrides -void duart68681_channel::rcv_complete() +void mc68681_channel::rcv_complete() { receive_register_extract(); @@ -691,7 +691,7 @@ void duart68681_channel::rcv_complete() } } -void duart68681_channel::tra_complete() +void mc68681_channel::tra_complete() { // printf("%s ch %d Tx complete\n", tag(), m_ch); tx_ready = 1; @@ -724,7 +724,7 @@ void duart68681_channel::tra_complete() update_interrupts(); } -void duart68681_channel::tra_callback() +void mc68681_channel::tra_callback() { // don't actually send in loopback mode if ((MR2&0xC0) != 0x80) @@ -746,7 +746,7 @@ void duart68681_channel::tra_callback() } } -void duart68681_channel::update_interrupts() +void mc68681_channel::update_interrupts() { if (rx_enabled) { @@ -845,7 +845,7 @@ void duart68681_channel::update_interrupts() //logerror("DEBUG: 68681 int check: after receiver test, SR%c is %02X, ISR is %02X\n", (ch+0x41), duart68681->channel[ch].SR, duart68681->ISR); } -UINT8 duart68681_channel::read_rx_fifo() +UINT8 mc68681_channel::read_rx_fifo() { UINT8 rv = 0; @@ -872,7 +872,7 @@ UINT8 duart68681_channel::read_rx_fifo() return rv; }; -UINT8 duart68681_channel::read_chan_reg(int reg) +UINT8 mc68681_channel::read_chan_reg(int reg) { UINT8 rv = 0xff; @@ -905,7 +905,7 @@ UINT8 duart68681_channel::read_chan_reg(int reg) return rv; } -void duart68681_channel::write_chan_reg(int reg, UINT8 data) +void mc68681_channel::write_chan_reg(int reg, UINT8 data) { switch (reg) { @@ -932,7 +932,7 @@ void duart68681_channel::write_chan_reg(int reg, UINT8 data) } } -void duart68681_channel::write_MR(UINT8 data) +void mc68681_channel::write_MR(UINT8 data) { if ( MR_ptr == 0 ) { @@ -947,7 +947,7 @@ void duart68681_channel::write_MR(UINT8 data) update_interrupts(); }; -void duart68681_channel::recalc_framing() +void mc68681_channel::recalc_framing() { parity_t parity = PARITY_NONE; switch ((MR1>>3) & 3) @@ -1005,7 +1005,7 @@ void duart68681_channel::recalc_framing() set_data_frame(1, (MR1 & 3)+5, parity, stopbits); } -void duart68681_channel::write_CR(UINT8 data) +void mc68681_channel::write_CR(UINT8 data) { CR = data; @@ -1083,7 +1083,7 @@ void duart68681_channel::write_CR(UINT8 data) update_interrupts(); }; -void duart68681_channel::write_TX(UINT8 data) +void mc68681_channel::write_TX(UINT8 data) { tx_data = data; @@ -1108,7 +1108,7 @@ void duart68681_channel::write_TX(UINT8 data) update_interrupts(); }; -void duart68681_channel::ACR_updated() +void mc68681_channel::ACR_updated() { write_chan_reg(1, CSR); } diff --git a/src/emu/machine/n68681.h b/src/emu/machine/mc68681.h index c0e6b358466..60c7d3b782d 100644 --- a/src/emu/machine/n68681.h +++ b/src/emu/machine/mc68681.h @@ -1,45 +1,42 @@ -#ifndef _N68681_H -#define _N68681_H +#ifndef _MC68681_H +#define _MC68681_H -#define MCFG_DUARTN68681_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, DUARTN68681, _clock) +#define MCFG_MC68681_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, MC68681, _clock) -#define MCFG_DUARTN68681_REPLACE(_tag, _clock) \ - MCFG_DEVICE_REPLACE(_tag, DUARTN68681, _clock) +#define MCFG_MC68681_REPLACE(_tag, _clock) \ + MCFG_DEVICE_REPLACE(_tag, MC68681, _clock) -#define MCFG_DUARTN68681_IRQ_CALLBACK(_cb) \ - devcb = &duartn68681_device::set_irq_cb(*device, DEVCB2_##_cb); +#define MCFG_MC68681_IRQ_CALLBACK(_cb) \ + devcb = &mc68681_device::set_irq_cb(*device, DEVCB2_##_cb); -#define MCFG_DUARTN68681_A_TX_CALLBACK(_cb) \ - devcb = &duartn68681_device::set_a_tx_cb(*device, DEVCB2_##_cb); +#define MCFG_MC68681_A_TX_CALLBACK(_cb) \ + devcb = &mc68681_device::set_a_tx_cb(*device, DEVCB2_##_cb); -#define MCFG_DUARTN68681_B_TX_CALLBACK(_cb) \ - devcb = &duartn68681_device::set_b_tx_cb(*device, DEVCB2_##_cb); +#define MCFG_MC68681_B_TX_CALLBACK(_cb) \ + devcb = &mc68681_device::set_b_tx_cb(*device, DEVCB2_##_cb); // deprecated: use ipX_w() instead -#define MCFG_DUARTN68681_INPORT_CALLBACK(_cb) \ - devcb = &duartn68681_device::set_inport_cb(*device, DEVCB2_##_cb); +#define MCFG_MC68681_INPORT_CALLBACK(_cb) \ + devcb = &mc68681_device::set_inport_cb(*device, DEVCB2_##_cb); -#define MCFG_DUARTN68681_OUTPORT_CALLBACK(_cb) \ - devcb = &duartn68681_device::set_outport_cb(*device, DEVCB2_##_cb); +#define MCFG_MC68681_OUTPORT_CALLBACK(_cb) \ + devcb = &mc68681_device::set_outport_cb(*device, DEVCB2_##_cb); -#define MCFG_DUARTN68681_SET_EXTERNAL_CLOCKS(_a, _b, _c, _d) \ - duartn68681_device::static_set_clocks(*device, _a, _b, _c, _d); - -// forward declaration -class duartn68681_device; +#define MCFG_MC68681_SET_EXTERNAL_CLOCKS(_a, _b, _c, _d) \ + mc68681_device::static_set_clocks(*device, _a, _b, _c, _d); #define MC68681_RX_FIFO_SIZE 3 // forward declaration -class duartn68681_device; +class mc68681_device; -// n68681 channel class -class duart68681_channel : public device_t, public device_serial_interface +// mc68681_channel class +class mc68681_channel : public device_t, public device_serial_interface { public: - duart68681_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + mc68681_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start(); @@ -85,7 +82,7 @@ private: UINT8 tx_data; UINT8 tx_ready; - duartn68681_device *m_uart; + mc68681_device *m_uart; void write_MR(UINT8 data); void write_CR(UINT8 data); @@ -93,15 +90,15 @@ private: void recalc_framing(); }; -class duartn68681_device : public device_t +class mc68681_device : public device_t { - friend class duart68681_channel; + friend class mc68681_channel; public: - duartn68681_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + mc68681_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - required_device<duart68681_channel> m_chanA; - required_device<duart68681_channel> m_chanB; + required_device<mc68681_channel> m_chanA; + required_device<mc68681_channel> m_chanB; // inline configuration helpers static void static_set_clocks(device_t &device, int clk3, int clk4, int clk5, int clk6); @@ -114,11 +111,11 @@ public: DECLARE_WRITE_LINE_MEMBER( rx_a_w ) { m_chanA->device_serial_interface::rx_w((UINT8)state); } DECLARE_WRITE_LINE_MEMBER( rx_b_w ) { m_chanB->device_serial_interface::rx_w((UINT8)state); } - template<class _Object> static devcb2_base &set_irq_cb(device_t &device, _Object object) { return downcast<duartn68681_device &>(device).write_irq.set_callback(object); } - template<class _Object> static devcb2_base &set_a_tx_cb(device_t &device, _Object object) { return downcast<duartn68681_device &>(device).write_a_tx.set_callback(object); } - template<class _Object> static devcb2_base &set_b_tx_cb(device_t &device, _Object object) { return downcast<duartn68681_device &>(device).write_b_tx.set_callback(object); } - template<class _Object> static devcb2_base &set_inport_cb(device_t &device, _Object object) { return downcast<duartn68681_device &>(device).read_inport.set_callback(object); } - template<class _Object> static devcb2_base &set_outport_cb(device_t &device, _Object object) { return downcast<duartn68681_device &>(device).write_outport.set_callback(object); } + template<class _Object> static devcb2_base &set_irq_cb(device_t &device, _Object object) { return downcast<mc68681_device &>(device).write_irq.set_callback(object); } + template<class _Object> static devcb2_base &set_a_tx_cb(device_t &device, _Object object) { return downcast<mc68681_device &>(device).write_a_tx.set_callback(object); } + template<class _Object> static devcb2_base &set_b_tx_cb(device_t &device, _Object object) { return downcast<mc68681_device &>(device).write_b_tx.set_callback(object); } + template<class _Object> static devcb2_base &set_inport_cb(device_t &device, _Object object) { return downcast<mc68681_device &>(device).read_inport.set_callback(object); } + template<class _Object> static devcb2_base &set_outport_cb(device_t &device, _Object object) { return downcast<mc68681_device &>(device).write_outport.set_callback(object); } devcb2_write_line write_irq, write_a_tx, write_b_tx; devcb2_read8 read_inport; @@ -165,12 +162,12 @@ private: UINT16 duart68681_get_ct_count(); void duart68681_start_ct(int count); int calc_baud(int ch, UINT8 data); - int get_ch(duart68681_channel *ch) { return (ch == m_chanA) ? 0 : 1; } + int get_ch(mc68681_channel *ch) { return (ch == m_chanA) ? 0 : 1; } void clear_ISR_bits(int mask); void set_ISR_bits(int mask); void update_interrupts(); - duart68681_channel *get_channel(int chan); + mc68681_channel *get_channel(int chan); devcb_resolved_write_line m_out_irq_func; devcb_resolved_write_line m_out_a_tx_func; @@ -179,7 +176,7 @@ private: devcb_resolved_write8 m_out_port_func; }; -extern const device_type DUARTN68681; -extern const device_type DUART68681CHANNEL; +extern const device_type MC68681; +extern const device_type MC68681_CHANNEL; #endif //_N68681_H diff --git a/src/mame/audio/taito_en.c b/src/mame/audio/taito_en.c index 148c7a476dd..93c4ce24478 100644 --- a/src/mame/audio/taito_en.c +++ b/src/mame/audio/taito_en.c @@ -51,7 +51,7 @@ void taito_en_device::device_start() save_item(NAME(m_es5510_gpr_latch)); save_item(NAME(m_es5510_ram_sel)); - m_duart68681 = machine().device<duartn68681_device>("duart68681"); + m_duart68681 = machine().device<mc68681_device>("duart68681"); } //------------------------------------------------- @@ -252,7 +252,7 @@ static ADDRESS_MAP_START( en_sound_map, AS_PROGRAM, 16, driver_device ) AM_RANGE(0x140000, 0x140fff) AM_DEVREADWRITE("taito_en", taito_en_device, en_68000_share_r, en_68000_share_w) AM_RANGE(0x200000, 0x20001f) AM_DEVREADWRITE("ensoniq", es5505_device, read, write) AM_RANGE(0x260000, 0x2601ff) AM_DEVREADWRITE("taito_en", taito_en_device, es5510_dsp_r, es5510_dsp_w) //todo: hook up cpu/es5510 - AM_RANGE(0x280000, 0x28001f) AM_DEVREADWRITE8("duart68681", duartn68681_device, read, write, 0x00ff) + AM_RANGE(0x280000, 0x28001f) AM_DEVREADWRITE8("duart68681", mc68681_device, read, write, 0x00ff) AM_RANGE(0x300000, 0x30003f) AM_DEVWRITE("taito_en", taito_en_device, en_es5505_bank_w) AM_RANGE(0x340000, 0x340003) AM_DEVWRITE("taito_en", taito_en_device, en_volume_w) AM_RANGE(0xc00000, 0xc1ffff) AM_ROMBANK("bank1") @@ -342,9 +342,9 @@ MACHINE_CONFIG_FRAGMENT( taito_en_sound ) MCFG_CPU_ADD("audiocpu", M68000, XTAL_30_4761MHz / 2) MCFG_CPU_PROGRAM_MAP(en_sound_map) - MCFG_DUARTN68681_ADD("duart68681", XTAL_16MHz / 4) - MCFG_DUARTN68681_SET_EXTERNAL_CLOCKS(XTAL_16MHz/2/8, XTAL_16MHz/2/16, XTAL_16MHz/2/16, XTAL_16MHz/2/8) - MCFG_DUARTN68681_IRQ_CALLBACK(DEVWRITELINE("taito_en", taito_en_device, duart_irq_handler)) + MCFG_MC68681_ADD("duart68681", XTAL_16MHz / 4) + MCFG_MC68681_SET_EXTERNAL_CLOCKS(XTAL_16MHz/2/8, XTAL_16MHz/2/16, XTAL_16MHz/2/16, XTAL_16MHz/2/8) + MCFG_MC68681_IRQ_CALLBACK(DEVWRITELINE("taito_en", taito_en_device, duart_irq_handler)) MCFG_MB87078_ADD("mb87078", taito_en_mb87078_intf) diff --git a/src/mame/audio/taito_en.h b/src/mame/audio/taito_en.h index 07c8b705577..453511869b4 100644 --- a/src/mame/audio/taito_en.h +++ b/src/mame/audio/taito_en.h @@ -1,6 +1,6 @@ #include "cpu/m68000/m68000.h" #include "sound/es5506.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" class taito_en_device : public device_t @@ -41,7 +41,7 @@ private: UINT32 *m_snd_shared_ram; - duartn68681_device *m_duart68681; + mc68681_device *m_duart68681; }; diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c index c2e27b8db28..89bc0ba23f6 100644 --- a/src/mame/drivers/adp.c +++ b/src/mame/drivers/adp.c @@ -150,7 +150,7 @@ Video board has additional chips: #include "sound/ay8910.h" #include "video/h63484.h" #include "machine/microtch.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" class adp_state : public driver_device { @@ -168,7 +168,7 @@ public: required_device<h63484_device> m_h63484; required_device<microtouch_serial_device> m_microtouch; required_device<cpu_device> m_maincpu; - required_device<duartn68681_device> m_duart; + required_device<mc68681_device> m_duart; required_device<screen_device> m_screen; required_device<palette_device> m_palette; @@ -416,7 +416,7 @@ static ADDRESS_MAP_START( skattv_mem, AS_PROGRAM, 16, adp_state ) AM_RANGE(0x800082, 0x800083) AM_DEVREADWRITE("h63484", h63484_device, data_r, data_w) AM_RANGE(0x800100, 0x800101) AM_READWRITE(test_r,wh2_w) //related to input AM_RANGE(0x800140, 0x800143) AM_DEVREADWRITE8("aysnd", ay8910_device, data_r, address_data_w, 0x00ff) //18b too - AM_RANGE(0x800180, 0x80019f) AM_DEVREADWRITE8("duart68681", duartn68681_device, read, write, 0xff ) + AM_RANGE(0x800180, 0x80019f) AM_DEVREADWRITE8("duart68681", mc68681_device, read, write, 0xff ) AM_RANGE(0xffc000, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -426,7 +426,7 @@ static ADDRESS_MAP_START( quickjac_mem, AS_PROGRAM, 16, adp_state ) AM_RANGE(0x800080, 0x800081) AM_DEVREADWRITE("h63484", h63484_device, status_r, address_w) // bad AM_RANGE(0x800082, 0x800083) AM_DEVREADWRITE("h63484", h63484_device, data_r, data_w) // bad AM_RANGE(0x800140, 0x800143) AM_DEVREADWRITE8("aysnd", ay8910_device, data_r, address_data_w, 0x00ff) //18b too - AM_RANGE(0x800180, 0x80019f) AM_DEVREADWRITE8("duart68681", duartn68681_device, read, write, 0xff ) + AM_RANGE(0x800180, 0x80019f) AM_DEVREADWRITE8("duart68681", mc68681_device, read, write, 0xff ) AM_RANGE(0xff0000, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -434,7 +434,7 @@ static ADDRESS_MAP_START( backgamn_mem, AS_PROGRAM, 16, adp_state ) AM_RANGE(0x000000, 0x01ffff) AM_ROM AM_RANGE(0x100000, 0x10003f) AM_RAM AM_RANGE(0x200000, 0x20003f) AM_RAM - AM_RANGE(0x400000, 0x40001f) AM_DEVREADWRITE8("duart68681", duartn68681_device, read, write, 0xff ) + AM_RANGE(0x400000, 0x40001f) AM_DEVREADWRITE8("duart68681", mc68681_device, read, write, 0xff ) AM_RANGE(0x500000, 0x503fff) AM_RAM //work RAM AM_RANGE(0x600006, 0x600007) AM_NOP //(r) is discarded (watchdog?) ADDRESS_MAP_END @@ -481,7 +481,7 @@ static ADDRESS_MAP_START( funland_mem, AS_PROGRAM, 16, adp_state ) AM_RANGE(0x800088, 0x80008d) AM_WRITE8(ramdac_io_w, 0x00ff) AM_RANGE(0x800100, 0x800101) AM_RAM //??? AM_RANGE(0x800140, 0x800143) AM_DEVREADWRITE8("aysnd", ay8910_device, data_r, address_data_w, 0x00ff) //18b too - AM_RANGE(0x800180, 0x80019f) AM_DEVREADWRITE8("duart68681", duartn68681_device, read, write, 0xff ) + AM_RANGE(0x800180, 0x80019f) AM_DEVREADWRITE8("duart68681", mc68681_device, read, write, 0xff ) AM_RANGE(0xfc0000, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -492,7 +492,7 @@ static ADDRESS_MAP_START( fstation_mem, AS_PROGRAM, 16, adp_state ) AM_RANGE(0x800082, 0x800083) AM_DEVREADWRITE("h63484", h63484_device, data_r, data_w) AM_RANGE(0x800100, 0x800101) AM_RAM //??? AM_RANGE(0x800140, 0x800143) AM_DEVREADWRITE8("aysnd", ay8910_device, data_r, address_data_w, 0x00ff) //18b too - AM_RANGE(0x800180, 0x80019f) AM_DEVREADWRITE8("duart68681", duartn68681_device, read, write, 0xff ) + AM_RANGE(0x800180, 0x80019f) AM_DEVREADWRITE8("duart68681", mc68681_device, read, write, 0xff ) AM_RANGE(0xfc0000, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -631,12 +631,12 @@ static MACHINE_CONFIG_START( quickjac, adp_state ) MCFG_MACHINE_START_OVERRIDE(adp_state,skattv) MCFG_MACHINE_RESET_OVERRIDE(adp_state,skattv) - MCFG_DUARTN68681_ADD( "duart68681", XTAL_8_664MHz / 2 ) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(adp_state, duart_irq_handler)) - MCFG_DUARTN68681_A_TX_CALLBACK(DEVWRITELINE("microtouch", microtouch_serial_device, rx)) - MCFG_DUARTN68681_INPORT_CALLBACK(IOPORT("DSW1")) + MCFG_MC68681_ADD( "duart68681", XTAL_8_664MHz / 2 ) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(adp_state, duart_irq_handler)) + MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("microtouch", microtouch_serial_device, rx)) + MCFG_MC68681_INPORT_CALLBACK(IOPORT("DSW1")) - MCFG_MICROTOUCH_SERIAL_ADD( "microtouch", 9600, DEVWRITELINE("duart68681", duartn68681_device, rx_a_w) ) + MCFG_MICROTOUCH_SERIAL_ADD( "microtouch", 9600, DEVWRITELINE("duart68681", mc68681_device, rx_a_w) ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -668,12 +668,12 @@ static MACHINE_CONFIG_START( skattv, adp_state ) MCFG_MACHINE_START_OVERRIDE(adp_state,skattv) MCFG_MACHINE_RESET_OVERRIDE(adp_state,skattv) - MCFG_DUARTN68681_ADD( "duart68681", XTAL_8_664MHz / 2 ) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(adp_state, duart_irq_handler)) - MCFG_DUARTN68681_A_TX_CALLBACK(DEVWRITELINE("microtouch", microtouch_serial_device, rx)) - MCFG_DUARTN68681_INPORT_CALLBACK(IOPORT("DSW1")) + MCFG_MC68681_ADD( "duart68681", XTAL_8_664MHz / 2 ) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(adp_state, duart_irq_handler)) + MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("microtouch", microtouch_serial_device, rx)) + MCFG_MC68681_INPORT_CALLBACK(IOPORT("DSW1")) - MCFG_MICROTOUCH_SERIAL_ADD( "microtouch", 9600, DEVWRITELINE("duart68681", duartn68681_device, rx_a_w) ) + MCFG_MICROTOUCH_SERIAL_ADD( "microtouch", 9600, DEVWRITELINE("duart68681", mc68681_device, rx_a_w) ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -701,12 +701,12 @@ static MACHINE_CONFIG_START( backgamn, adp_state ) MCFG_CPU_ADD("maincpu", M68000, 8000000) MCFG_CPU_PROGRAM_MAP(backgamn_mem) - MCFG_DUARTN68681_ADD( "duart68681", XTAL_8_664MHz / 2 ) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(adp_state, duart_irq_handler)) - MCFG_DUARTN68681_A_TX_CALLBACK(DEVWRITELINE("microtouch", microtouch_serial_device, rx)) - MCFG_DUARTN68681_INPORT_CALLBACK(IOPORT("DSW1")) + MCFG_MC68681_ADD( "duart68681", XTAL_8_664MHz / 2 ) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(adp_state, duart_irq_handler)) + MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("microtouch", microtouch_serial_device, rx)) + MCFG_MC68681_INPORT_CALLBACK(IOPORT("DSW1")) - MCFG_MICROTOUCH_SERIAL_ADD( "microtouch", 9600, DEVWRITELINE("duart68681", duartn68681_device, rx_a_w) ) + MCFG_MICROTOUCH_SERIAL_ADD( "microtouch", 9600, DEVWRITELINE("duart68681", mc68681_device, rx_a_w) ) MCFG_MACHINE_START_OVERRIDE(adp_state,skattv) MCFG_MACHINE_RESET_OVERRIDE(adp_state,skattv) diff --git a/src/mame/drivers/bfm_sc4h.c b/src/mame/drivers/bfm_sc4h.c index cb472428261..b6b785c37e7 100644 --- a/src/mame/drivers/bfm_sc4h.c +++ b/src/mame/drivers/bfm_sc4h.c @@ -715,11 +715,11 @@ MACHINE_CONFIG_START( sc4, sc4_state ) MCFG_CPU_PROGRAM_MAP(sc4_map) // internal duart of the 68307... paired in machine start - MCFG_DUARTN68681_ADD("m68307_68681", 16000000/4) // ?? Mhz - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(sc4_state, m68307_duart_irq_handler)) - MCFG_DUARTN68681_A_TX_CALLBACK(WRITELINE(sc4_state, m68307_duart_txa)) - MCFG_DUARTN68681_INPORT_CALLBACK(READ8(sc4_state, m68307_duart_input_r)) - MCFG_DUARTN68681_OUTPORT_CALLBACK(WRITE8(sc4_state, m68307_duart_output_w)) + MCFG_MC68681_ADD("m68307_68681", 16000000/4) // ?? Mhz + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(sc4_state, m68307_duart_irq_handler)) + MCFG_MC68681_A_TX_CALLBACK(WRITELINE(sc4_state, m68307_duart_txa)) + MCFG_MC68681_INPORT_CALLBACK(READ8(sc4_state, m68307_duart_input_r)) + MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(sc4_state, m68307_duart_output_w)) MCFG_MACHINE_START_OVERRIDE(sc4_state, sc4 ) MCFG_MACHINE_RESET_OVERRIDE(sc4_state, sc4 ) @@ -729,12 +729,12 @@ MACHINE_CONFIG_START( sc4, sc4_state ) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_DUARTN68681_ADD("duart68681", 16000000/4) // ?? Mhz - MCFG_DUARTN68681_SET_EXTERNAL_CLOCKS(XTAL_16MHz/2/8, XTAL_16MHz/2/16, XTAL_16MHz/2/16, XTAL_16MHz/2/8) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(sc4_state, bfm_sc4_duart_irq_handler)) - MCFG_DUARTN68681_A_TX_CALLBACK(WRITELINE(sc4_state, bfm_sc4_duart_txa)) - MCFG_DUARTN68681_INPORT_CALLBACK(READ8(sc4_state, bfm_sc4_duart_input_r)) - MCFG_DUARTN68681_OUTPORT_CALLBACK(WRITE8(sc4_state, bfm_sc4_duart_output_w)) + MCFG_MC68681_ADD("duart68681", 16000000/4) // ?? Mhz + MCFG_MC68681_SET_EXTERNAL_CLOCKS(XTAL_16MHz/2/8, XTAL_16MHz/2/16, XTAL_16MHz/2/16, XTAL_16MHz/2/8) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(sc4_state, bfm_sc4_duart_irq_handler)) + MCFG_MC68681_A_TX_CALLBACK(WRITELINE(sc4_state, bfm_sc4_duart_txa)) + MCFG_MC68681_INPORT_CALLBACK(READ8(sc4_state, bfm_sc4_duart_input_r)) + MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(sc4_state, bfm_sc4_duart_output_w)) MCFG_BFMBDA_ADD("vfd0",0) diff --git a/src/mame/drivers/bfm_sc5.c b/src/mame/drivers/bfm_sc5.c index e8e6bdb3feb..a23d62b055e 100644 --- a/src/mame/drivers/bfm_sc5.c +++ b/src/mame/drivers/bfm_sc5.c @@ -222,12 +222,12 @@ MACHINE_CONFIG_START( bfm_sc5, bfm_sc5_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_DUARTN68681_ADD("duart68681", 16000000/4) // ?? Mhz - MCFG_DUARTN68681_SET_EXTERNAL_CLOCKS(16000000/2/8, 16000000/2/16, 16000000/2/16, 16000000/2/8) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(bfm_sc5_state, bfm_sc5_duart_irq_handler)) - MCFG_DUARTN68681_A_TX_CALLBACK(WRITELINE(bfm_sc5_state, bfm_sc5_duart_txa)) - MCFG_DUARTN68681_INPORT_CALLBACK(READ8(bfm_sc5_state, bfm_sc5_duart_input_r)) - MCFG_DUARTN68681_OUTPORT_CALLBACK(WRITE8(bfm_sc5_state, bfm_sc5_duart_output_w)) + MCFG_MC68681_ADD("duart68681", 16000000/4) // ?? Mhz + MCFG_MC68681_SET_EXTERNAL_CLOCKS(16000000/2/8, 16000000/2/16, 16000000/2/16, 16000000/2/8) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(bfm_sc5_state, bfm_sc5_duart_irq_handler)) + MCFG_MC68681_A_TX_CALLBACK(WRITELINE(bfm_sc5_state, bfm_sc5_duart_txa)) + MCFG_MC68681_INPORT_CALLBACK(READ8(bfm_sc5_state, bfm_sc5_duart_input_r)) + MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(bfm_sc5_state, bfm_sc5_duart_output_w)) MCFG_BFMBDA_ADD("vfd0",0) diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c index aa48519aac2..07690c9c23e 100644 --- a/src/mame/drivers/harddriv.c +++ b/src/mame/drivers/harddriv.c @@ -418,7 +418,7 @@ static ADDRESS_MAP_START( driver_68k_map, AS_PROGRAM, 16, harddriv_state ) AM_RANGE(0xb80000, 0xbfffff) AM_READWRITE(hd68k_adc12_r, hd68k_adc_control_w) AM_RANGE(0xc00000, 0xc03fff) AM_READWRITE(hd68k_gsp_io_r, hd68k_gsp_io_w) AM_RANGE(0xc04000, 0xc07fff) AM_READWRITE(hd68k_msp_io_r, hd68k_msp_io_w) - AM_RANGE(0xff0000, 0xff001f) AM_DEVREADWRITE8("duartn68681", duartn68681_device, read, write, 0xff00) + AM_RANGE(0xff0000, 0xff001f) AM_DEVREADWRITE8("duartn68681", mc68681_device, read, write, 0xff00) AM_RANGE(0xff4000, 0xff4fff) AM_READWRITE(hd68k_zram_r, hd68k_zram_w) AM_RANGE(0xff8000, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -465,7 +465,7 @@ static ADDRESS_MAP_START( multisync_68k_map, AS_PROGRAM, 16, harddriv_state ) AM_RANGE(0xb80000, 0xbfffff) AM_READWRITE(hd68k_adc12_r, hd68k_adc_control_w) AM_RANGE(0xc00000, 0xc03fff) AM_READWRITE(hd68k_gsp_io_r, hd68k_gsp_io_w) AM_RANGE(0xc04000, 0xc07fff) AM_READWRITE(hd68k_msp_io_r, hd68k_msp_io_w) - AM_RANGE(0xff0000, 0xff001f) AM_DEVREADWRITE8("duartn68681", duartn68681_device, read, write, 0xff00) + AM_RANGE(0xff0000, 0xff001f) AM_DEVREADWRITE8("duartn68681", mc68681_device, read, write, 0xff00) AM_RANGE(0xff4000, 0xff4fff) AM_READWRITE(hd68k_zram_r, hd68k_zram_w) AM_RANGE(0xff8000, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -503,7 +503,7 @@ static ADDRESS_MAP_START( multisync2_68k_map, AS_PROGRAM, 16, harddriv_state ) AM_RANGE(0xb80000, 0xbfffff) AM_READWRITE(hd68k_adc12_r, hd68k_adc_control_w) AM_RANGE(0xc00000, 0xc03fff) AM_READWRITE(hd68k_gsp_io_r, hd68k_gsp_io_w) AM_RANGE(0xc04000, 0xc07fff) AM_READWRITE(hd68k_msp_io_r, hd68k_msp_io_w) - AM_RANGE(0xfc0000, 0xfc001f) AM_DEVREADWRITE8("duartn68681", duartn68681_device, read, write, 0xff00) + AM_RANGE(0xfc0000, 0xfc001f) AM_DEVREADWRITE8("duartn68681", mc68681_device, read, write, 0xff00) AM_RANGE(0xfd0000, 0xfd0fff) AM_MIRROR(0x004000) AM_READWRITE(hd68k_zram_r, hd68k_zram_w) AM_RANGE(0xff0000, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -1335,8 +1335,8 @@ static MACHINE_CONFIG_START( driver_nomsp, harddriv_state ) MCFG_M48T02_ADD("200e") // MK48T02 MCFG_EEPROM_2816_ADD("210e") // MK48Z02 - MCFG_DUARTN68681_ADD("duartn68681", XTAL_3_6864MHz) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(harddriv_state, harddriv_duart_irq_handler)) + MCFG_MC68681_ADD("duartn68681", XTAL_3_6864MHz) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(harddriv_state, harddriv_duart_irq_handler)) /* video hardware */ MCFG_PALETTE_ADD("palette", 1024) diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c index 2f9378b2231..db21dcb63eb 100644 --- a/src/mame/drivers/maygay1b.c +++ b/src/mame/drivers/maygay1b.c @@ -803,7 +803,7 @@ static ADDRESS_MAP_START( m1_memmap, AS_PROGRAM, 8, maygay1b_state ) AM_RANGE(0x2040, 0x2041) AM_READWRITE(m1_8279_2_r,m1_8279_2_w) // AM_RANGE(0x2050, 0x2050)// SCAN on M1B - AM_RANGE(0x2070, 0x207f) AM_DEVREADWRITE("duart68681", duartn68681_device, read, write ) + AM_RANGE(0x2070, 0x207f) AM_DEVREADWRITE("duart68681", mc68681_device, read, write ) AM_RANGE(0x2090, 0x2091) AM_DEVWRITE("aysnd", ay8910_device, address_data_w) AM_RANGE(0x20B0, 0x20B0) AM_READ(m1_meter_r) @@ -843,9 +843,9 @@ MACHINE_CONFIG_START( maygay_m1, maygay1b_state ) MCFG_CPU_ADD("maincpu", M6809, M1_MASTER_CLOCK/2) MCFG_CPU_PROGRAM_MAP(m1_memmap) - MCFG_DUARTN68681_ADD("duart68681", M1_DUART_CLOCK) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(maygay1b_state, duart_irq_handler)) - MCFG_DUARTN68681_INPORT_CALLBACK(READ8(maygay1b_state, m1_duart_r)) + MCFG_MC68681_ADD("duart68681", M1_DUART_CLOCK) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(maygay1b_state, duart_irq_handler)) + MCFG_MC68681_INPORT_CALLBACK(READ8(maygay1b_state, m1_duart_r)) MCFG_DEVICE_ADD("pia", PIA6821, 0) MCFG_PIA_WRITEPA_HANDLER(WRITE8(maygay1b_state, m1_pia_porta_w)) diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c index fd832f1c5e6..19052235fc6 100644 --- a/src/mame/drivers/maygayv1.c +++ b/src/mame/drivers/maygayv1.c @@ -129,7 +129,7 @@ Find lamps/reels after UPD changes. #include "video/awpvid.h" #include "cpu/mcs51/mcs51.h" #include "machine/6821pia.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" #include "sound/2413intf.h" #include "sound/upd7759.h" #include "machine/nvram.h" @@ -227,7 +227,7 @@ public: required_device<cpu_device> m_maincpu; required_device<i8052_device> m_soundcpu; required_device<upd7759_device> m_upd7759; - required_device<duartn68681_device> m_duart68681; + required_device<mc68681_device> m_duart68681; required_device<palette_device> m_palette; int m_vsync_latch_preset; @@ -699,7 +699,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, maygayv1_state ) AM_RANGE(0x860000, 0x86000d) AM_READWRITE(read_odd, write_odd) AM_RANGE(0x86000e, 0x86000f) AM_WRITE(vsync_int_ctrl) AM_RANGE(0x880000, 0x89ffff) AM_READWRITE(i82716_r, i82716_w) - AM_RANGE(0x8a0000, 0x8a001f) AM_DEVREADWRITE8("duart68681", duartn68681_device, read, write, 0xff) + AM_RANGE(0x8a0000, 0x8a001f) AM_DEVREADWRITE8("duart68681", mc68681_device, read, write, 0xff) AM_RANGE(0x8c0000, 0x8c000f) AM_DEVREAD8("pia", pia6821_device, read, 0x00ff) AM_RANGE(0x8c0000, 0x8c000f) AM_DEVWRITE8("pia", pia6821_device, write, 0xff00) ADDRESS_MAP_END @@ -1037,9 +1037,9 @@ static MACHINE_CONFIG_START( maygayv1, maygayv1_state ) MCFG_PALETTE_ADD("palette", 16) - MCFG_DUARTN68681_ADD("duart68681", DUART_CLOCK) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(maygayv1_state, duart_irq_handler)) - MCFG_DUARTN68681_A_TX_CALLBACK(WRITELINE(maygayv1_state, duart_txa)) + MCFG_MC68681_ADD("duart68681", DUART_CLOCK) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(maygayv1_state, duart_irq_handler)) + MCFG_MC68681_A_TX_CALLBACK(WRITELINE(maygayv1_state, duart_txa)) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c index 673bc971ca5..2ccb27f5b5a 100644 --- a/src/mame/drivers/micro3d.c +++ b/src/mame/drivers/micro3d.c @@ -25,7 +25,7 @@ #include "cpu/m68000/m68000.h" #include "cpu/am29000/am29000.h" #include "cpu/mcs51/mcs51.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" #include "machine/mc68901.h" #include "sound/2151intf.h" #include "machine/nvram.h" @@ -207,7 +207,7 @@ static ADDRESS_MAP_START( hostmem, AS_PROGRAM, 16, micro3d_state ) AM_RANGE(0x9a0000, 0x9a0007) AM_READWRITE(micro3d_tms_host_r, micro3d_tms_host_w) AM_RANGE(0x9c0000, 0x9c0001) AM_NOP /* Lamps */ AM_RANGE(0x9e0000, 0x9e002f) AM_DEVREADWRITE8("mc68901", mc68901_device, read, write, 0xff00) - AM_RANGE(0xa00000, 0xa0003f) AM_DEVREADWRITE8("duart68681", duartn68681_device, read, write, 0xff00) + AM_RANGE(0xa00000, 0xa0003f) AM_DEVREADWRITE8("duart68681", mc68681_device, read, write, 0xff00) AM_RANGE(0xa20000, 0xa20001) AM_READ(micro3d_encoder_h_r) AM_RANGE(0xa40002, 0xa40003) AM_READ(micro3d_encoder_l_r) ADDRESS_MAP_END @@ -323,11 +323,11 @@ static MACHINE_CONFIG_START( micro3d, micro3d_state ) MCFG_CPU_PROGRAM_MAP(soundmem_prg) MCFG_CPU_IO_MAP(soundmem_io) - MCFG_DUARTN68681_ADD("duart68681", XTAL_3_6864MHz) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(micro3d_state, duart_irq_handler)) - MCFG_DUARTN68681_B_TX_CALLBACK(WRITELINE(micro3d_state, duart_txb)) - MCFG_DUARTN68681_INPORT_CALLBACK(READ8(micro3d_state, duart_input_r)) - MCFG_DUARTN68681_OUTPORT_CALLBACK(WRITE8(micro3d_state, duart_output_w)) + MCFG_MC68681_ADD("duart68681", XTAL_3_6864MHz) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(micro3d_state, duart_irq_handler)) + MCFG_MC68681_B_TX_CALLBACK(WRITELINE(micro3d_state, duart_txb)) + MCFG_MC68681_INPORT_CALLBACK(READ8(micro3d_state, duart_input_r)) + MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(micro3d_state, duart_output_w)) MCFG_DEVICE_ADD("mc68901", MC68901, 4000000) MCFG_MC68901_TIMER_CLOCK(4000000) diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c index 98cfa32fa5a..747d326f5d1 100644 --- a/src/mame/drivers/tmaster.c +++ b/src/mame/drivers/tmaster.c @@ -106,7 +106,7 @@ To Do: #include "sound/okim6295.h" #include "machine/eepromser.h" #include "machine/microtch.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" #include "machine/nvram.h" #include "machine/ds1204.h" @@ -137,7 +137,7 @@ public: required_shared_ptr<UINT16> m_regs; optional_shared_ptr<UINT16> m_galgames_ram; required_device<okim6295_device> m_oki; - optional_device<duartn68681_device> m_duart; + optional_device<mc68681_device> m_duart; required_device<screen_device> m_screen; required_device<palette_device> m_palette; @@ -549,7 +549,7 @@ static ADDRESS_MAP_START( tmaster_map, AS_PROGRAM, 16, tmaster_state ) AM_RANGE( 0x300010, 0x300011 ) AM_READ_PORT("COIN") - AM_RANGE( 0x300020, 0x30003f ) AM_DEVREADWRITE8("duart68681", duartn68681_device, read, write, 0xff ) + AM_RANGE( 0x300020, 0x30003f ) AM_DEVREADWRITE8("duart68681", mc68681_device, read, write, 0xff ) AM_RANGE( 0x300040, 0x300041 ) AM_WRITE_PORT("OUT") @@ -919,11 +919,11 @@ static MACHINE_CONFIG_START( tm, tmaster_state ) MCFG_MACHINE_RESET_OVERRIDE(tmaster_state,tmaster) - MCFG_DUARTN68681_ADD( "duart68681", XTAL_8_664MHz / 2 /*??*/) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(tmaster_state, duart_irq_handler)) - MCFG_DUARTN68681_A_TX_CALLBACK(DEVWRITELINE("microtouch", microtouch_serial_device, rx)) + MCFG_MC68681_ADD( "duart68681", XTAL_8_664MHz / 2 /*??*/) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(tmaster_state, duart_irq_handler)) + MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("microtouch", microtouch_serial_device, rx)) - MCFG_MICROTOUCH_SERIAL_ADD( "microtouch", 9600, DEVWRITELINE("duart68681", duartn68681_device, rx_a_w) ) + MCFG_MICROTOUCH_SERIAL_ADD( "microtouch", 9600, DEVWRITELINE("duart68681", mc68681_device, rx_a_w) ) MCFG_NVRAM_ADD_0FILL("nvram") diff --git a/src/mame/drivers/vlc.c b/src/mame/drivers/vlc.c index 42c33d5b1a4..a93e4962de5 100644 --- a/src/mame/drivers/vlc.c +++ b/src/mame/drivers/vlc.c @@ -131,7 +131,7 @@ nevada TYPE2 : 64 45 51 06 32 02 31 31 #include "emu.h" #include "cpu/m68000/m68000.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" #include "video/mc6845.h" #include "sound/ay8910.h" #include "machine/msm6242.h" @@ -160,9 +160,9 @@ public: m_backup(*this, "backup") { } - required_device<duartn68681_device> m_duart18_68681; - required_device<duartn68681_device> m_duart39_68681; - required_device<duartn68681_device> m_duart40_68681; + required_device<mc68681_device> m_duart18_68681; + required_device<mc68681_device> m_duart39_68681; + required_device<mc68681_device> m_duart40_68681; required_device<cpu_device> m_maincpu; optional_device<microtouch_serial_device> m_microtouch; @@ -539,9 +539,9 @@ static ADDRESS_MAP_START( nevada_map, AS_PROGRAM, 16,nevada_state ) AM_RANGE(0x00a40000, 0x00A40001) AM_READWRITE( nevada_sec_r, nevada_sec_w) //AM_RANGE(0x00b00000, 0x00b01fff) AM_RAM_WRITE(nevada_videoram_w) AM_BASE_MEMBER(nevada_state, m_videoram) AM_RANGE(0x00b00000, 0x00b01fff) AM_RAM // Video - AM_RANGE(0x00b10000, 0x00b100ff) AM_DEVREADWRITE8( "duart40_68681", duartn68681_device, read, write, 0x00ff ) // Lower byte - AM_RANGE(0x00b20000, 0x00b200ff) AM_DEVREADWRITE8( "duart39_68681", duartn68681_device, read, write, 0x00ff ) // Lower byte - AM_RANGE(0x00e00000, 0x00e000ff) AM_DEVREADWRITE8( "duart18_68681", duartn68681_device, read, write, 0xff00 ) // Upper byte + AM_RANGE(0x00b10000, 0x00b100ff) AM_DEVREADWRITE8( "duart40_68681", mc68681_device, read, write, 0x00ff ) // Lower byte + AM_RANGE(0x00b20000, 0x00b200ff) AM_DEVREADWRITE8( "duart39_68681", mc68681_device, read, write, 0x00ff ) // Lower byte + AM_RANGE(0x00e00000, 0x00e000ff) AM_DEVREADWRITE8( "duart18_68681", mc68681_device, read, write, 0xff00 ) // Upper byte AM_RANGE(0x00fa0000, 0x00fbffff) AM_RAM // not used AM_RANGE(0x00fc0000, 0x00ffffff) AM_ROM // ROM ext + ROM boot ADDRESS_MAP_END @@ -638,20 +638,20 @@ static MACHINE_CONFIG_START( nevada, nevada_state ) MCFG_SOUND_ADD("aysnd", AY8912, SOUND_CLOCK) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) - MCFG_DUARTN68681_ADD( "duart18_68681", XTAL_3_6864MHz ) // UARTA = Modem 1200Baud - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(nevada_state, duart18_irq_handler)) - MCFG_DUARTN68681_INPORT_CALLBACK(IOPORT("DSW1")) + MCFG_MC68681_ADD( "duart18_68681", XTAL_3_6864MHz ) // UARTA = Modem 1200Baud + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(nevada_state, duart18_irq_handler)) + MCFG_MC68681_INPORT_CALLBACK(IOPORT("DSW1")) - MCFG_DUARTN68681_ADD( "duart39_68681", XTAL_3_6864MHz ) // UARTA = Printer - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(nevada_state, duart39_irq_handler)) - MCFG_DUARTN68681_INPORT_CALLBACK(IOPORT("DSW2")) + MCFG_MC68681_ADD( "duart39_68681", XTAL_3_6864MHz ) // UARTA = Printer + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(nevada_state, duart39_irq_handler)) + MCFG_MC68681_INPORT_CALLBACK(IOPORT("DSW2")) - MCFG_DUARTN68681_ADD( "duart40_68681", XTAL_3_6864MHz ) // UARTA = Touch , UARTB = Bill Acceptor - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(nevada_state, duart40_irq_handler)) - MCFG_DUARTN68681_A_TX_CALLBACK(DEVWRITELINE("microtouch", microtouch_serial_device, rx)) - MCFG_DUARTN68681_INPORT_CALLBACK(IOPORT("DSW3")) + MCFG_MC68681_ADD( "duart40_68681", XTAL_3_6864MHz ) // UARTA = Touch , UARTB = Bill Acceptor + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(nevada_state, duart40_irq_handler)) + MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("microtouch", microtouch_serial_device, rx)) + MCFG_MC68681_INPORT_CALLBACK(IOPORT("DSW3")) - MCFG_MICROTOUCH_SERIAL_ADD( "microtouch", 9600, DEVWRITELINE("duart40_68681", duartn68681_device, rx_a_w) ) + MCFG_MICROTOUCH_SERIAL_ADD( "microtouch", 9600, DEVWRITELINE("duart40_68681", mc68681_device, rx_a_w) ) /* devices */ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz) diff --git a/src/mame/includes/bfm_sc45.h b/src/mame/includes/bfm_sc45.h index a76629c4638..3896a9d6d81 100644 --- a/src/mame/includes/bfm_sc45.h +++ b/src/mame/includes/bfm_sc45.h @@ -7,7 +7,7 @@ #include "machine/bfm_bda.h" #include "sound/ymz280b.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" #include "machine/nvram.h" #include "machine/68307.h" #include "machine/68340.h" @@ -28,7 +28,7 @@ public: public: - required_device<duartn68681_device> m_duart; + required_device<mc68681_device> m_duart; optional_device<bfm_bda_t> m_vfd0; optional_device<bfmdm01_device> m_dm01; required_device<ymz280b_device> m_ymz; @@ -75,7 +75,7 @@ public: } required_device<m68307cpu_device> m_maincpu; - required_device<duartn68681_device> m_m68307_68681; + required_device<mc68681_device> m_m68307_68681; required_memory_region m_cpuregion; // devices required_device<nvram_device> m_nvram; diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h index 82aca4ddcb8..1ccdfaff73e 100644 --- a/src/mame/includes/harddriv.h +++ b/src/mame/includes/harddriv.h @@ -14,7 +14,7 @@ #include "audio/atarijsa.h" #include "sound/dac.h" #include "machine/atarigen.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" #include "machine/asic65.h" #include "machine/timekpr.h" @@ -289,7 +289,7 @@ public: TIMER_CALLBACK_MEMBER(rddsp32_sync_cb); DECLARE_WRITE16_MEMBER(hdsnddsp_dac_w); optional_device<dac_device> m_dac; - required_device<duartn68681_device> m_duart; + required_device<mc68681_device> m_duart; optional_device<asic65_device> m_asic65; DECLARE_WRITE_LINE_MEMBER(harddriv_duart_irq_handler); diff --git a/src/mame/includes/maygay1b.h b/src/mame/includes/maygay1b.h index c0219cc0072..a147be5d271 100644 --- a/src/mame/includes/maygay1b.h +++ b/src/mame/includes/maygay1b.h @@ -10,7 +10,7 @@ #include "cpu/m6809/m6809.h" #include "video/awpvid.h" //Fruit Machines Only #include "machine/6821pia.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" #include "machine/meters.h" #include "machine/roc10937.h" // vfd #include "machine/steppers.h" // stepper motor @@ -51,7 +51,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<roc10937_t> m_vfd; optional_device<okim6376_device> m_msm6376; - required_device<duartn68681_device> m_duart68681; + required_device<mc68681_device> m_duart68681; UINT8 m_lamppos; int m_alpha_clock; diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h index dcb499021b2..7ccee52fe94 100644 --- a/src/mame/includes/micro3d.h +++ b/src/mame/includes/micro3d.h @@ -7,7 +7,7 @@ #include "cpu/tms34010/tms34010.h" #include "cpu/mcs51/mcs51.h" #include "sound/upd7759.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" #define HOST_MONITOR_DISPLAY 0 @@ -145,7 +145,7 @@ public: required_device<cpu_device> m_drmath; required_device<tms34010_device> m_vgb; required_device<palette_device> m_palette; - required_device<duartn68681_device> m_duart68681; + required_device<mc68681_device> m_duart68681; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mess/drivers/apollo.c b/src/mess/drivers/apollo.c index 190f7472d0b..83b3f1f6224 100644 --- a/src/mess/drivers/apollo.c +++ b/src/mess/drivers/apollo.c @@ -673,8 +673,8 @@ static ADDRESS_MAP_START(dn3500_map, AS_PROGRAM, 32, apollo_state ) AM_RANGE(0x010100, 0x0101ff) AM_READWRITE16(apollo_csr_control_register_r, apollo_csr_control_register_w, 0xffffffff) AM_RANGE(0x010200, 0x0102ff) AM_READWRITE8(cache_status_register_r, cache_control_register_w, 0xffffffff ) AM_RANGE(0x010300, 0x0103ff) AM_READWRITE8(task_alias_register_r , task_alias_register_w , 0xffffffff ) - AM_RANGE(0x010400, 0x0104ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, duartn68681_device, read, write, 0x00ff00ff ) - AM_RANGE(0x010500, 0x0105ff) AM_DEVREADWRITE8(APOLLO_SIO2_TAG, duartn68681_device, read, write, 0x00ff00ff ) + AM_RANGE(0x010400, 0x0104ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, mc68681_device, read, write, 0x00ff00ff ) + AM_RANGE(0x010500, 0x0105ff) AM_DEVREADWRITE8(APOLLO_SIO2_TAG, mc68681_device, read, write, 0x00ff00ff ) AM_RANGE(0x010800, 0x0108ff) AM_DEVREADWRITE8(APOLLO_PTM_TAG, ptm6840_device, read, write, 0x00ff00ff ) AM_RANGE(0x010900, 0x0109ff) AM_READWRITE8(apollo_rtc_r, apollo_rtc_w, 0xffffffff ) AM_RANGE(0x010c00, 0x010cff) AM_READWRITE8(/*"dma1",*/apollo_dma_1_r, apollo_dma_1_w, 0xffffffff ) @@ -719,8 +719,8 @@ static ADDRESS_MAP_START(dsp3500_map, AS_PROGRAM, 32, apollo_state ) AM_RANGE(0x010100, 0x0101ff) AM_READWRITE16(apollo_csr_control_register_r, apollo_csr_control_register_w, 0xffffffff) AM_RANGE(0x010200, 0x0102ff) AM_READWRITE8(cache_status_register_r, cache_control_register_w, 0xffffffff ) AM_RANGE(0x010300, 0x0103ff) AM_READWRITE8(task_alias_register_r , task_alias_register_w , 0xffffffff ) - AM_RANGE(0x010400, 0x0104ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, duartn68681_device, read, write, 0x00ff00ff ) - AM_RANGE(0x010500, 0x0105ff) AM_DEVREADWRITE8(APOLLO_SIO2_TAG, duartn68681_device, read, write, 0x00ff00ff ) + AM_RANGE(0x010400, 0x0104ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, mc68681_device, read, write, 0x00ff00ff ) + AM_RANGE(0x010500, 0x0105ff) AM_DEVREADWRITE8(APOLLO_SIO2_TAG, mc68681_device, read, write, 0x00ff00ff ) AM_RANGE(0x010800, 0x0108ff) AM_DEVREADWRITE8(APOLLO_PTM_TAG, ptm6840_device, read, write, 0x00ff00ff ) AM_RANGE(0x010900, 0x0109ff) AM_READWRITE8(apollo_rtc_r, apollo_rtc_w, 0xffffffff ) AM_RANGE(0x010c00, 0x010cff) AM_READWRITE8(/*"dma1",*/apollo_dma_1_r, apollo_dma_1_w, 0xffffffff ) @@ -751,7 +751,7 @@ static ADDRESS_MAP_START(dn3000_map, AS_PROGRAM, 32, apollo_state ) AM_RANGE(0x000000, 0x007fff) AM_WRITE(apollo_rom_w) AM_RANGE(0x008000, 0x0080ff) AM_READWRITE16(apollo_csr_status_register_r, apollo_csr_status_register_w, 0xffffffff) AM_RANGE(0x008100, 0x0081ff) AM_READWRITE16(apollo_csr_control_register_r, apollo_csr_control_register_w, 0xffffffff) - AM_RANGE(0x008400, 0x0087ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, duartn68681_device, read, write, 0x00ff00ff ) + AM_RANGE(0x008400, 0x0087ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, mc68681_device, read, write, 0x00ff00ff ) AM_RANGE(0x008800, 0x0088ff) AM_DEVREADWRITE8(APOLLO_PTM_TAG, ptm6840_device, read, write, 0x00ff00ff ) AM_RANGE(0x008900, 0x0089ff) AM_READWRITE8(apollo_rtc_r, apollo_rtc_w, 0xffffffff ) AM_RANGE(0x009000, 0x0090ff) AM_READWRITE8(/*"dma1",*/apollo_dma_1_r, apollo_dma_1_w, 0xffffffff ) @@ -786,7 +786,7 @@ static ADDRESS_MAP_START(dsp3000_map, AS_PROGRAM, 32, apollo_state ) AM_RANGE(0x000000, 0x007fff) AM_WRITE(apollo_rom_w) AM_RANGE(0x008000, 0x0080ff) AM_READWRITE16(apollo_csr_status_register_r, apollo_csr_status_register_w, 0xffffffff) AM_RANGE(0x008100, 0x0081ff) AM_READWRITE16(apollo_csr_control_register_r, apollo_csr_control_register_w, 0xffffffff) - AM_RANGE(0x008400, 0x0087ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, duartn68681_device, read, write, 0x00ff00ff ) + AM_RANGE(0x008400, 0x0087ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, mc68681_device, read, write, 0x00ff00ff ) AM_RANGE(0x008800, 0x0088ff) AM_DEVREADWRITE8(APOLLO_PTM_TAG, ptm6840_device, read, write, 0x00ff00ff ) AM_RANGE(0x008900, 0x0089ff) AM_READWRITE8(apollo_rtc_r, apollo_rtc_w, 0xffffffff ) @@ -819,8 +819,8 @@ static ADDRESS_MAP_START(dn5500_map, AS_PROGRAM, 32, apollo_state ) AM_RANGE(0x010100, 0x0101ff) AM_READWRITE16(apollo_csr_control_register_r, apollo_csr_control_register_w, 0xffffffff) AM_RANGE(0x010200, 0x0102ff) AM_READWRITE8(cache_status_register_r, cache_control_register_w, 0xffffffff ) AM_RANGE(0x010300, 0x0103ff) AM_READWRITE8(task_alias_register_r , task_alias_register_w , 0xffffffff ) - AM_RANGE(0x010400, 0x0104ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, duartn68681_device, read, write, 0x00ff00ff ) - AM_RANGE(0x010500, 0x0105ff) AM_DEVREADWRITE8(APOLLO_SIO2_TAG, duartn68681_device, read, write, 0x00ff00ff ) + AM_RANGE(0x010400, 0x0104ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, mc68681_device, read, write, 0x00ff00ff ) + AM_RANGE(0x010500, 0x0105ff) AM_DEVREADWRITE8(APOLLO_SIO2_TAG, mc68681_device, read, write, 0x00ff00ff ) AM_RANGE(0x010800, 0x0108ff) AM_DEVREADWRITE8(APOLLO_PTM_TAG, ptm6840_device, read, write, 0x00ff00ff ) AM_RANGE(0x010900, 0x0109ff) AM_READWRITE8(apollo_rtc_r, apollo_rtc_w, 0xffffffff ) AM_RANGE(0x010c00, 0x010cff) AM_READWRITE8(/*"dma1",*/apollo_dma_1_r, apollo_dma_1_w, 0xffffffff ) @@ -868,8 +868,8 @@ static ADDRESS_MAP_START(dsp5500_map, AS_PROGRAM, 32, apollo_state ) AM_RANGE(0x010100, 0x0101ff) AM_READWRITE16(apollo_csr_control_register_r, apollo_csr_control_register_w, 0xffffffff) AM_RANGE(0x010200, 0x0102ff) AM_READWRITE8(cache_status_register_r, cache_control_register_w, 0xffffffff ) AM_RANGE(0x010300, 0x0103ff) AM_READWRITE8(task_alias_register_r , task_alias_register_w , 0xffffffff ) - AM_RANGE(0x010400, 0x0104ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, duartn68681_device, read, write, 0x00ff00ff ) - AM_RANGE(0x010500, 0x0105ff) AM_DEVREADWRITE8(APOLLO_SIO2_TAG, duartn68681_device, read, write, 0x00ff00ff ) + AM_RANGE(0x010400, 0x0104ff) AM_DEVREADWRITE8(APOLLO_SIO_TAG, mc68681_device, read, write, 0x00ff00ff ) + AM_RANGE(0x010500, 0x0105ff) AM_DEVREADWRITE8(APOLLO_SIO2_TAG, mc68681_device, read, write, 0x00ff00ff ) AM_RANGE(0x010800, 0x0108ff) AM_DEVREADWRITE8(APOLLO_PTM_TAG, ptm6840_device, read, write, 0x00ff00ff ) AM_RANGE(0x010900, 0x0109ff) AM_READWRITE8(apollo_rtc_r, apollo_rtc_w, 0xffffffff ) AM_RANGE(0x010c00, 0x010cff) AM_READWRITE8(/*"dma1",*/apollo_dma_1_r, apollo_dma_1_w, 0xffffffff ) @@ -1100,7 +1100,7 @@ static MACHINE_CONFIG_DERIVED( dn3500_19i, dn3500 ) /* video hardware 19" monochrome */ MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) - MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, duartn68681_device, rx_a_w)) + MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) MACHINE_CONFIG_END @@ -1108,7 +1108,7 @@ static MACHINE_CONFIG_DERIVED( dn3500_15i, dn3500 ) /* video hardware is 15" monochrome or color */ MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) - MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, duartn68681_device, rx_a_w)) + MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) MACHINE_CONFIG_END @@ -1149,7 +1149,7 @@ static MACHINE_CONFIG_DERIVED( dn3000_19i, dn3000 ) /* video hardware 19" monochrome */ MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) - MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, duartn68681_device, rx_a_w)) + MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) MACHINE_CONFIG_END @@ -1157,7 +1157,7 @@ static MACHINE_CONFIG_DERIVED( dn3000_15i, dn3000 ) /* video hardware 15" monochrome */ MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) - MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, duartn68681_device, rx_a_w)) + MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) MACHINE_CONFIG_END @@ -1186,7 +1186,7 @@ static MACHINE_CONFIG_DERIVED( dn5500_19i, dn5500 ) /* video hardware 19" monochrome */ MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) - MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, duartn68681_device, rx_a_w)) + MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) MACHINE_CONFIG_END @@ -1194,7 +1194,7 @@ static MACHINE_CONFIG_DERIVED( dn5500_15i, dn5500 ) /* video hardware 15" monochrome */ MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) - MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, duartn68681_device, rx_a_w)) + MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_a_w)) MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) MACHINE_CONFIG_END diff --git a/src/mess/drivers/cat.c b/src/mess/drivers/cat.c index 30ad30b4151..7a6de90ff0d 100644 --- a/src/mess/drivers/cat.c +++ b/src/mess/drivers/cat.c @@ -365,7 +365,7 @@ ToDo: #include "emu.h" #include "cpu/m68000/m68000.h" #include "machine/clock.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" #include "machine/6850acia.h" #include "machine/6522via.h" #include "machine/nvram.h" @@ -409,7 +409,7 @@ public: required_device<cpu_device> m_maincpu; //optional_device<nvram_device> m_nvram; - optional_device<duartn68681_device> m_duart; // only cat uses this + optional_device<mc68681_device> m_duart; // only cat uses this optional_device<centronics_device> m_ctx; optional_device<output_latch_device> m_ctx_data_out; optional_device<acia6850_device> m_acia6850; // only swyft uses this @@ -939,8 +939,8 @@ static ADDRESS_MAP_START(cat_mem, AS_PROGRAM, 16, cat_state) AM_RANGE(0x80000c, 0x80000d) AM_READ(cat_0080_r) AM_MIRROR(0x18FFE0) // Open bus? AM_RANGE(0x80000e, 0x80000f) AM_READWRITE(cat_battery_r,cat_printer_control_w) AM_MIRROR(0x18FFE0) // Centronics Printer Control, keyboard led and country code enable AM_RANGE(0x800010, 0x80001f) AM_READ(cat_0080_r) AM_MIRROR(0x18FFE0) // Open bus? - //AM_RANGE(0x810000, 0x81001f) AM_DEVREADWRITE8("duartn68681", duartn68681_device, read, write, 0xff00 ) AM_MIRROR(0x18FFE0) - AM_RANGE(0x810000, 0x81001f) AM_DEVREADWRITE8("duartn68681", duartn68681_device, read, write, 0xff ) AM_MIRROR(0x18FFE0) + //AM_RANGE(0x810000, 0x81001f) AM_DEVREADWRITE8("duartn68681", mc68681_device, read, write, 0xff00 ) AM_MIRROR(0x18FFE0) + AM_RANGE(0x810000, 0x81001f) AM_DEVREADWRITE8("duartn68681", mc68681_device, read, write, 0xff ) AM_MIRROR(0x18FFE0) AM_RANGE(0x820000, 0x82003f) AM_READWRITE(cat_modem_r,cat_modem_w) AM_MIRROR(0x18FFC0) // AMI S35213 Modem Chip, all access is on bit 7 AM_RANGE(0x830000, 0x830001) AM_READ(cat_6ms_counter_r) AM_MIRROR(0x18FFFE) // 16bit 6ms counter clocked by output of another 16bit counter clocked at 10mhz AM_RANGE(0x840000, 0x840001) AM_READWRITE(cat_2e80_r,cat_opr_w) AM_MIRROR(0x18FFFE) // GA2 Output port register (video enable, invert, watchdog reset, phone relays) @@ -1239,15 +1239,15 @@ static MACHINE_CONFIG_START( cat, cat_state ) MCFG_VIDEO_START_OVERRIDE(cat_state,cat) - MCFG_DUARTN68681_ADD( "duartn68681", (XTAL_19_968MHz*2)/11 ) // duart is normally clocked by 3.6864mhz xtal, but cat seemingly uses a divider from the main xtal instead which probably yields 3.63054545Mhz. There is a trace to cut and a mounting area to allow using an actual 3.6864mhz xtal if you so desire - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(cat_state, cat_duart_irq_handler)) - MCFG_DUARTN68681_A_TX_CALLBACK(WRITELINE(cat_state, cat_duart_txa)) - MCFG_DUARTN68681_B_TX_CALLBACK(WRITELINE(cat_state, cat_duart_txb)) - MCFG_DUARTN68681_OUTPORT_CALLBACK(WRITE8(cat_state, cat_duart_output)) + MCFG_MC68681_ADD( "duartn68681", (XTAL_19_968MHz*2)/11 ) // duart is normally clocked by 3.6864mhz xtal, but cat seemingly uses a divider from the main xtal instead which probably yields 3.63054545Mhz. There is a trace to cut and a mounting area to allow using an actual 3.6864mhz xtal if you so desire + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(cat_state, cat_duart_irq_handler)) + MCFG_MC68681_A_TX_CALLBACK(WRITELINE(cat_state, cat_duart_txa)) + 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_ACK_HANDLER(WRITELINE(cat_state, prn_ack_ff)) - MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("duartn68681", duartn68681_device, ip4_w)) MCFG_DEVCB_XOR(1) + MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("duartn68681", mc68681_device, ip4_w)) MCFG_DEVCB_XOR(1) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("ctx_data_out", "ctx") MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mess/drivers/dectalk.c b/src/mess/drivers/dectalk.c index 03cfb28d22e..6a78e8e8bc6 100644 --- a/src/mess/drivers/dectalk.c +++ b/src/mess/drivers/dectalk.c @@ -276,7 +276,7 @@ dgc (dg(no!spam)cx@mac.com) #include "bus/rs232/rs232.h" #include "cpu/m68000/m68000.h" #include "cpu/tms32010/tms32010.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" #include "machine/x2212.h" #include "sound/dac.h" @@ -323,7 +323,7 @@ public: required_device<m68000_base_device> m_maincpu; required_device<cpu_device> m_dsp; - required_device<duartn68681_device> m_duart; + required_device<mc68681_device> m_duart; required_device<x2212_device> m_nvram; required_device<dac_device> m_dac; DECLARE_WRITE_LINE_MEMBER(dectalk_duart_irq_handler); @@ -788,7 +788,7 @@ static ADDRESS_MAP_START(m68k_mem, AS_PROGRAM, 16, dectalk_state ) AM_RANGE(0x094000, 0x0943ff) AM_WRITE8(led_write, 0x00FF) AM_MIRROR(0x763C00) /* LED array */ AM_RANGE(0x094000, 0x0941ff) AM_DEVREADWRITE8("x2212", x2212_device, read, write, 0xFF00) AM_MIRROR(0x763C00) /* Xicor X2212 NVRAM */ AM_RANGE(0x094200, 0x0943ff) AM_READWRITE8(nvram_recall, nvram_store, 0xFF00) AM_MIRROR(0x763C00) /* Xicor X2212 NVRAM */ - AM_RANGE(0x098000, 0x09801f) AM_DEVREADWRITE8("duartn68681", duartn68681_device, read, write, 0xff ) AM_MIRROR(0x763FE0) /* DUART */ + AM_RANGE(0x098000, 0x09801f) AM_DEVREADWRITE8("duartn68681", mc68681_device, read, write, 0xff ) AM_MIRROR(0x763FE0) /* DUART */ AM_RANGE(0x09C000, 0x09C001) AM_READWRITE(m68k_spcflags_r, m68k_spcflags_w) AM_MIRROR(0x763FF8) /* SPC flags reg */ AM_RANGE(0x09C002, 0x09C003) AM_WRITE(m68k_infifo_w) AM_MIRROR(0x763FF8) /* SPC fifo reg */ AM_RANGE(0x09C004, 0x09C005) AM_READWRITE(m68k_tlcflags_r, m68k_tlcflags_w) AM_MIRROR(0x763FF8) /* telephone status flags */ @@ -881,12 +881,12 @@ static MACHINE_CONFIG_START( dectalk, dectalk_state ) MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* E74 20MHz OSC (/2) */ MCFG_CPU_PROGRAM_MAP(m68k_mem) MCFG_CPU_IO_MAP(m68k_io) - MCFG_DUARTN68681_ADD( "duartn68681", XTAL_3_6864MHz ) /* 2681 duart (not 68681!); Y3 3.6864MHz Xtal */ - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(dectalk_state, dectalk_duart_irq_handler)) - MCFG_DUARTN68681_A_TX_CALLBACK(WRITELINE(dectalk_state, dectalk_duart_txa)) - MCFG_DUARTN68681_B_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd)) - MCFG_DUARTN68681_INPORT_CALLBACK(READ8(dectalk_state, dectalk_duart_input)) - MCFG_DUARTN68681_OUTPORT_CALLBACK(WRITE8(dectalk_state, dectalk_duart_output)) + MCFG_MC68681_ADD( "duartn68681", XTAL_3_6864MHz ) /* 2681 duart (not 68681!); Y3 3.6864MHz Xtal */ + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(dectalk_state, dectalk_duart_irq_handler)) + MCFG_MC68681_A_TX_CALLBACK(WRITELINE(dectalk_state, dectalk_duart_txa)) + MCFG_MC68681_B_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd)) + MCFG_MC68681_INPORT_CALLBACK(READ8(dectalk_state, dectalk_duart_input)) + MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(dectalk_state, dectalk_duart_output)) MCFG_CPU_ADD("dsp", TMS32010, XTAL_20MHz) /* Y1 20MHz xtal */ MCFG_CPU_PROGRAM_MAP(tms32010_mem) @@ -909,7 +909,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_RXD_HANDLER(DEVWRITELINE("duartn68681", duartn68681_device, rx_b_w)) + MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duartn68681", mc68681_device, rx_b_w)) MACHINE_CONFIG_END diff --git a/src/mess/drivers/esq1.c b/src/mess/drivers/esq1.c index 77834ad5835..6562dcd9d1c 100644 --- a/src/mess/drivers/esq1.c +++ b/src/mess/drivers/esq1.c @@ -181,7 +181,7 @@ NOTES: #include "bus/midi/midi.h" #include "cpu/m6809/m6809.h" #include "sound/es5503.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" #include "machine/wd_fdc.h" #include "machine/esqpanel.h" @@ -391,7 +391,7 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<duartn68681_device> m_duart; + required_device<mc68681_device> m_duart; required_device<esq1_filters> m_filters; optional_device<wd1772_t> m_fdc; optional_device<esqpanel2x40_device> m_panel; @@ -495,7 +495,7 @@ static ADDRESS_MAP_START( esq1_map, AS_PROGRAM, 8, esq1_state ) AM_RANGE(0x0000, 0x1fff) AM_RAM // OSRAM AM_RANGE(0x4000, 0x5fff) AM_RAM // SEQRAM AM_RANGE(0x6000, 0x63ff) AM_DEVREADWRITE("es5503", es5503_device, read, write) - AM_RANGE(0x6400, 0x640f) AM_DEVREADWRITE("duart", duartn68681_device, read, write) + AM_RANGE(0x6400, 0x640f) AM_DEVREADWRITE("duart", mc68681_device, read, write) AM_RANGE(0x6800, 0x68ff) AM_WRITE(analog_w) AM_RANGE(0x7000, 0x7fff) AM_ROMBANK("osbank") AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("osrom", 0x8000) // OS "high" ROM is always mapped here @@ -506,7 +506,7 @@ static ADDRESS_MAP_START( sq80_map, AS_PROGRAM, 8, esq1_state ) AM_RANGE(0x4000, 0x5fff) AM_RAM // SEQRAM // AM_RANGE(0x4000, 0x5fff) AM_READWRITE(seqdosram_r, seqdosram_w) AM_RANGE(0x6000, 0x63ff) AM_DEVREADWRITE("es5503", es5503_device, read, write) - AM_RANGE(0x6400, 0x640f) AM_DEVREADWRITE("duart", duartn68681_device, read, write) + AM_RANGE(0x6400, 0x640f) AM_DEVREADWRITE("duart", mc68681_device, read, write) AM_RANGE(0x6800, 0x68ff) AM_WRITE(analog_w) AM_RANGE(0x6c00, 0x6dff) AM_WRITE(mapper_w) AM_RANGE(0x6e00, 0x6fff) AM_READWRITE(wd1772_r, wd1772_w) @@ -578,24 +578,24 @@ INPUT_CHANGED_MEMBER(esq1_state::key_stroke) static const esqpanel_interface esqpanel_config = { - DEVCB_DEVICE_LINE_MEMBER("duart", duartn68681_device, rx_b_w) + DEVCB_DEVICE_LINE_MEMBER("duart", mc68681_device, rx_b_w) }; static MACHINE_CONFIG_START( esq1, esq1_state ) MCFG_CPU_ADD("maincpu", M6809E, 4000000) // how fast is it? MCFG_CPU_PROGRAM_MAP(esq1_map) - MCFG_DUARTN68681_ADD("duart", 4000000) - MCFG_DUARTN68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(esq1_state, duart_irq_handler)) - MCFG_DUARTN68681_A_TX_CALLBACK(WRITELINE(esq1_state, duart_tx_a)) - MCFG_DUARTN68681_B_TX_CALLBACK(WRITELINE(esq1_state, duart_tx_b)) - MCFG_DUARTN68681_OUTPORT_CALLBACK(WRITE8(esq1_state, duart_output)) + MCFG_MC68681_ADD("duart", 4000000) + MCFG_MC68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(esq1_state, duart_irq_handler)) + MCFG_MC68681_A_TX_CALLBACK(WRITELINE(esq1_state, duart_tx_a)) + MCFG_MC68681_B_TX_CALLBACK(WRITELINE(esq1_state, duart_tx_b)) + MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(esq1_state, duart_output)) MCFG_ESQPANEL2x40_ADD("panel", esqpanel_config) MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin") - MCFG_MIDI_RX_HANDLER(DEVWRITELINE("duart", duartn68681_device, rx_a_w)) // route MIDI Tx send directly to 68681 channel A Rx + MCFG_MIDI_RX_HANDLER(DEVWRITELINE("duart", mc68681_device, rx_a_w)) // route MIDI Tx send directly to 68681 channel A Rx MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout") diff --git a/src/mess/drivers/esq5505.c b/src/mess/drivers/esq5505.c index b8057e418d5..4532090928f 100644 --- a/src/mess/drivers/esq5505.c +++ b/src/mess/drivers/esq5505.c @@ -130,7 +130,7 @@ #include "cpu/m68000/m68000.h" #include "sound/es5506.h" #include "sound/esqpump.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" #include "cpu/es5510/es5510.h" #include "machine/wd_fdc.h" #include "machine/hd63450.h" // compatible with MC68450, which is what these really have @@ -175,7 +175,7 @@ public: { } required_device<m68000_device> m_maincpu; - required_device<duartn68681_device> m_duart; + required_device<mc68681_device> m_duart; required_device<es5505_device> m_otis; required_device<es5510_device> m_esp; required_device<esq_5505_5510_pump> m_pump; @@ -373,7 +373,7 @@ WRITE16_MEMBER(esq5505_state::lower_w) static ADDRESS_MAP_START( vfx_map, AS_PROGRAM, 16, esq5505_state ) AM_RANGE(0x000000, 0x007fff) AM_READWRITE(lower_r, lower_w) AM_RANGE(0x200000, 0x20001f) AM_DEVREADWRITE("otis", es5505_device, read, write) - AM_RANGE(0x280000, 0x28001f) AM_DEVREADWRITE8("duart", duartn68681_device, read, write, 0x00ff) + AM_RANGE(0x280000, 0x28001f) AM_DEVREADWRITE8("duart", mc68681_device, read, write, 0x00ff) AM_RANGE(0x260000, 0x2601ff) AM_DEVREADWRITE8("esp", es5510_device, host_r, host_w, 0x00ff) AM_RANGE(0xc00000, 0xc1ffff) AM_ROM AM_REGION("osrom", 0) AM_RANGE(0xff0000, 0xffffff) AM_RAM AM_SHARE("osram") @@ -382,7 +382,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( vfxsd_map, AS_PROGRAM, 16, esq5505_state ) AM_RANGE(0x000000, 0x00ffff) AM_READWRITE(lower_r, lower_w) AM_RANGE(0x200000, 0x20001f) AM_DEVREADWRITE("otis", es5505_device, read, write) - AM_RANGE(0x280000, 0x28001f) AM_DEVREADWRITE8("duart", duartn68681_device, read, write, 0x00ff) + AM_RANGE(0x280000, 0x28001f) AM_DEVREADWRITE8("duart", mc68681_device, read, write, 0x00ff) AM_RANGE(0x260000, 0x2601ff) AM_DEVREADWRITE8("esp", es5510_device, host_r, host_w, 0x00ff) AM_RANGE(0x2c0000, 0x2c0007) AM_DEVREADWRITE8("wd1772", wd1772_t, read, write, 0x00ff) AM_RANGE(0x330000, 0x3bffff) AM_RAM // sequencer memory? @@ -394,7 +394,7 @@ static ADDRESS_MAP_START( eps_map, AS_PROGRAM, 16, esq5505_state ) AM_RANGE(0x000000, 0x007fff) AM_READWRITE(lower_r, lower_w) AM_RANGE(0x200000, 0x20001f) AM_DEVREADWRITE("otis", es5505_device, read, write) AM_RANGE(0x240000, 0x2400ff) AM_DEVREADWRITE_LEGACY("mc68450", hd63450_r, hd63450_w) - AM_RANGE(0x280000, 0x28001f) AM_DEVREADWRITE8("duart", duartn68681_device, read, write, 0x00ff) + AM_RANGE(0x280000, 0x28001f) AM_DEVREADWRITE8("duart", mc68681_device, read, write, 0x00ff) AM_RANGE(0x2c0000, 0x2c0007) AM_DEVREADWRITE8("wd1772", wd1772_t, read, write, 0x00ff) AM_RANGE(0x580000, 0x7fffff) AM_RAM // sample RAM? AM_RANGE(0xc00000, 0xc1ffff) AM_ROM AM_REGION("osrom", 0) @@ -405,7 +405,7 @@ static ADDRESS_MAP_START( sq1_map, AS_PROGRAM, 16, esq5505_state ) AM_RANGE(0x000000, 0x03ffff) AM_READWRITE(lower_r, lower_w) AM_RANGE(0x200000, 0x20001f) AM_DEVREADWRITE("otis", es5505_device, read, write) AM_RANGE(0x260000, 0x2601ff) AM_DEVREADWRITE8("esp", es5510_device, host_r, host_w, 0x0ff) - AM_RANGE(0x280000, 0x28001f) AM_DEVREADWRITE8("duart", duartn68681_device, read, write, 0x00ff) + AM_RANGE(0x280000, 0x28001f) AM_DEVREADWRITE8("duart", mc68681_device, read, write, 0x00ff) AM_RANGE(0x330000, 0x3bffff) AM_RAM // sequencer memory? AM_RANGE(0xc00000, 0xc3ffff) AM_ROM AM_REGION("osrom", 0) AM_RANGE(0xff0000, 0xffffff) AM_RAM AM_SHARE("osram") @@ -626,7 +626,7 @@ static const es5505_interface es5505_config = static const esqpanel_interface esqpanel_config = { - DEVCB_DEVICE_LINE_MEMBER("duart", duartn68681_device, rx_b_w), + DEVCB_DEVICE_LINE_MEMBER("duart", mc68681_device, rx_b_w), DEVCB_DRIVER_MEMBER16(esq5505_state, analog_w) }; @@ -639,15 +639,15 @@ static MACHINE_CONFIG_START( vfx, esq5505_state ) MCFG_ESQPANEL2x40_ADD("panel", esqpanel_config) - MCFG_DUARTN68681_ADD("duart", 4000000) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(esq5505_state, duart_irq_handler)) - MCFG_DUARTN68681_A_TX_CALLBACK(WRITELINE(esq5505_state, duart_tx_a)) - MCFG_DUARTN68681_B_TX_CALLBACK(WRITELINE(esq5505_state, duart_tx_b)) - MCFG_DUARTN68681_OUTPORT_CALLBACK(WRITE8(esq5505_state, duart_output)) - MCFG_DUARTN68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000) + MCFG_MC68681_ADD("duart", 4000000) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(esq5505_state, duart_irq_handler)) + MCFG_MC68681_A_TX_CALLBACK(WRITELINE(esq5505_state, duart_tx_a)) + MCFG_MC68681_B_TX_CALLBACK(WRITELINE(esq5505_state, duart_tx_b)) + MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(esq5505_state, duart_output)) + MCFG_MC68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000) MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin") - MCFG_MIDI_RX_HANDLER(DEVWRITELINE("duart", duartn68681_device, rx_a_w)) // route MIDI Tx send directly to 68681 channel A Rx + MCFG_MIDI_RX_HANDLER(DEVWRITELINE("duart", mc68681_device, rx_a_w)) // route MIDI Tx send directly to 68681 channel A Rx MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout") @@ -700,15 +700,15 @@ static MACHINE_CONFIG_START(vfx32, esq5505_state) MCFG_ESQPANEL2x40_ADD("panel", esqpanel_config) - MCFG_DUARTN68681_ADD("duart", 4000000) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(esq5505_state, duart_irq_handler)) - MCFG_DUARTN68681_A_TX_CALLBACK(WRITELINE(esq5505_state, duart_tx_a)) - MCFG_DUARTN68681_B_TX_CALLBACK(WRITELINE(esq5505_state, duart_tx_b)) - MCFG_DUARTN68681_OUTPORT_CALLBACK(WRITE8(esq5505_state, duart_output)) - MCFG_DUARTN68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000) + MCFG_MC68681_ADD("duart", 4000000) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(esq5505_state, duart_irq_handler)) + MCFG_MC68681_A_TX_CALLBACK(WRITELINE(esq5505_state, duart_tx_a)) + MCFG_MC68681_B_TX_CALLBACK(WRITELINE(esq5505_state, duart_tx_b)) + MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(esq5505_state, duart_output)) + MCFG_MC68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000) MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin") - MCFG_MIDI_RX_HANDLER(DEVWRITELINE("duart", duartn68681_device, rx_a_w)) // route MIDI Tx send directly to 68681 channel A Rx + MCFG_MIDI_RX_HANDLER(DEVWRITELINE("duart", mc68681_device, rx_a_w)) // route MIDI Tx send directly to 68681 channel A Rx MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout") diff --git a/src/mess/drivers/esqkt.c b/src/mess/drivers/esqkt.c index 442ed018a85..c902c12ec71 100644 --- a/src/mess/drivers/esqkt.c +++ b/src/mess/drivers/esqkt.c @@ -25,7 +25,7 @@ #include "cpu/m68000/m68000.h" #include "cpu/es5510/es5510.h" #include "sound/es5506.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" #include "machine/esqpanel.h" class esqkt_state : public driver_device @@ -42,7 +42,7 @@ public: required_device<m68ec020_device> m_maincpu; required_device<es5510_device> m_esp; - required_device<duartn68681_device> m_duart; + required_device<mc68681_device> m_duart; required_device<esqpanel2x40_sq1_device> m_sq1panel; required_device<midi_port_device> m_mdout; @@ -128,7 +128,7 @@ static ADDRESS_MAP_START( kt_map, AS_PROGRAM, 32, esqkt_state ) AM_RANGE(0x200000, 0x20003f) AM_DEVREADWRITE8("ensoniq", es5506_device, read, write, 0xffffffff) AM_RANGE(0x240000, 0x24003f) AM_DEVREADWRITE8("ensoniq2", es5506_device, read, write, 0xffffffff) AM_RANGE(0x280000, 0x2801ff) AM_DEVREADWRITE8("esp", es5510_device, host_r, host_w, 0xffffffff) - AM_RANGE(0x300000, 0x30001f) AM_DEVREADWRITE8("duart", duartn68681_device, read, write, 0xffffffff) + AM_RANGE(0x300000, 0x30001f) AM_DEVREADWRITE8("duart", mc68681_device, read, write, 0xffffffff) AM_RANGE(0xff0000, 0xffffff) AM_RAM AM_SHARE("osram") ADDRESS_MAP_END @@ -209,7 +209,7 @@ static const es5506_interface es5506_2_config = static const esqpanel_interface esqpanel_config = { - DEVCB_DEVICE_LINE_MEMBER("duart", duartn68681_device, rx_b_w) + DEVCB_DEVICE_LINE_MEMBER("duart", mc68681_device, rx_b_w) }; static MACHINE_CONFIG_START( kt, esqkt_state ) @@ -221,16 +221,16 @@ static MACHINE_CONFIG_START( kt, esqkt_state ) MCFG_ESQPANEL2x40_SQ1_ADD("sq1panel", esqpanel_config) - MCFG_DUARTN68681_ADD("duart", 4000000) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(esqkt_state, duart_irq_handler)) - MCFG_DUARTN68681_A_TX_CALLBACK(WRITELINE(esqkt_state, duart_tx_a)) - MCFG_DUARTN68681_B_TX_CALLBACK(WRITELINE(esqkt_state, duart_tx_b)) - MCFG_DUARTN68681_OUTPORT_CALLBACK(WRITE8(esqkt_state, duart_output)) - MCFG_DUARTN68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000) - MCFG_DUARTN68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000) + MCFG_MC68681_ADD("duart", 4000000) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(esqkt_state, duart_irq_handler)) + MCFG_MC68681_A_TX_CALLBACK(WRITELINE(esqkt_state, duart_tx_a)) + MCFG_MC68681_B_TX_CALLBACK(WRITELINE(esqkt_state, duart_tx_b)) + MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(esqkt_state, duart_output)) + MCFG_MC68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000) + MCFG_MC68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000) MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin") - MCFG_MIDI_RX_HANDLER(DEVWRITELINE("duart", duartn68681_device, rx_a_w)) // route MIDI Tx send directly to 68681 channel A Rx + MCFG_MIDI_RX_HANDLER(DEVWRITELINE("duart", mc68681_device, rx_a_w)) // route MIDI Tx send directly to 68681 channel A Rx MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout") diff --git a/src/mess/drivers/ht68k.c b/src/mess/drivers/ht68k.c index ebb381cea9f..96c4e31117c 100644 --- a/src/mess/drivers/ht68k.c +++ b/src/mess/drivers/ht68k.c @@ -28,7 +28,7 @@ Lot of infos available at: http://www.classiccmp.org/cini/ht68k.htm #include "bus/rs232/rs232.h" #include "cpu/m68000/m68000.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" #include "machine/wd_fdc.h" class ht68k_state : public driver_device @@ -49,7 +49,7 @@ public: } required_device<cpu_device> m_maincpu; - required_device<duartn68681_device> m_duart; + required_device<mc68681_device> m_duart; required_device<wd1770_t> m_fdc; required_device<floppy_connector> m_floppy0; required_device<floppy_connector> m_floppy1; @@ -70,7 +70,7 @@ static ADDRESS_MAP_START(ht68k_mem, AS_PROGRAM, 16, ht68k_state) //AM_RANGE(0x00080000, 0x000fffff) // Expansion //AM_RANGE(0x00d80000, 0x00d8ffff) // Printer AM_RANGE(0x00e00000, 0x00e00007) AM_MIRROR(0xfff8) AM_DEVREADWRITE8("wd1770", wd1770_t, read, write, 0x00ff) // FDC WD1770 - AM_RANGE(0x00e80000, 0x00e800ff) AM_MIRROR(0xff00) AM_DEVREADWRITE8("duart68681", duartn68681_device, read, write, 0xff ) + AM_RANGE(0x00e80000, 0x00e800ff) AM_MIRROR(0xff00) AM_DEVREADWRITE8("duart68681", mc68681_device, read, write, 0xff ) AM_RANGE(0x00f00000, 0x00f07fff) AM_ROM AM_MIRROR(0xf8000) AM_REGION("user1",0) ADDRESS_MAP_END @@ -125,15 +125,15 @@ static MACHINE_CONFIG_START( ht68k, ht68k_state ) MCFG_CPU_PROGRAM_MAP(ht68k_mem) /* video hardware */ - MCFG_DUARTN68681_ADD( "duart68681", XTAL_8MHz / 2 ) - MCFG_DUARTN68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(ht68k_state, duart_irq_handler)) - MCFG_DUARTN68681_A_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd)) - MCFG_DUARTN68681_B_TX_CALLBACK(WRITELINE(ht68k_state, duart_txb)) - MCFG_DUARTN68681_OUTPORT_CALLBACK(WRITE8(ht68k_state, duart_output)) + MCFG_MC68681_ADD( "duart68681", XTAL_8MHz / 2 ) + MCFG_MC68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(ht68k_state, duart_irq_handler)) + MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd)) + 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_RXD_HANDLER(DEVWRITELINE("duart68681", duartn68681_device, rx_a_w)) + MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart68681", mc68681_device, rx_a_w)) MCFG_WD1770x_ADD("wd1770", XTAL_8MHz ) diff --git a/src/mess/drivers/pt68k4.c b/src/mess/drivers/pt68k4.c index b06afd5005d..b94f9ad3871 100644 --- a/src/mess/drivers/pt68k4.c +++ b/src/mess/drivers/pt68k4.c @@ -44,7 +44,7 @@ TODO: 68230 device. Better hardware documentation would be nice too, and workin #include "emu.h" #include "cpu/m68000/m68000.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" #include "machine/timekpr.h" #include "machine/pc_fdc.h" #include "formats/imd_dsk.h" @@ -92,8 +92,8 @@ private: virtual void machine_reset(); required_shared_ptr<UINT16> m_p_base; required_device<cpu_device> m_maincpu; - required_device<duartn68681_device> m_duart1; - required_device<duartn68681_device> m_duart2; + required_device<mc68681_device> m_duart1; + required_device<mc68681_device> m_duart2; required_device<isa8_device> m_isa; required_device<speaker_sound_device> m_speaker; @@ -154,8 +154,8 @@ static ADDRESS_MAP_START(pt68k4_mem, AS_PROGRAM, 16, pt68k4_state) AM_RANGE(0xf80000, 0xf8ffff) AM_ROM AM_REGION("roms", 0) AM_RANGE(0xc00000, 0xdfffff) AM_DEVREADWRITE8(ISABUS_TAG, isa8_device, prog_r, prog_w, 0x00ff) AM_RANGE(0xfa0000, 0xfbffff) AM_DEVREADWRITE8(ISABUS_TAG, isa8_device, io_r, io_w, 0x00ff) - AM_RANGE(0xfe0000, 0xfe001f) AM_DEVREADWRITE8(DUART1_TAG, duartn68681_device, read, write, 0x00ff) - AM_RANGE(0xfe0040, 0xfe005f) AM_DEVREADWRITE8(DUART2_TAG, duartn68681_device, read, write, 0x00ff) + AM_RANGE(0xfe0000, 0xfe001f) AM_DEVREADWRITE8(DUART1_TAG, mc68681_device, read, write, 0x00ff) + AM_RANGE(0xfe0040, 0xfe005f) AM_DEVREADWRITE8(DUART2_TAG, mc68681_device, read, write, 0x00ff) AM_RANGE(0xfe01c0, 0xfe01c3) AM_READWRITE8(keyboard_r, keyboard_w, 0x00ff) AM_RANGE(0xff0000, 0xff0fff) AM_READWRITE8(hiram_r, hiram_w, 0xff00) AM_RANGE(0xff0000, 0xff0fff) AM_DEVREADWRITE8(TIMEKEEPER_TAG, timekeeper_device, read, write, 0x00ff) @@ -263,11 +263,11 @@ static MACHINE_CONFIG_START( pt68k4, pt68k4_state ) MCFG_CPU_PROGRAM_MAP(pt68k4_mem) // add the DUARTS. first one has the console on channel A at 19200. - MCFG_DUARTN68681_ADD("duart1", XTAL_16MHz / 4) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(pt68k4_state, duart1_irq)) - MCFG_DUARTN68681_OUTPORT_CALLBACK(WRITE8(pt68k4_state, duart1_out)) + MCFG_MC68681_ADD("duart1", XTAL_16MHz / 4) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(pt68k4_state, duart1_irq)) + MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(pt68k4_state, duart1_out)) - MCFG_DUARTN68681_ADD("duart2", XTAL_16MHz / 4) + MCFG_MC68681_ADD("duart2", XTAL_16MHz / 4) MCFG_PC_KBDC_ADD(KBDC_TAG, pc_kbdc_intf) MCFG_PC_KBDC_SLOT_ADD(KBDC_TAG, "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83) diff --git a/src/mess/drivers/sgi_ip2.c b/src/mess/drivers/sgi_ip2.c index b14f6b9e83b..5cf048493fc 100644 --- a/src/mess/drivers/sgi_ip2.c +++ b/src/mess/drivers/sgi_ip2.c @@ -40,7 +40,7 @@ #include "sound/dac.h" #include "cpu/m68000/m68000.h" #include "machine/mc146818.h" /* TOD clock */ -#include "machine/n68681.h" /* DUART0, DUART1 */ +#include "machine/mc68681.h" /* DUART0, DUART1 */ #include "bus/rs232/rs232.h" #include "machine/terminal.h" @@ -94,8 +94,8 @@ public: required_device<cpu_device> m_maincpu; protected: required_shared_ptr<UINT32> m_mainram; - required_device<duartn68681_device> m_duarta; - required_device<duartn68681_device> m_duartb; + required_device<mc68681_device> m_duarta; + required_device<mc68681_device> m_duartb; required_shared_ptr<UINT32> m_bss; required_shared_ptr<UINT32> m_ptmap; required_device<mc146818_device> m_rtc; @@ -378,8 +378,8 @@ static ADDRESS_MAP_START(sgi_ip2_map, AS_PROGRAM, 32, sgi_ip2_state ) AM_RANGE(0x30800000, 0x30800003) AM_READWRITE8(sgi_ip2_m_but_r, sgi_ip2_m_but_w, 0xffffffff) AM_RANGE(0x31000000, 0x31000003) AM_READWRITE16(sgi_ip2_m_quad_r, sgi_ip2_m_quad_w, 0xffffffff) AM_RANGE(0x31800000, 0x31800003) AM_READ16(sgi_ip2_swtch_r, 0xffffffff) - AM_RANGE(0x32000000, 0x3200000f) AM_DEVREADWRITE8("duart68681a", duartn68681_device, read, write, 0xffffffff) - AM_RANGE(0x32800000, 0x3280000f) AM_DEVREADWRITE8("duart68681b", duartn68681_device, read, write, 0xffffffff) + AM_RANGE(0x32000000, 0x3200000f) AM_DEVREADWRITE8("duart68681a", mc68681_device, read, write, 0xffffffff) + AM_RANGE(0x32800000, 0x3280000f) AM_DEVREADWRITE8("duart68681b", mc68681_device, read, write, 0xffffffff) AM_RANGE(0x33000000, 0x330007ff) AM_RAM AM_RANGE(0x34000000, 0x34000003) AM_READWRITE8(sgi_ip2_clock_ctl_r, sgi_ip2_clock_ctl_w, 0xffffffff) AM_RANGE(0x35000000, 0x35000003) AM_READWRITE8(sgi_ip2_clock_data_r, sgi_ip2_clock_data_w, 0xffffffff) @@ -422,17 +422,17 @@ static MACHINE_CONFIG_START( sgi_ip2, sgi_ip2_state ) MCFG_CPU_ADD("maincpu", M68020, 16000000) MCFG_CPU_PROGRAM_MAP(sgi_ip2_map) - MCFG_DUARTN68681_ADD( "duart68681a", XTAL_3_6864MHz ) /* Y3 3.6864MHz Xtal ??? copy-over from dectalk */ - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(sgi_ip2_state, duarta_irq_handler)) - MCFG_DUARTN68681_B_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd)) + MCFG_MC68681_ADD( "duart68681a", XTAL_3_6864MHz ) /* Y3 3.6864MHz Xtal ??? copy-over from dectalk */ + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(sgi_ip2_state, duarta_irq_handler)) + MCFG_MC68681_B_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd)) - MCFG_DUARTN68681_ADD( "duart68681b", XTAL_3_6864MHz ) /* Y3 3.6864MHz Xtal ??? copy-over from dectalk */ - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(sgi_ip2_state, duartb_irq_handler)) + MCFG_MC68681_ADD( "duart68681b", XTAL_3_6864MHz ) /* Y3 3.6864MHz Xtal ??? copy-over from dectalk */ + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(sgi_ip2_state, duartb_irq_handler)) MCFG_MC146818_ADD( "rtc", XTAL_4_194304Mhz ) MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal") - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart68681a", duartn68681_device, rx_b_w)) + MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart68681a", mc68681_device, rx_b_w)) MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", ip2_terminal) /* sound hardware */ diff --git a/src/mess/includes/apollo.h b/src/mess/includes/apollo.h index d9ddf6eff83..75b6cc7fc47 100644 --- a/src/mess/includes/apollo.h +++ b/src/mess/includes/apollo.h @@ -21,7 +21,7 @@ #include "machine/terminal.h" #include "machine/ram.h" #include "machine/6840ptm.h" -#include "machine/n68681.h" +#include "machine/mc68681.h" #include "machine/am9517a.h" #include "machine/pic8259.h" #include "machine/mc146818.h" @@ -124,8 +124,8 @@ public: required_device<pic8259_device> m_pic8259_master; required_device<pic8259_device> m_pic8259_slave; required_device<ptm6840_device> m_ptm; - required_device<duartn68681_device> m_sio; - optional_device<duartn68681_device> m_sio2; + required_device<mc68681_device> m_sio; + optional_device<mc68681_device> m_sio2; required_device<mc146818_device> m_rtc; required_device<isa16_device> m_isa; diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c index f932a2e9c17..f30bee58d07 100644 --- a/src/mess/machine/apollo.c +++ b/src/mess/machine/apollo.c @@ -829,8 +829,8 @@ MACHINE_CONFIG_FRAGMENT( common ) MCFG_MC146818_ADD( APOLLO_RTC_TAG, XTAL_32_768kHz ) MCFG_MC146818_UTC( true ) - MCFG_DUARTN68681_ADD( APOLLO_SIO2_TAG, XTAL_3_6864MHz ) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(apollo_state, sio2_irq_handler)) + MCFG_MC68681_ADD( APOLLO_SIO2_TAG, XTAL_3_6864MHz ) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(apollo_state, sio2_irq_handler)) MCFG_ISA16_BUS_ADD(APOLLO_ISA_TAG, ":"MAINCPU, isabus_intf) MCFG_ISA16_BUS_CUSTOM_SPACES() @@ -847,10 +847,10 @@ MACHINE_CONFIG_END MACHINE_CONFIG_FRAGMENT( apollo ) MCFG_FRAGMENT_ADD(common) - MCFG_DUARTN68681_ADD( APOLLO_SIO_TAG, XTAL_3_6864MHz ) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(apollo_state, sio_irq_handler)) - MCFG_DUARTN68681_OUTPORT_CALLBACK(WRITE8(apollo_state, sio_output)) - MCFG_DUARTN68681_A_TX_CALLBACK(DEVWRITELINE(APOLLO_KBD_TAG, apollo_kbd_device, rx_w)) + MCFG_MC68681_ADD( APOLLO_SIO_TAG, XTAL_3_6864MHz ) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(apollo_state, sio_irq_handler)) + MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(apollo_state, sio_output)) + MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE(APOLLO_KBD_TAG, apollo_kbd_device, rx_w)) MACHINE_CONFIG_END static DEVICE_INPUT_DEFAULTS_START( apollo_terminal ) @@ -866,13 +866,13 @@ DEVICE_INPUT_DEFAULTS_END MACHINE_CONFIG_FRAGMENT( apollo_terminal ) MCFG_FRAGMENT_ADD(common) - MCFG_DUARTN68681_ADD( APOLLO_SIO_TAG, XTAL_3_6864MHz ) - MCFG_DUARTN68681_IRQ_CALLBACK(WRITELINE(apollo_state, sio_irq_handler)) - MCFG_DUARTN68681_OUTPORT_CALLBACK(WRITE8(apollo_state, sio_output)) - MCFG_DUARTN68681_B_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd)) + MCFG_MC68681_ADD( APOLLO_SIO_TAG, XTAL_3_6864MHz ) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(apollo_state, sio_irq_handler)) + 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_RXD_HANDLER(DEVWRITELINE(APOLLO_SIO_TAG, duartn68681_device, rx_b_w)) + MCFG_RS232_RXD_HANDLER(DEVWRITELINE(APOLLO_SIO_TAG, mc68681_device, rx_b_w)) MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", apollo_terminal) MACHINE_CONFIG_END |