From 115ac9382f1db4d264fa388da784a6a9831fc3b0 Mon Sep 17 00:00:00 2001 From: angelosa Date: Fri, 4 Oct 2024 10:17:56 +0200 Subject: [PATCH] ibm/thinkpad600.cpp: hookup Super I/O --- scripts/src/machine.lua | 12 + src/devices/machine/pc97338.cpp | 387 ++++++++++++++++++++++++++++++++ src/devices/machine/pc97338.h | 124 ++++++++++ src/mame/ibm/thinkpad600.cpp | 85 +++++-- 4 files changed, 592 insertions(+), 16 deletions(-) create mode 100644 src/devices/machine/pc97338.cpp create mode 100644 src/devices/machine/pc97338.h diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index d462d65ee8fb3..19ed1d347b54c 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -4474,6 +4474,18 @@ if (MACHINES["PC87306"]~=null) then } end +--------------------------------------------------- +-- +--@src/devices/machine/pc97338.h,MACHINES["PC97338"] = true +--------------------------------------------------- + +if (MACHINES["PC97338"]~=null) then + files { + MAME_DIR .. "src/devices/machine/pc97338.cpp", + MAME_DIR .. "src/devices/machine/pc97338.h", + } +end + --------------------------------------------------- -- --@src/devices/machine/w83787f.h,MACHINES["W83787F"] = true diff --git a/src/devices/machine/pc97338.cpp b/src/devices/machine/pc97338.cpp new file mode 100644 index 0000000000000..a7ad2c0bb40aa --- /dev/null +++ b/src/devices/machine/pc97338.cpp @@ -0,0 +1,387 @@ +// license:BSD-3-Clause +// copyright-holders: Angelo Salese +/************************************************************************************************** + +National Semiconductor PC97338 Super I/O + +TODO: +- PC87338 (no MTEST register, bunch of other small differences) +- Eventually inherit from PC87306, emulate what's in between; + +**************************************************************************************************/ + +#include "emu.h" +#include "pc97338.h" + +#define LOG_WARN (1U << 1) // Show warnings + +#define VERBOSE (LOG_GENERAL | LOG_WARN) +//#define LOG_OUTPUT_FUNC osd_printf_info +#include "logmacro.h" + +#define LOGWARN(...) LOGMASKED(LOG_WARN, __VA_ARGS__) + +DEFINE_DEVICE_TYPE(PC97338, pc97338_device, "pc97338", "National Semiconductor PC97338 Super I/O") + +pc97338_device::pc97338_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, PC97338, tag, owner, clock) + , device_isa16_card_interface(mconfig, *this) + , device_memory_interface(mconfig, *this) + , m_space_config("superio_config_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(pc97338_device::config_map), this)) +// , m_kbdc(*this, "pc_kbdc") +// , m_rtc(*this, "rtc") + , m_pc_com(*this, "uart%d", 0U) + , m_pc_lpt(*this, "lpta") +// , m_gp20_reset_callback(*this) +// , m_gp25_gatea20_callback(*this) + , m_irq1_callback(*this) + , m_irq8_callback(*this) + , m_irq9_callback(*this) + , m_txd1_callback(*this) + , m_ndtr1_callback(*this) + , m_nrts1_callback(*this) + , m_txd2_callback(*this) + , m_ndtr2_callback(*this) + , m_nrts2_callback(*this) +{ } + +void pc97338_device::device_start() +{ + set_isa_device(); + //m_isa->set_dma_channel(0, this, true); + //m_isa->set_dma_channel(1, this, true); + //m_isa->set_dma_channel(2, this, true); + //m_isa->set_dma_channel(3, this, true); + remap(AS_IO, 0, 0x400); +} + +void pc97338_device::device_reset() +{ + m_locked_state = 2; +} + +device_memory_interface::space_config_vector pc97338_device::memory_space_config() const +{ + return space_config_vector { + std::make_pair(0, &m_space_config) + }; +} + +void pc97338_device::device_add_mconfig(machine_config &config) +{ + PC_LPT(config, m_pc_lpt); + m_pc_lpt->irq_handler().set(FUNC(pc97338_device::irq_parallel_w)); + + NS16550(config, m_pc_com[0], XTAL(1'843'200)); + m_pc_com[0]->out_int_callback().set(FUNC(pc97338_device::irq_serial1_w)); + m_pc_com[0]->out_tx_callback().set(FUNC(pc97338_device::txd_serial1_w)); + m_pc_com[0]->out_dtr_callback().set(FUNC(pc97338_device::dtr_serial1_w)); + m_pc_com[0]->out_rts_callback().set(FUNC(pc97338_device::rts_serial1_w)); + + NS16550(config, m_pc_com[1], XTAL(1'843'200)); + m_pc_com[1]->out_int_callback().set(FUNC(pc97338_device::irq_serial2_w)); + m_pc_com[1]->out_tx_callback().set(FUNC(pc97338_device::txd_serial2_w)); + m_pc_com[1]->out_dtr_callback().set(FUNC(pc97338_device::dtr_serial2_w)); + m_pc_com[1]->out_rts_callback().set(FUNC(pc97338_device::rts_serial2_w)); +} + +void pc97338_device::remap(int space_id, offs_t start, offs_t end) +{ + if (space_id == AS_IO) + { + // TODO: BADDR1/0 config pin controlled + u16 superio_base = 0x002e; + m_isa->install_device(superio_base, superio_base + 1, read8sm_delegate(*this, FUNC(pc97338_device::read)), write8sm_delegate(*this, FUNC(pc97338_device::write))); + + if (BIT(m_fer, 0)) + m_isa->install_device(0x378, 0x37f, read8sm_delegate(*m_pc_lpt, FUNC(pc_lpt_device::read)), write8sm_delegate(*m_pc_lpt, FUNC(pc_lpt_device::write))); + + if (BIT(m_fer, 1)) + m_isa->install_device(0x3f8, 0x3ff, read8sm_delegate(*m_pc_com[0], FUNC(ns16450_device::ins8250_r)), write8sm_delegate(*m_pc_com[0], FUNC(ns16450_device::ins8250_w))); + + if (BIT(m_fer, 2)) + m_isa->install_device(0x2f8, 0x2ff, read8sm_delegate(*m_pc_com[1], FUNC(ns16450_device::ins8250_r)), write8sm_delegate(*m_pc_com[1], FUNC(ns16450_device::ins8250_w))); + } +} + +u8 pc97338_device::read(offs_t offset) +{ + if (m_locked_state) + { + if (!machine().side_effects_disabled()) + m_locked_state --; + return (m_locked_state) ? 0x88 : 0x00; + } + + if (offset == 0) + return m_index; + + return space().read_byte(m_index); +} + +void pc97338_device::write(offs_t offset, u8 data) +{ + if (offset == 0) + { + m_index = data; + } + else + { + // TODO: two writes, first one just unlocks? + space().write_byte(m_index, data); + } +} + +void pc97338_device::config_map(address_map &map) +{ + map(0x00, 0x00).rw(FUNC(pc97338_device::fer_r), FUNC(pc97338_device::fer_w)); + map(0x01, 0x01).rw(FUNC(pc97338_device::far_r), FUNC(pc97338_device::far_w)); +// map(0x02, 0x02) PTR Power and Test Register +// map(0x03, 0x03) FCR Function Control Register +// map(0x04, 0x04) PCR Parallel port Control Register +// map(0x05, 0x05).rw(FUNC(pc97338_device::krr_r), FUNC(pc97338_device::krr_w)); +// map(0x06, 0x06) PMC Power Management Control Register +// map(0x07, 0x07) TUP Tape, UART and Parallel Port Configuration Register + // SID Super I/O Identification Register + // bits 7-3 -> 01110 TL/C/12379-27 + // bits 2-0 -> + map(0x08, 0x08).lr8( + NAME([] (offs_t offset) { return 0xb0; }) + ); +// map(0x09, 0x09) ASC Advanced Super I/O Configuration Register +// map(0x0a, 0x0a) CS0LA Chip Select 0 Low Address +// map(0x0b, 0x0b) CS0CF Chip Select 0 Configuration Address +// map(0x0c, 0x0c) CS1LA Chip Select 1 Low Address +// map(0x0d, 0x0d) CS1CF Chip Select 1 Configuration Address +// map(0x0e, 0x0e) IRC InfraRed Configuration Register +// map(0x0f, 0x0f) GPBA General Purpose I/O Port Base Address +// map(0x10, 0x10) CS0HA Chip Select 0 High Address +// map(0x11, 0x11) CS1HA Chip Select 1 High Address +// map(0x12, 0x12) SCF0 Super I/O Configuration Register 0 +// map(0x18, 0x18) SCF1 Super I/O Configuration Register 1 +// map(0x19, 0x19) + +// map(0x1b, 0x1b) PNP0 Plug and Play Configuration 0 Register +// map(0x1c, 0x1c) PNP1 Plug and Play Configuration 1 Register + +// map(0x40, 0x40) SCF2 Super I/O Configuration Register 2 +// map(0x41, 0x41) PNP2 PnP Configuration Register 2 +// map(0x42, 0x43) PBAL/PBAH Parallel Port Base Address Low/High Registers +// map(0x44, 0x45) S1BAL/S1BAH SCC1 Base Address Low/High Registers +// map(0x46, 0x47) S2BAL/S2BAH SCC2 Base Address Low/High Registers +// map(0x48, 0x49) FBAL/FBAH FDC Base Address Low/High Registers +// map(0x4a, 0x4b) SBAL/SBAH Super I/O Chip Base Address Low/High Registers +// map(0x4c, 0x4e) SIRQ1/2/3 System IRQ Input Configuration Register +// map(0x4f, 0x4f) PNP3 PnP Configuration Register 3 + +// map(0x50, 0x50) SCF3 Super I/O Configuration Register 3 +// map(0x51, 0x51) CLK Clock Control Register +// map(0x52, 0x52) MTEST Manufacturing Test Register (not present on '87338) +} + +/* + * [0x00] FER Function Enable Register + * xx-- ---- + * --x- ---- FDC address select + * ---x ---- (0) x2 floppy drives (1) x4 floppy drives + * ---- x--- FDC enable + * ---- -x-- UART2 enable + * ---- --x- UART1 enable + * ---- ---x Parallel Port enable + */ +u8 pc97338_device::fer_r(offs_t offset) +{ + return m_fer; +} + +void pc97338_device::fer_w(offs_t offset, u8 data) +{ + m_fer = data; + remap(AS_IO, 0, 0x400); +} + +/* + * [0x01] FAR Function Address Register + * xxxx ---- UART2 address select + * xx-- xx-- UART1 address select + * ---- --xx parallel address select + */ +u8 pc97338_device::far_r(offs_t offset) +{ + return m_far; +} + +void pc97338_device::far_w(offs_t offset, u8 data) +{ + m_far = data; + remap(AS_IO, 0, 0x400); +} + +/* + * Serial + */ + +void pc97338_device::irq_serial1_w(int state) +{ + if (!(BIT(m_fer, 1))) + return; + request_irq(3, state ? ASSERT_LINE : CLEAR_LINE); +} + +void pc97338_device::irq_serial2_w(int state) +{ + if (!(BIT(m_fer, 2))) + return; + request_irq(4, state ? ASSERT_LINE : CLEAR_LINE); +} + +void pc97338_device::txd_serial1_w(int state) +{ + if (!(BIT(m_fer, 1))) + return; + m_txd1_callback(state); +} + +void pc97338_device::txd_serial2_w(int state) +{ + if (!(BIT(m_fer, 2))) + return; + m_txd2_callback(state); +} + +void pc97338_device::dtr_serial1_w(int state) +{ + if (!(BIT(m_fer, 1))) + return; + m_ndtr1_callback(state); +} + +void pc97338_device::dtr_serial2_w(int state) +{ + if (!(BIT(m_fer, 2))) + return; + m_ndtr2_callback(state); +} + +void pc97338_device::rts_serial1_w(int state) +{ + if (!(BIT(m_fer, 1))) + return; + m_nrts1_callback(state); +} + +void pc97338_device::rts_serial2_w(int state) +{ + if (!(BIT(m_fer, 2))) + return; + m_nrts2_callback(state); +} + +void pc97338_device::rxd1_w(int state) +{ + m_pc_com[0]->rx_w(state); +} + +void pc97338_device::ndcd1_w(int state) +{ + m_pc_com[0]->dcd_w(state); +} + +void pc97338_device::ndsr1_w(int state) +{ + m_pc_com[0]->dsr_w(state); +} + +void pc97338_device::nri1_w(int state) +{ + m_pc_com[0]->ri_w(state); +} + +void pc97338_device::ncts1_w(int state) +{ + m_pc_com[0]->cts_w(state); +} + +void pc97338_device::rxd2_w(int state) +{ + m_pc_com[1]->rx_w(state); +} + +void pc97338_device::ndcd2_w(int state) +{ + m_pc_com[1]->dcd_w(state); +} + +void pc97338_device::ndsr2_w(int state) +{ + m_pc_com[1]->dsr_w(state); +} + +void pc97338_device::nri2_w(int state) +{ + m_pc_com[1]->ri_w(state); +} + +void pc97338_device::ncts2_w(int state) +{ + m_pc_com[1]->cts_w(state); +} + +/* + * Parallel + */ + +void pc97338_device::irq_parallel_w(int state) +{ + if (!(BIT(m_fer, 0))) + return; + request_irq(5, state ? ASSERT_LINE : CLEAR_LINE); +} + + +void pc97338_device::request_irq(int irq, int state) +{ + switch (irq) + { + case 1: + m_irq1_callback(state); + break; + case 3: + m_isa->irq3_w(state); + break; + case 4: + m_isa->irq4_w(state); + break; + case 5: + m_isa->irq5_w(state); + break; + case 6: + m_isa->irq6_w(state); + break; + case 7: + m_isa->irq7_w(state); + break; + case 8: + m_irq8_callback(state); + break; + case 9: + m_irq9_callback(state); + break; + case 10: + m_isa->irq10_w(state); + break; + case 11: + m_isa->irq11_w(state); + break; + case 12: + m_isa->irq12_w(state); + break; + case 14: + m_isa->irq14_w(state); + break; + case 15: + m_isa->irq15_w(state); + break; + } +} + diff --git a/src/devices/machine/pc97338.h b/src/devices/machine/pc97338.h new file mode 100644 index 0000000000000..e7d5a45387de5 --- /dev/null +++ b/src/devices/machine/pc97338.h @@ -0,0 +1,124 @@ +// license:BSD-3-Clause +// copyright-holders: Angelo Salese + +#ifndef MAME_MACHINE_PC97336_H +#define MAME_MACHINE_PC97336_H + +#pragma once + +#include "bus/isa/isa.h" +//#include "machine/8042kbdc.h" +//#include "machine/ds128x.h" +#include "machine/ins8250.h" +#include "machine/pc_lpt.h" + +class pc97338_device : public device_t, + public device_isa16_card_interface, + public device_memory_interface +{ +public: + pc97338_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ~pc97338_device() {} + + void remap(int space_id, offs_t start, offs_t end) override; + +// auto gp20_reset() { return m_gp20_reset_callback.bind(); } +// auto gp25_gatea20() { return m_gp25_gatea20_callback.bind(); } + auto irq1() { return m_irq1_callback.bind(); } + auto irq8() { return m_irq8_callback.bind(); } + auto irq9() { return m_irq9_callback.bind(); } + auto txd1() { return m_txd1_callback.bind(); } + auto ndtr1() { return m_ndtr1_callback.bind(); } + auto nrts1() { return m_nrts1_callback.bind(); } + auto txd2() { return m_txd2_callback.bind(); } + auto ndtr2() { return m_ndtr2_callback.bind(); } + auto nrts2() { return m_nrts2_callback.bind(); } + + void rxd1_w(int state); + void ndcd1_w(int state); + void ndsr1_w(int state); + void nri1_w(int state); + void ncts1_w(int state); + void rxd2_w(int state); + void ndcd2_w(int state); + void ndsr2_w(int state); + void nri2_w(int state); + void ncts2_w(int state); + +protected: + virtual void device_start() override ATTR_COLD; + virtual void device_reset() override ATTR_COLD; + + virtual space_config_vector memory_space_config() const override; + virtual void device_add_mconfig(machine_config &config) override ATTR_COLD; + +private: + const address_space_config m_space_config; + +// required_device m_kbdc; +// required_device m_rtc; + required_device_array m_pc_com; + required_device m_pc_lpt; + +// devcb_write_line m_gp20_reset_callback; +// devcb_write_line m_gp25_gatea20_callback; + devcb_write_line m_irq1_callback; + devcb_write_line m_irq8_callback; + devcb_write_line m_irq9_callback; + devcb_write_line m_txd1_callback; + devcb_write_line m_ndtr1_callback; + devcb_write_line m_nrts1_callback; + devcb_write_line m_txd2_callback; + devcb_write_line m_ndtr2_callback; + devcb_write_line m_nrts2_callback; + + void request_irq(int irq, int state); + + u8 read(offs_t offset); + void write(offs_t offset, u8 data); + + void config_map(address_map &map) ATTR_COLD; + + u8 far_r(offs_t offset); + void far_w(offs_t offset, u8 data); + + u8 fer_r(offs_t offset); + void fer_w(offs_t offset, u8 data); + +// u8 keybc_status_r(offs_t offset); +// void keybc_command_w(offs_t offset, u8 data); +// u8 rtc_r(offs_t offset); +// void rtc_w(offs_t offset, u8 data); +// +// void kbdp21_gp25_gatea20_w(int state); +// void kbdp20_gp20_reset_w(int state); +// +// void irq_keyboard_w(int state); +// void irq_mouse_w(int state); +// +// u8 krr_r(offs_t offset); +// void krr_w(offs_t offset, u8 data); + + void irq_parallel_w(int state); + + void irq_serial1_w(int state); + void txd_serial1_w(int state); + void dtr_serial1_w(int state); + void rts_serial1_w(int state); + void irq_serial2_w(int state); + void txd_serial2_w(int state); + void dtr_serial2_w(int state); + void rts_serial2_w(int state); + + u8 m_index = 0; + + u8 m_locked_state = 2; +// u8 m_krr = 0; + u8 m_fer = 0; + u8 m_far = 0; +}; + + +DECLARE_DEVICE_TYPE(PC97338, pc97338_device); + +#endif // MAME_MACHINE_PC97336_H diff --git a/src/mame/ibm/thinkpad600.cpp b/src/mame/ibm/thinkpad600.cpp index 9876cc85c0c23..2f4f8977b3687 100644 --- a/src/mame/ibm/thinkpad600.cpp +++ b/src/mame/ibm/thinkpad600.cpp @@ -1,7 +1,14 @@ // license:BSD-3-Clause -// copyright-holders: -/************************************************************************************************************* -Skeleton driver for IBM ThinkPad 600 series. +// copyright-holders: Angelo Salese +/************************************************************************************************** + +IBM ThinkPad 600 series + +TODO: +- Punts to Flash ROM BIOS Programmer thru serial port terminal; + +=================================================================================================== + The IBM ThinkPad 600 series was a series of notebook computers introduced in 1998 by IBM as an lighter and slimmer alternative to the 770 series. Three models were produced, the 600, 600E, and 600X. @@ -46,9 +53,16 @@ Hardware for the 600 model. -TI TCM320AC36C (Voice-Band Audio Processor [VBAPE]). -Large BGA chip silkscreened "IPI I8L7360 F27904A". -*************************************************************************************************************/ +**************************************************************************************************/ #include "emu.h" + +#include "bus/isa/isa_cards.h" +#include "bus/rs232/hlemouse.h" +#include "bus/rs232/null_modem.h" +#include "bus/rs232/rs232.h" +#include "bus/rs232/sun_kbd.h" +#include "bus/rs232/terminal.h" #include "cpu/h8/h83337.h" #include "cpu/i386/i386.h" #include "machine/pci.h" @@ -58,7 +72,7 @@ Hardware for the 600 model. #include "machine/i82371eb_ide.h" #include "machine/i82371eb_acpi.h" #include "machine/i82371eb_usb.h" -#include "bus/isa/isa_cards.h" +#include "machine/pc97338.h" #include "speaker.h" @@ -85,7 +99,7 @@ class thinkpad600_state : public driver_device void main_map(address_map &map); void mcu_map(address_map &map); - //static void superio_config(device_t *device); + static void superio_config(device_t *device); }; void thinkpad600_state::main_map(address_map &map) @@ -106,16 +120,41 @@ void thinkpad600_state::thinkpad600_base(machine_config &config) // TODO: move away, maps on MB resource, bump to H83437 h83337_device &mcu(H83337(config, "mcu", XTAL(16'000'000))); // Actually an Hitachi HD64F3437TF, unknown clock mcu.set_addrmap(AS_PROGRAM, &thinkpad600_state::mcu_map); +// mcu.set_disable(); } -//void thinkpad600_state::superio_config(device_t *device) -//{ -//} +void thinkpad600_state::superio_config(device_t *device) +{ + pc97338_device &fdc = *downcast(device); +// fdc.set_sysopt_pin(1); +// fdc.gp20_reset().set_inputline(":maincpu", INPUT_LINE_RESET); +// fdc.gp25_gatea20().set_inputline(":maincpu", INPUT_LINE_A20); + fdc.irq1().set(":pci:07.0", FUNC(i82371eb_isa_device::pc_irq1_w)); + fdc.irq8().set(":pci:07.0", FUNC(i82371eb_isa_device::pc_irq8n_w)); + fdc.txd1().set(":serport0", FUNC(rs232_port_device::write_txd)); + fdc.ndtr1().set(":serport0", FUNC(rs232_port_device::write_dtr)); + fdc.nrts1().set(":serport0", FUNC(rs232_port_device::write_rts)); + fdc.txd2().set(":serport1", FUNC(rs232_port_device::write_txd)); + fdc.ndtr2().set(":serport1", FUNC(rs232_port_device::write_dtr)); + fdc.nrts2().set(":serport1", FUNC(rs232_port_device::write_rts)); +} -//static void isa_internal_devices(device_slot_interface &device) -//{ -// device.option_add("w83787f", W83787F); -//} +static void isa_com(device_slot_interface &device) +{ + device.option_add("microsoft_mouse", MSFT_HLE_SERIAL_MOUSE); + device.option_add("logitech_mouse", LOGITECH_HLE_SERIAL_MOUSE); + device.option_add("wheel_mouse", WHEEL_HLE_SERIAL_MOUSE); + device.option_add("msystems_mouse", MSYSTEMS_HLE_SERIAL_MOUSE); + device.option_add("rotatable_mouse", ROTATABLE_HLE_SERIAL_MOUSE); + device.option_add("terminal", SERIAL_TERMINAL); + device.option_add("null_modem", NULL_MODEM); + device.option_add("sun_kbd", SUN_KBD_ADAPTOR); +} + +static void isa_internal_devices(device_slot_interface &device) +{ + device.option_add("pc97338", PC97338); +} void thinkpad600_state::thinkpad600e(machine_config &config) { @@ -124,7 +163,7 @@ void thinkpad600_state::thinkpad600e(machine_config &config) m_maincpu->set_irq_acknowledge_callback("pci:07.0:pic8259_master", FUNC(pic8259_device::inta_cb)); m_maincpu->smiact().set("pci:00.0", FUNC(i82443bx_host_device::smi_act_w)); - // TODO: PCI config space guessed from a Fujitsu Lifebook + // TODO: PCI config space guessed from a Fujitsu Lifebook, confirm me for ThinkPad PCI_ROOT(config, "pci", 0); I82443BX_HOST(config, "pci:00.0", 0, "maincpu", 64*1024*1024); i82371eb_isa_device &isa(I82371EB_ISA(config, "pci:07.0", 0, m_maincpu)); @@ -145,7 +184,21 @@ void thinkpad600_state::thinkpad600e(machine_config &config) // TODO: NeoMagic at "pci:14.0" / "pci:14.1" (video & AC'97 integrated sound, likely requires BIOS) // TODO: motherboard Super I/O resource here -// ISA16_SLOT(config, "board4", 0, "pci:07.0:isabus", isa_internal_devices, "pc97338", true).set_option_machine_config("pc97338", superio_config); + ISA16_SLOT(config, "board4", 0, "pci:07.0:isabus", isa_internal_devices, "pc97338", true).set_option_machine_config("pc97338", superio_config); + + rs232_port_device &serport0(RS232_PORT(config, "serport0", isa_com, nullptr)); + serport0.rxd_handler().set("board4:pc97338", FUNC(pc97338_device::rxd1_w)); + serport0.dcd_handler().set("board4:pc97338", FUNC(pc97338_device::ndcd1_w)); + serport0.dsr_handler().set("board4:pc97338", FUNC(pc97338_device::ndsr1_w)); + serport0.ri_handler().set("board4:pc97338", FUNC(pc97338_device::nri1_w)); + serport0.cts_handler().set("board4:pc97338", FUNC(pc97338_device::ncts1_w)); + + rs232_port_device &serport1(RS232_PORT(config, "serport1", isa_com, nullptr)); + serport1.rxd_handler().set("board4:pc97338", FUNC(pc97338_device::rxd2_w)); + serport1.dcd_handler().set("board4:pc97338", FUNC(pc97338_device::ndcd2_w)); + serport1.dsr_handler().set("board4:pc97338", FUNC(pc97338_device::ndsr2_w)); + serport1.ri_handler().set("board4:pc97338", FUNC(pc97338_device::nri2_w)); + serport1.cts_handler().set("board4:pc97338", FUNC(pc97338_device::ncts2_w)); thinkpad600_base(config); } @@ -155,7 +208,7 @@ void thinkpad600_state::thinkpad600(machine_config &config) PENTIUM2(config, m_maincpu, 300'000'000); // Intel Pentium II 300 Mobile MMC-1 (PMD30005002AA) m_maincpu->set_disable(); - // TODO: fill me, uses earlier AB + // TODO: fill me, uses earlier PIIX4 AB PCI_ROOT(config, "pci", 0); thinkpad600_base(config);