@@ -125,6 +125,7 @@ class tek440x_state : public driver_device
125125 required_device<mc146818_device> m_rtc;
126126 required_device<ncr5385_device> m_scsi;
127127 required_device<input_merger_all_high_device> m_vint;
128+ required_device<mos6551_device> m_acia;
128129
129130 required_region_ptr<u16 > m_prom;
130131 required_shared_ptr<u16 > m_mainram;
@@ -341,7 +342,7 @@ void tek440x_state::physical_map(address_map &map)
341342 // 786000-787fff: spare
342343 map (0x788000 , 0x788000 ).w (FUNC (tek440x_state::sound_w));
343344 // 78a000-78bfff: NS32081 FPU
344- map (0x78c000 , 0x78c007 ).rw (" aica " , FUNC (mos6551_device::read), FUNC (mos6551_device::write)).umask16 (0xff00 );
345+ map (0x78c000 , 0x78c007 ).rw (m_acia , FUNC (mos6551_device::read), FUNC (mos6551_device::write)).umask16 (0xff00 );
345346 // 78e000-78ffff: spare
346347
347348 // 7a0000-7bffff peripheral board I/O
@@ -421,10 +422,10 @@ void tek440x_state::tek4404(machine_config &config)
421422 screen.screen_vblank ().set (m_vint, FUNC (input_merger_all_high_device::in_w<1 >));
422423 PALETTE (config, " palette" , palette_device::MONOCHROME );
423424
424- mos6551_device & aica ( MOS6551 (config, " aica " , 40_MHz_XTAL / 4 / 10 ) );
425- aica. set_xtal (1 .8432_MHz_XTAL);
426- aica. txd_handler ().set (" rs232" , FUNC (rs232_port_device::write_txd));
427- aica. irq_handler ().set_inputline (m_maincpu, M68K_IRQ_7 );
425+ MOS6551 (config, m_acia , 40_MHz_XTAL / 4 / 10 );
426+ m_acia-> set_xtal (1 .8432_MHz_XTAL);
427+ m_acia-> txd_handler ().set (" rs232" , FUNC (rs232_port_device::write_txd));
428+ m_acia-> irq_handler ().set_inputline (m_maincpu, M68K_IRQ_7 );
428429
429430 MC68681 (config, m_duart, 14 .7456_MHz_XTAL / 4 );
430431 m_duart->irq_cb ().set_inputline (m_maincpu, M68K_IRQ_5 ); // auto-vectored
@@ -456,10 +457,10 @@ void tek440x_state::tek4404(machine_config &config)
456457 m_scsi->irq ().set_inputline (m_maincpu, M68K_IRQ_3 );
457458
458459 rs232_port_device &rs232 (RS232_PORT (config, " rs232" , default_rs232_devices, nullptr ));
459- rs232.rxd_handler ().set (" aica " , FUNC (mos6551_device::write_rxd));
460- rs232.dcd_handler ().set (" aica " , FUNC (mos6551_device::write_dcd));
461- rs232.dsr_handler ().set (" aica " , FUNC (mos6551_device::write_dsr));
462- rs232.cts_handler ().set (" aica " , FUNC (mos6551_device::write_cts));
460+ rs232.rxd_handler ().set (m_acia , FUNC (mos6551_device::write_rxd));
461+ rs232.dcd_handler ().set (m_acia , FUNC (mos6551_device::write_dcd));
462+ rs232.dsr_handler ().set (m_acia , FUNC (mos6551_device::write_dsr));
463+ rs232.cts_handler ().set (m_acia , FUNC (mos6551_device::write_cts));
463464
464465 SPEAKER (config, " mono" ).front_center ();
465466
0 commit comments