From 8c982565f1584a045c3f6550c8caebd934e92ab8 Mon Sep 17 00:00:00 2001 From: hap Date: Sat, 23 Mar 2024 17:02:20 +0100 Subject: [PATCH] misc: small cleanups --- src/devices/bus/epson_sio/pf10.cpp | 2 +- src/devices/bus/rs232/loopback.cpp | 4 ++-- src/devices/bus/rs232/null_modem.cpp | 2 +- src/devices/bus/rs232/pty.cpp | 2 +- src/devices/bus/rs232/rs232_sync_io.cpp | 2 +- src/devices/bus/saitek_osa/maestro.cpp | 4 ++-- src/devices/bus/saitek_osa/maestroa.cpp | 2 +- src/devices/bus/saitek_osa/sparc.cpp | 2 +- src/devices/cpu/m6800/m6801.cpp | 12 +++++----- src/devices/cpu/m6800/m6801.h | 4 ++-- src/devices/machine/mpu401.cpp | 2 +- src/mame/mg1/mg1.cpp | 2 +- src/mame/misc/vampire.cpp | 2 +- src/mame/novag/vip.cpp | 2 +- src/mame/skeleton/qtsbc.cpp | 30 +++++++++++++------------ src/mame/yamaha/ymdx100.cpp | 2 +- src/mame/yamaha/ymdx9.cpp | 2 +- src/mame/yamaha/ymtx81z.cpp | 2 +- src/mame/yeno/416xl.cpp | 2 +- 19 files changed, 42 insertions(+), 40 deletions(-) diff --git a/src/devices/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp index 6225b06049b..bf78ee1ad23 100644 --- a/src/devices/bus/epson_sio/pf10.cpp +++ b/src/devices/bus/epson_sio/pf10.cpp @@ -126,7 +126,7 @@ void epson_pf10_device::device_reset() TIMER_CALLBACK_MEMBER( epson_pf10_device::serial_clk_tick ) { - m_cpu->m6801_clock_serial(); + m_cpu->clock_serial(); } diff --git a/src/devices/bus/rs232/loopback.cpp b/src/devices/bus/rs232/loopback.cpp index fcfc858ce62..36006472154 100644 --- a/src/devices/bus/rs232/loopback.cpp +++ b/src/devices/bus/rs232/loopback.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "loopback.h" -DEFINE_DEVICE_TYPE(RS232_LOOPBACK, rs232_loopback_device, "rs232_loopback", "RS232 Loopback") +DEFINE_DEVICE_TYPE(RS232_LOOPBACK, rs232_loopback_device, "rs232_loopback", "RS-232 Loopback") rs232_loopback_device::rs232_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, RS232_LOOPBACK, tag, owner, clock) @@ -43,7 +43,7 @@ void rs232_loopback_device::input_dtr(int state) } } -DEFINE_DEVICE_TYPE(DEC_RS232_LOOPBACK, dec_rs232_loopback_device, "dec_rs232_loopback", "RS232 Loopback (DEC 12-15336-00)") +DEFINE_DEVICE_TYPE(DEC_RS232_LOOPBACK, dec_rs232_loopback_device, "dec_rs232_loopback", "RS-232 Loopback (DEC 12-15336-00)") dec_rs232_loopback_device::dec_rs232_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, DEC_RS232_LOOPBACK, tag, owner, clock) diff --git a/src/devices/bus/rs232/null_modem.cpp b/src/devices/bus/rs232/null_modem.cpp index 654fb4a2c2b..083fcb0d516 100644 --- a/src/devices/bus/rs232/null_modem.cpp +++ b/src/devices/bus/rs232/null_modem.cpp @@ -149,4 +149,4 @@ void null_modem_device::rcv_complete() } } -DEFINE_DEVICE_TYPE(NULL_MODEM, null_modem_device, "null_modem", "RS232 Null Modem") +DEFINE_DEVICE_TYPE(NULL_MODEM, null_modem_device, "null_modem", "RS-232 Null Modem") diff --git a/src/devices/bus/rs232/pty.cpp b/src/devices/bus/rs232/pty.cpp index 1e9fe8d6f9c..f633f72bdec 100644 --- a/src/devices/bus/rs232/pty.cpp +++ b/src/devices/bus/rs232/pty.cpp @@ -159,4 +159,4 @@ TIMER_CALLBACK_MEMBER(pseudo_terminal_device::update_queue) } } -DEFINE_DEVICE_TYPE(PSEUDO_TERMINAL, pseudo_terminal_device, "pseudo_terminal", "Pseudo terminal") +DEFINE_DEVICE_TYPE(PSEUDO_TERMINAL, pseudo_terminal_device, "pseudo_terminal", "Pseudo Terminal") diff --git a/src/devices/bus/rs232/rs232_sync_io.cpp b/src/devices/bus/rs232/rs232_sync_io.cpp index 56baf776da4..9812087b363 100644 --- a/src/devices/bus/rs232/rs232_sync_io.cpp +++ b/src/devices/bus/rs232/rs232_sync_io.cpp @@ -198,4 +198,4 @@ void rs232_sync_io_device::update_serial(int state) m_clk_timer->adjust(period , 0 , period); } -DEFINE_DEVICE_TYPE(RS232_SYNC_IO, rs232_sync_io_device, "rs232_sync_io", "RS232 Synchronous I/O") +DEFINE_DEVICE_TYPE(RS232_SYNC_IO, rs232_sync_io_device, "rs232_sync_io", "RS-232 Synchronous I/O") diff --git a/src/devices/bus/saitek_osa/maestro.cpp b/src/devices/bus/saitek_osa/maestro.cpp index 8bfc102cf44..0e474cbad29 100644 --- a/src/devices/bus/saitek_osa/maestro.cpp +++ b/src/devices/bus/saitek_osa/maestro.cpp @@ -39,8 +39,8 @@ TODO: #include "softlist_dev.h" -DEFINE_DEVICE_TYPE(OSA_MAESTRO, saitekosa_maestro_device, "osa_maestro", "Maestro B-D") -DEFINE_DEVICE_TYPE(OSA_ANALYST, saitekosa_analyst_device, "osa_analyst", "Analyst") +DEFINE_DEVICE_TYPE(OSA_MAESTRO, saitekosa_maestro_device, "osa_maestro", "Saitek OSA Maestro B-D") +DEFINE_DEVICE_TYPE(OSA_ANALYST, saitekosa_analyst_device, "osa_analyst", "Saitek OSA Analyst") //------------------------------------------------- diff --git a/src/devices/bus/saitek_osa/maestroa.cpp b/src/devices/bus/saitek_osa/maestroa.cpp index 525c828d6c8..6bbcaffc732 100644 --- a/src/devices/bus/saitek_osa/maestroa.cpp +++ b/src/devices/bus/saitek_osa/maestroa.cpp @@ -29,7 +29,7 @@ compatible for upgrading to newer Maestro versions. #include "softlist_dev.h" -DEFINE_DEVICE_TYPE(OSA_MAESTROA, saitekosa_maestroa_device, "osa_maestroa", "Maestro A") +DEFINE_DEVICE_TYPE(OSA_MAESTROA, saitekosa_maestroa_device, "osa_maestroa", "Saitek OSA Maestro A") //------------------------------------------------- diff --git a/src/devices/bus/saitek_osa/sparc.cpp b/src/devices/bus/saitek_osa/sparc.cpp index 52a0fa68b5e..7760bd72cd0 100644 --- a/src/devices/bus/saitek_osa/sparc.cpp +++ b/src/devices/bus/saitek_osa/sparc.cpp @@ -36,7 +36,7 @@ TODO: #include "sparc.h" -DEFINE_DEVICE_TYPE(OSA_SPARC, saitekosa_sparc_device, "osa_sparc", "Sparc") +DEFINE_DEVICE_TYPE(OSA_SPARC, saitekosa_sparc_device, "osa_sparc", "Saitek OSA Sparc") //------------------------------------------------- diff --git a/src/devices/cpu/m6800/m6801.cpp b/src/devices/cpu/m6800/m6801.cpp index 0ca791726fc..725a3d42731 100644 --- a/src/devices/cpu/m6800/m6801.cpp +++ b/src/devices/cpu/m6800/m6801.cpp @@ -996,7 +996,7 @@ void hd6301x_cpu_device::set_rmcr(u8 data) } } -int m6801_cpu_device::m6800_rx() +int m6801_cpu_device::m6801_rx() { return (m_in_port_func[1]() & M6801_PORT2_IO3) >> 3; } @@ -1097,7 +1097,7 @@ void m6801_cpu_device::serial_receive() if (m_trcsr & M6801_TRCSR_WU) { // wait for 10 bits of '1' - if (m6800_rx() == 1) + if (m6801_rx() == 1) { m_rxbits++; @@ -1124,7 +1124,7 @@ void m6801_cpu_device::serial_receive() switch (m_rxbits) { case M6801_SERIAL_START: - if (m6800_rx() == 0) + if (m6801_rx() == 0) { // start bit found m_rxbits++; @@ -1134,7 +1134,7 @@ void m6801_cpu_device::serial_receive() break; case M6801_SERIAL_STOP: - if (m6800_rx() == 1) + if (m6801_rx() == 1) { LOGRX("SCI Received STOP bit\n"); @@ -1188,7 +1188,7 @@ void m6801_cpu_device::serial_receive() m_rsr >>= 1; // receive bit into register - m_rsr |= (m6800_rx() << 7); + m_rsr |= (m6801_rx() << 7); LOGRX("SCI RX sampled DATA bit %u: %u\n", m_rxbits, BIT(m_rsr, 7)); @@ -2547,7 +2547,7 @@ u8 m6801_cpu_device::ff_r() } -void m6801_cpu_device::m6801_clock_serial() +void m6801_cpu_device::clock_serial() { if (m_use_ext_serclock) { diff --git a/src/devices/cpu/m6800/m6801.h b/src/devices/cpu/m6800/m6801.h index 518daa5ea59..11968b4e3a8 100644 --- a/src/devices/cpu/m6800/m6801.h +++ b/src/devices/cpu/m6800/m6801.h @@ -66,7 +66,7 @@ public: auto standby_cb() { return m_standby_func.bind(); } // notifier (not an output pin) int standby() { return suspended(SUSPEND_REASON_CLOCK) ? 1 : 0; } - void m6801_clock_serial(); + void clock_serial(); protected: m6801_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, const m6800_cpu_device::op_func *insn, const u8 *cycles, address_map_constructor internal, int nvram_bytes); @@ -194,7 +194,7 @@ protected: virtual void check_timer_event(); virtual void set_rmcr(u8 data); virtual void write_port2(); - int m6800_rx(); + int m6801_rx(); void serial_transmit(); void serial_receive(); TIMER_CALLBACK_MEMBER(sci_tick); diff --git a/src/devices/machine/mpu401.cpp b/src/devices/machine/mpu401.cpp index 012663f0188..d4e80eb4bd5 100644 --- a/src/devices/machine/mpu401.cpp +++ b/src/devices/machine/mpu401.cpp @@ -145,7 +145,7 @@ void mpu401_device::device_reset() TIMER_CALLBACK_MEMBER(mpu401_device::serial_tick) { - m_ourcpu->m6801_clock_serial(); + m_ourcpu->clock_serial(); } uint8_t mpu401_device::port1_r() diff --git a/src/mame/mg1/mg1.cpp b/src/mame/mg1/mg1.cpp index dd19d8a0377..bc7b1b8680f 100644 --- a/src/mame/mg1/mg1.cpp +++ b/src/mame/mg1/mg1.cpp @@ -451,7 +451,7 @@ void mg1_state::mg1(machine_config &config) * selects a 256 divisor, giving a 9600Hz clock which after the 8x divider in the IOP gives a 1200 baud data rate. */ clock_device &kbd_clk(CLOCK(config, "kbd_clock", 2.4576_MHz_XTAL / 256)); - kbd_clk.signal_handler().set([this](int state) { if (state) m_iop->m6801_clock_serial(); }); + kbd_clk.signal_handler().set([this](int state) { if (state) m_iop->clock_serial(); }); SPEAKER(config, "mono").front_center(); SPEAKER_SOUND(config, m_buzzer); diff --git a/src/mame/misc/vampire.cpp b/src/mame/misc/vampire.cpp index 2cb85dd3762..25efa468b2a 100644 --- a/src/mame/misc/vampire.cpp +++ b/src/mame/misc/vampire.cpp @@ -341,7 +341,7 @@ void vampire_state::blit_trigger(offs_t offset) const u8 pen = slot[5]; // 0xf is max used const int32_t sy = 256 - slot[2]; // pixels - const int32_t sx = ((32 - slot[3])) << 3; // bytes (src ROM) + const int32_t sx = (32 - slot[3]) << 3; // bytes (src ROM) for (int yy = 0; yy < sy; ++yy) { diff --git a/src/mame/novag/vip.cpp b/src/mame/novag/vip.cpp index a40e3055522..2862183784d 100644 --- a/src/mame/novag/vip.cpp +++ b/src/mame/novag/vip.cpp @@ -14,7 +14,7 @@ of this portable design (Ruby, Sapphire, ..) are on H8. TODO: - if/when MAME supports an exit callback, hook up power-off switch to that -- add Super System peripherals, each has their own MCU +- add more Super System peripherals, each has their own MCU - unmapped reads from 0x3* range, same as snova driver BTANB: diff --git a/src/mame/skeleton/qtsbc.cpp b/src/mame/skeleton/qtsbc.cpp index 68e172a83c2..bcc54dd58c5 100644 --- a/src/mame/skeleton/qtsbc.cpp +++ b/src/mame/skeleton/qtsbc.cpp @@ -65,11 +65,12 @@ List of signals on pin headers (from CompuTime manual): ****************************************************************************/ #include "emu.h" + +#include "bus/rs232/rs232.h" +//#include "bus/s100/s100.h" #include "cpu/z80/z80.h" #include "machine/i8251.h" #include "machine/pit8253.h" -#include "bus/rs232/rs232.h" -//#include "bus/s100/s100.h" namespace { @@ -88,13 +89,14 @@ public: , m_cpu_speed(*this, "SPEED") , m_eprom(*this, "maincpu") , m_p_ram(*this, "ram") - , m_rts(true) - , m_dtr(true) { } void qtsbc(machine_config &config); - void io_map(address_map &map); - void mem_map(address_map &map); + +protected: + virtual void machine_start() override; + virtual void machine_reset() override; + private: u8 memory_r(offs_t offset); void memory_w(offs_t offset, u8 data); @@ -103,8 +105,9 @@ private: void rts_loopback_w(int state); void dtr_loopback_w(int state); - virtual void machine_start() override; - virtual void machine_reset() override; + void io_map(address_map &map); + void mem_map(address_map &map); + required_device m_maincpu; required_device m_pit; required_device m_usart; @@ -115,8 +118,8 @@ private: required_region_ptr m_eprom; required_shared_ptr m_p_ram; bool m_power_on = false; - bool m_rts; - bool m_dtr; + s32 m_rts = 1; + s32 m_dtr = 1; }; @@ -201,7 +204,6 @@ u8 qtsbc_state::io_r(offs_t offset) return 0x00; // Ports 08, 10 and 80 also used for read access - return 0xff; } } @@ -234,7 +236,6 @@ void qtsbc_state::io_w(offs_t offset, u8 data) else { // TODO: S-100 bus (no address mirroring) - logerror("Output %02X to %04X\n", data, offset); } } @@ -242,7 +243,7 @@ void qtsbc_state::io_w(offs_t offset, u8 data) void qtsbc_state::rts_loopback_w(int state) { // Filtered through this routine to avoid infinite loops - if (state != bool(m_rts)) + if (state != m_rts) { m_rts = state; m_rs232->write_rts(m_rts); @@ -252,7 +253,7 @@ void qtsbc_state::rts_loopback_w(int state) void qtsbc_state::dtr_loopback_w(int state) { // Filtered through this routine to avoid infinite loops - if (state != bool(m_dtr)) + if (state != m_dtr) { m_dtr = state; m_rs232->write_dtr(m_dtr); @@ -503,6 +504,7 @@ void qtsbc_state::machine_start() save_item(NAME(m_power_on)); save_item(NAME(m_rts)); + save_item(NAME(m_dtr)); } void qtsbc_state::machine_reset() diff --git a/src/mame/yamaha/ymdx100.cpp b/src/mame/yamaha/ymdx100.cpp index a4299507a12..afc6c552aa2 100644 --- a/src/mame/yamaha/ymdx100.cpp +++ b/src/mame/yamaha/ymdx100.cpp @@ -334,7 +334,7 @@ void yamaha_dx100_state::palette_init(palette_device &palette) void yamaha_dx100_state::p22_w(int state) { if (state) - m_maincpu->m6801_clock_serial(); + m_maincpu->clock_serial(); } void yamaha_dx100_state::mem_map(address_map &map) diff --git a/src/mame/yamaha/ymdx9.cpp b/src/mame/yamaha/ymdx9.cpp index 19a031bc6b4..87ac4507979 100644 --- a/src/mame/yamaha/ymdx9.cpp +++ b/src/mame/yamaha/ymdx9.cpp @@ -135,7 +135,7 @@ private: void midi_r(int state) { m_rx_data = state; } - void midiclock_w(int state) { if (state) m_maincpu->m6801_clock_serial(); } + void midiclock_w(int state) { if (state) m_maincpu->clock_serial(); } /** * @brief Handle a write to the synth's IO Port 1. diff --git a/src/mame/yamaha/ymtx81z.cpp b/src/mame/yamaha/ymtx81z.cpp index 8a3e509d2b2..f74b9a7c5c0 100644 --- a/src/mame/yamaha/ymtx81z.cpp +++ b/src/mame/yamaha/ymtx81z.cpp @@ -47,7 +47,7 @@ private: u8 p2_r(); void midi_rx_r(int state) { m_rx_data = state; } - void midiclock_w(int state) { if (state) m_maincpu->m6801_clock_serial(); } + void midiclock_w(int state) { if (state) m_maincpu->clock_serial(); } required_device m_maincpu; required_ioport m_port2; diff --git a/src/mame/yeno/416xl.cpp b/src/mame/yeno/416xl.cpp index c6d3d7504ac..f45723c83d7 100644 --- a/src/mame/yeno/416xl.cpp +++ b/src/mame/yeno/416xl.cpp @@ -12,7 +12,7 @@ properly. Hardware notes: - PCB label: CHESS3 YENO 416XL -- Hitachi HD63B01Y0P @ ~8MHz (LC oscillator) +- Hitachi HD6301Y0P @ ~8MHz (LC oscillator) - 8*8 chessboard buttons, 16+7 LEDs, piezo TODO: