summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/lsi
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/lsi')
-rw-r--r--src/mame/lsi/m3.cpp8
-rw-r--r--src/mame/lsi/octo_kbd.cpp8
-rw-r--r--src/mame/lsi/octo_kbd.h2
-rw-r--r--src/mame/lsi/octopus.cpp14
4 files changed, 16 insertions, 16 deletions
diff --git a/src/mame/lsi/m3.cpp b/src/mame/lsi/m3.cpp
index 33f094e80b5..0bf1af94e13 100644
--- a/src/mame/lsi/m3.cpp
+++ b/src/mame/lsi/m3.cpp
@@ -587,7 +587,7 @@ void m3_state::m3(machine_config &config)
m_maincpu->set_addrmap(AS_IO, &m3_state::io_map);
m_maincpu->set_daisy_config(daisy_chain);
- Z80CTC(config, m_ctc, 0); // unknown clock
+ Z80CTC(config, m_ctc); // unknown clock
m_ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
m_ctc->set_clk<0>(4.9152_MHz_XTAL / 4);
m_ctc->zc_callback<0>().set("usart", FUNC(i8251_device::write_txc));
@@ -599,7 +599,7 @@ void m3_state::m3(machine_config &config)
m_ppi[1]->out_pa_callback().set(FUNC(m3_state::ppi2_pa_w));
m_ppi[1]->in_pb_callback().set(FUNC(m3_state::ppi2_pb_r));
- i8251_device &usart(I8251(config, "usart", 0)); // unknown clock
+ i8251_device &usart(I8251(config, "usart")); // unknown clock
usart.txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
usart.rts_handler().set("rs232", FUNC(rs232_port_device::write_rts));
usart.dtr_handler().set("rs232", FUNC(rs232_port_device::write_dtr));
@@ -612,14 +612,14 @@ void m3_state::m3(machine_config &config)
// video hardware
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER, rgb_t::green()));
- screen.set_raw(21'840'000 / 2, 707, 0, 560, 309, 0, 240); // unknown clock, hand-tuned to ~50 fps
+ screen.set_raw(XTAL::u(21'840'000) / 2, 707, 0, 560, 309, 0, 240); // unknown clock, hand-tuned to ~50 fps
screen.set_screen_update("crtc", FUNC(mc6845_device::screen_update));
GFXDECODE(config, "gfxdecode", m_palette, chars);
PALETTE(config, m_palette, palette_device::MONOCHROME);
- mc6845_device &crtc(MC6845(config, "crtc", 21'840'000 / 2 / 7)); // unknown clock
+ mc6845_device &crtc(MC6845(config, "crtc", XTAL::u(21'840'000) / 2 / 7)); // unknown clock
crtc.set_screen("screen");
crtc.set_show_border_area(false);
crtc.set_char_width(7);
diff --git a/src/mame/lsi/octo_kbd.cpp b/src/mame/lsi/octo_kbd.cpp
index 16fed619365..ce70d2fe09f 100644
--- a/src/mame/lsi/octo_kbd.cpp
+++ b/src/mame/lsi/octo_kbd.cpp
@@ -6,8 +6,8 @@
#include "machine/keyboard.ipp"
-octopus_keyboard_device::octopus_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
- : buffered_rs232_device(mconfig, OCTOPUS_KEYBOARD, tag, owner, 0)
+octopus_keyboard_device::octopus_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock)
+ : buffered_rs232_device(mconfig, OCTOPUS_KEYBOARD, tag, owner)
, device_matrix_keyboard_interface(mconfig, *this, "LINE0", "LINE1", "LINE2", "LINE3", "LINE4", "LINE5", "LINE6", "LINE7", "LINE8", "LINE9", "LINEA", "LINEB", "LINEC", "LINED", "LINEE", "LINEF")
{
}
@@ -231,8 +231,8 @@ void octopus_keyboard_device::device_reset()
buffered_rs232_device::device_reset();
set_data_frame(1, 8, PARITY_NONE, STOP_BITS_1);
- set_rcv_rate(1200);
- set_tra_rate(9600);
+ set_rcv_rate(XTAL::u(1200));
+ set_tra_rate(XTAL::u(9600));
receive_register_reset();
transmit_register_reset();
diff --git a/src/mame/lsi/octo_kbd.h b/src/mame/lsi/octo_kbd.h
index 4ae05e47a7a..4307a958def 100644
--- a/src/mame/lsi/octo_kbd.h
+++ b/src/mame/lsi/octo_kbd.h
@@ -11,7 +11,7 @@
class octopus_keyboard_device : public buffered_rs232_device<16U>, protected device_matrix_keyboard_interface<16U>
{
public:
- octopus_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ octopus_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ioport_constructor device_input_ports() const override;
protected:
diff --git a/src/mame/lsi/octopus.cpp b/src/mame/lsi/octopus.cpp
index f4a40f893c2..c47f0858fff 100644
--- a/src/mame/lsi/octopus.cpp
+++ b/src/mame/lsi/octopus.cpp
@@ -929,17 +929,17 @@ void octopus_state::octopus(machine_config &config)
m_dma2->out_dack_callback<2>().set(FUNC(octopus_state::dack6_w));
m_dma2->out_dack_callback<3>().set(FUNC(octopus_state::dack7_w));
- PIC8259(config, m_pic1, 0);
+ PIC8259(config, m_pic1);
m_pic1->out_int_callback().set_inputline(m_maincpu, 0);
m_pic1->in_sp_callback().set_constant(1);
m_pic1->read_slave_ack_callback().set(FUNC(octopus_state::get_slave_ack));
- PIC8259(config, m_pic2, 0);
+ PIC8259(config, m_pic2);
m_pic2->out_int_callback().set(m_pic1, FUNC(pic8259_device::ir7_w));
m_pic2->in_sp_callback().set_constant(0);
// RTC (MC146818 via i8255 PPI)
- I8255(config, m_ppi, 0);
+ I8255(config, m_ppi);
m_ppi->in_pa_callback().set(FUNC(octopus_state::rtc_r));
m_ppi->in_pb_callback().set(FUNC(octopus_state::cntl_r));
m_ppi->in_pc_callback().set(FUNC(octopus_state::gpo_r));
@@ -951,15 +951,15 @@ void octopus_state::octopus(machine_config &config)
m_rtc->irq().set(m_pic2, FUNC(pic8259_device::ir2_w));
// Keyboard UART
- I8251(config, m_kb_uart, 0);
+ I8251(config, m_kb_uart);
m_kb_uart->rxrdy_handler().set("pic_slave", FUNC(pic8259_device::ir4_w));
m_kb_uart->dtr_handler().set(FUNC(octopus_state::spk_w));
m_kb_uart->rts_handler().set(FUNC(octopus_state::beep_w));
rs232_port_device &keyboard_port(RS232_PORT(config, "keyboard_port", keyboard, "octopus"));
keyboard_port.rxd_handler().set(m_kb_uart, FUNC(i8251_device::write_rxd));
- clock_device &keyboard_clock_rx(CLOCK(config, "keyboard_clock_rx", 9600 * 64));
+ clock_device &keyboard_clock_rx(CLOCK(config, "keyboard_clock_rx", XTAL::u(9600 * 64)));
keyboard_clock_rx.signal_handler().set(m_kb_uart, FUNC(i8251_device::write_rxc));
- clock_device &keyboard_clock_tx(CLOCK(config, "keyboard_clock_tx", 1200 * 64));
+ clock_device &keyboard_clock_tx(CLOCK(config, "keyboard_clock_tx", XTAL::u(1200 * 64)));
keyboard_clock_tx.signal_handler().set(m_kb_uart, FUNC(i8251_device::write_txc));
FD1793(config, m_fdc, 16_MHz_XTAL / 8);
@@ -969,7 +969,7 @@ void octopus_state::octopus(machine_config &config)
FLOPPY_CONNECTOR(config, "fdc:1", octopus_floppies, "525dd", floppy_image_device::default_mfm_floppy_formats);
SOFTWARE_LIST(config, "fd_list").set_original("octopus");
- PIT8253(config, m_pit, 0);
+ PIT8253(config, m_pit);
m_pit->set_clk<0>(4.9152_MHz_XTAL / 2); // DART channel A
m_pit->out_handler<0>().set(FUNC(octopus_state::serial_clock_w)); // being able to write both Rx and Tx clocks at one time would be nice
m_pit->set_clk<1>(4.9152_MHz_XTAL / 2); // DART channel B