summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author angelosa <lordkale4@gmail.com>2025-04-13 21:30:49 +0200
committer angelosa <lordkale4@gmail.com>2025-04-13 21:30:49 +0200
commit65730f43b40608217a467edc705225503212de4f (patch)
tree5b5f7f7770de6519388e420f93c4e4848fb18e58
parente05b5cf4087ab66cf7f8d2af442024b08843774e (diff)
nec/pc98: drop '01 naming for memsw, kbd and cd
-rw-r--r--src/mame/nec/bungo.cpp2
-rw-r--r--src/mame/nec/pc9801.cpp20
-rw-r--r--src/mame/nec/pc9801.h12
-rw-r--r--src/mame/nec/pc9801_cd.h23
-rw-r--r--src/mame/nec/pc98_cd.cpp (renamed from src/mame/nec/pc9801_cd.cpp)14
-rw-r--r--src/mame/nec/pc98_cd.h23
-rw-r--r--src/mame/nec/pc98_kbd.cpp (renamed from src/mame/nec/pc9801_kbd.cpp)40
-rw-r--r--src/mame/nec/pc98_kbd.h (renamed from src/mame/nec/pc9801_kbd.h)14
-rw-r--r--src/mame/nec/pc98_memsw.cpp (renamed from src/mame/nec/pc9801_memsw.cpp)24
-rw-r--r--src/mame/nec/pc98_memsw.h (renamed from src/mame/nec/pc9801_memsw.h)16
-rw-r--r--src/mame/nec/pc98ha.cpp4
11 files changed, 95 insertions, 97 deletions
diff --git a/src/mame/nec/bungo.cpp b/src/mame/nec/bungo.cpp
index 8751cbfc793..c7e75ba9202 100644
--- a/src/mame/nec/bungo.cpp
+++ b/src/mame/nec/bungo.cpp
@@ -136,7 +136,7 @@ void bungo_mini5sx_state::mini5sx_config(machine_config &config)
// kbd_clock.signal_handler().append(m_sio_kbd, FUNC(i8251_device::write_txc));
// TODO: should be PC-98 based with no numpad and some extra keys.
- PC9801_KBD(config, m_keyb, 0);
+ PC98_KBD(config, m_keyb, 0);
// m_keyb->rxd_callback().set("sio_kbd", FUNC(i8251_device::write_rxd));
I8255(config, m_ppi_sys, 0);
diff --git a/src/mame/nec/pc9801.cpp b/src/mame/nec/pc9801.cpp
index 20cad38d6a8..1b6ebd923b2 100644
--- a/src/mame/nec/pc9801.cpp
+++ b/src/mame/nec/pc9801.cpp
@@ -2262,15 +2262,15 @@ TIMER_DEVICE_CALLBACK_MEMBER( pc9801_state::mouse_irq_cb )
void pc9801_atapi_devices(device_slot_interface &device)
{
- device.option_add("pc9801_cd", PC9801_CD);
+ device.option_add("pc98_cd", PC98_CD);
}
-void pc9801_state::pc9801_keyboard(machine_config &config)
+void pc9801_state::config_keyboard(machine_config &config)
{
I8251(config, m_sio_kbd, 0);
- m_sio_kbd->txd_handler().set("keyb", FUNC(pc9801_kbd_device::input_txd));
- m_sio_kbd->dtr_handler().set("keyb", FUNC(pc9801_kbd_device::input_rty));
- m_sio_kbd->rts_handler().set("keyb", FUNC(pc9801_kbd_device::input_kbde));
+ m_sio_kbd->txd_handler().set("keyb", FUNC(pc98_kbd_device::input_txd));
+ m_sio_kbd->dtr_handler().set("keyb", FUNC(pc98_kbd_device::input_rty));
+ m_sio_kbd->rts_handler().set("keyb", FUNC(pc98_kbd_device::input_kbde));
m_sio_kbd->write_cts(0);
m_sio_kbd->write_dsr(0);
m_sio_kbd->rxrdy_handler().set(m_pic1, FUNC(pic8259_device::ir1_w));
@@ -2279,7 +2279,7 @@ void pc9801_state::pc9801_keyboard(machine_config &config)
kbd_clock.signal_handler().set(m_sio_kbd, FUNC(i8251_device::write_rxc));
kbd_clock.signal_handler().append(m_sio_kbd, FUNC(i8251_device::write_txc));
- PC9801_KBD(config, m_keyb, 0);
+ PC98_KBD(config, m_keyb, 0);
m_keyb->rxd_callback().set("sio_kbd", FUNC(i8251_device::write_rxd));
}
@@ -2375,9 +2375,9 @@ void pc9801vm_state::pc9801_ide(machine_config &config)
SPEAKER(config, "rheadphone").front_right();
ATA_INTERFACE(config, m_ide[0]).options(ata_devices, "hdd", nullptr, false);
m_ide[0]->irq_handler().set("ideirq", FUNC(input_merger_device::in_w<0>));
- ATA_INTERFACE(config, m_ide[1]).options(pc9801_atapi_devices, "pc9801_cd", nullptr, false);
+ ATA_INTERFACE(config, m_ide[1]).options(pc9801_atapi_devices, "pc98_cd", nullptr, false);
m_ide[1]->irq_handler().set("ideirq", FUNC(input_merger_device::in_w<1>));
- m_ide[1]->slot(0).set_option_machine_config("pc9801_cd", cdrom_headphones);
+ m_ide[1]->slot(0).set_option_machine_config("pc98_cd", cdrom_headphones);
INPUT_MERGER_ANY_HIGH(config, "ideirq").output_handler().set("pic8259_slave", FUNC(pic8259_device::ir1_w));
@@ -2443,13 +2443,13 @@ void pc9801_state::pc9801_common(machine_config &config)
// TODO: other ports
m_ppi_prn->in_pb_callback().set(FUNC(pc9801_state::ppi_prn_portb_r));
- pc9801_keyboard(config);
+ config_keyboard(config);
pc9801_mouse(config);
pc9801_cbus(config);
pc9801_serial(config);
- PC9801_MEMSW(config, m_memsw, 0);
+ PC98_MEMSW(config, m_memsw, 0);
UPD765A(config, m_fdc_2hd, 8'000'000, true, true);
m_fdc_2hd->intrq_wr_callback().set(m_pic2, FUNC(pic8259_device::ir3_w));
diff --git a/src/mame/nec/pc9801.h b/src/mame/nec/pc9801.h
index ec435bda199..84ecb504f88 100644
--- a/src/mame/nec/pc9801.h
+++ b/src/mame/nec/pc9801.h
@@ -25,7 +25,6 @@
#include "machine/i8251.h"
#include "machine/i8255.h"
#include "machine/output_latch.h"
-#include "pc9801_memsw.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/ram.h"
@@ -55,8 +54,9 @@
#include "bus/cbus/pc9801_cbus.h"
#include "bus/cbus/sb16_ct2720.h"
-#include "pc9801_kbd.h"
-#include "pc9801_cd.h"
+#include "pc98_cd.h"
+#include "pc98_kbd.h"
+#include "pc98_memsw.h"
#include "bus/ata/atadev.h"
#include "bus/ata/ataintf.h"
@@ -113,7 +113,7 @@ protected:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
required_device<screen_device> m_screen;
- required_device<pc9801_kbd_device> m_keyb;
+ required_device<pc98_kbd_device> m_keyb;
optional_device<upd1990a_device> m_rtc;
required_device<i8255_device> m_ppi_sys;
required_device<i8255_device> m_ppi_prn;
@@ -187,7 +187,7 @@ protected:
required_device<pic8259_device> m_pic1;
required_device<pic8259_device> m_pic2;
private:
- required_device<pc9801_memsw_device> m_memsw;
+ required_device<pc98_memsw_device> m_memsw;
optional_device<scsi_port_device> m_sasibus;
optional_device<output_latch_device> m_sasi_data_out;
optional_device<input_buffer_device> m_sasi_data_in;
@@ -198,7 +198,7 @@ protected:
DECLARE_MACHINE_START(pc9801_common);
DECLARE_MACHINE_RESET(pc9801_common);
- void pc9801_keyboard(machine_config &config);
+ void config_keyboard(machine_config &config);
void pc9801_mouse(machine_config &config);
void pc9801_cbus(machine_config &config);
void pc9801_sasi(machine_config &config);
diff --git a/src/mame/nec/pc9801_cd.h b/src/mame/nec/pc9801_cd.h
deleted file mode 100644
index a5d4bb06133..00000000000
--- a/src/mame/nec/pc9801_cd.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:smf
-
-#ifndef MAME_NEC_PC9801_CD_H
-#define MAME_NEC_PC9801_CD_H
-
-#include "bus/ata/atapicdr.h"
-
-class pc9801_cd_device : public atapi_cdrom_device
-{
-public:
- pc9801_cd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
-protected:
- virtual void fill_buffer() override;
- virtual void process_command() override;
- virtual void process_buffer() override;
-};
-
-// device type definition
-DECLARE_DEVICE_TYPE(PC9801_CD, pc9801_cd_device)
-
-#endif // MAME_NEC_PC9801_CD_H
diff --git a/src/mame/nec/pc9801_cd.cpp b/src/mame/nec/pc98_cd.cpp
index 339c7846437..a4a59016bd5 100644
--- a/src/mame/nec/pc9801_cd.cpp
+++ b/src/mame/nec/pc98_cd.cpp
@@ -1,13 +1,13 @@
// license:BSD-3-Clause
// copyright-holders:smf
#include "emu.h"
-#include "pc9801_cd.h"
+#include "pc98_cd.h"
// device type definition
-DEFINE_DEVICE_TYPE(PC9801_CD, pc9801_cd_device, "pc9801_cd", "PC9801 CD-ROM Drive")
+DEFINE_DEVICE_TYPE(PC98_CD, pc98_cd_device, "pc98_cd", "NEC PC-98 CD-ROM Drive")
-pc9801_cd_device::pc9801_cd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- atapi_cdrom_device(mconfig, PC9801_CD, tag, owner, clock)
+pc98_cd_device::pc98_cd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ atapi_cdrom_device(mconfig, PC98_CD, tag, owner, clock)
{
}
@@ -30,19 +30,19 @@ pc9801_cd_device::pc9801_cd_device(const machine_config &mconfig, const char *ta
// data[7] = 0;
-void pc9801_cd_device::fill_buffer()
+void pc98_cd_device::fill_buffer()
{
atapi_cdrom_device::fill_buffer();
m_status |= IDE_STATUS_DRDY | IDE_STATUS_SERV;
}
-void pc9801_cd_device::process_buffer()
+void pc98_cd_device::process_buffer()
{
atapi_cdrom_device::process_buffer();
m_status |= IDE_STATUS_DRDY | IDE_STATUS_SERV;
}
-void pc9801_cd_device::process_command()
+void pc98_cd_device::process_command()
{
atapi_cdrom_device::process_command();
switch(m_command)
diff --git a/src/mame/nec/pc98_cd.h b/src/mame/nec/pc98_cd.h
new file mode 100644
index 00000000000..642acbbb06f
--- /dev/null
+++ b/src/mame/nec/pc98_cd.h
@@ -0,0 +1,23 @@
+// license:BSD-3-Clause
+// copyright-holders:smf
+
+#ifndef MAME_NEC_PC98_CD_H
+#define MAME_NEC_PC98_CD_H
+
+#include "bus/ata/atapicdr.h"
+
+class pc98_cd_device : public atapi_cdrom_device
+{
+public:
+ pc98_cd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+ virtual void fill_buffer() override;
+ virtual void process_command() override;
+ virtual void process_buffer() override;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(PC98_CD, pc98_cd_device)
+
+#endif // MAME_NEC_PC98_CD_H
diff --git a/src/mame/nec/pc9801_kbd.cpp b/src/mame/nec/pc98_kbd.cpp
index 9c5e3caef83..aee77b00b96 100644
--- a/src/mame/nec/pc9801_kbd.cpp
+++ b/src/mame/nec/pc98_kbd.cpp
@@ -25,7 +25,7 @@ TODO:
**************************************************************************************************/
#include "emu.h"
-#include "pc9801_kbd.h"
+#include "pc98_kbd.h"
#include "machine/keyboard.ipp"
//**************************************************************************
@@ -33,7 +33,7 @@ TODO:
//**************************************************************************
// device type definition
-DEFINE_DEVICE_TYPE(PC9801_KBD, pc9801_kbd_device, "pc9801_kbd", "PC-9801 Keyboard")
+DEFINE_DEVICE_TYPE(PC98_KBD, pc98_kbd_device, "pc98_kbd", "NEC PC-98 Keyboard")
//**************************************************************************
@@ -41,11 +41,11 @@ DEFINE_DEVICE_TYPE(PC9801_KBD, pc9801_kbd_device, "pc9801_kbd", "PC-9801 Keyboar
//**************************************************************************
//-------------------------------------------------
-// pc9801_kbd_device - constructor
+// pc98_kbd_device - constructor
//-------------------------------------------------
-pc9801_kbd_device::pc9801_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PC9801_KBD, tag, owner, clock)
+pc98_kbd_device::pc98_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, PC98_KBD, tag, owner, clock)
, device_buffered_serial_interface(mconfig, *this)
, device_matrix_keyboard_interface(mconfig, *this, "KEY0", "KEY1", "KEY2", "KEY3", "KEY4", "KEY5", "KEY6", "KEY7", "KEY8", "KEY9", "KEYA", "KEYB", "KEYC", "KEYD", "KEYE", "KEYF")
, m_tx_cb(*this)
@@ -59,7 +59,7 @@ pc9801_kbd_device::pc9801_kbd_device(const machine_config &mconfig, const char *
// on this device
//-------------------------------------------------
-void pc9801_kbd_device::device_validity_check(validity_checker &valid) const
+void pc98_kbd_device::device_validity_check(validity_checker &valid) const
{
}
@@ -68,7 +68,7 @@ void pc9801_kbd_device::device_validity_check(validity_checker &valid) const
// device_start - device-specific startup
//-------------------------------------------------
-void pc9801_kbd_device::device_start()
+void pc98_kbd_device::device_start()
{
// ...
}
@@ -78,7 +78,7 @@ void pc9801_kbd_device::device_start()
// device_reset - device-specific reset
//-------------------------------------------------
-void pc9801_kbd_device::device_reset()
+void pc98_kbd_device::device_reset()
{
clear_fifo();
set_data_frame(START_BIT_COUNT, DATA_BIT_COUNT, PARITY, STOP_BITS);
@@ -94,7 +94,7 @@ void pc9801_kbd_device::device_reset()
// m_repeat_state = false;
}
-uint8_t pc9801_kbd_device::translate(uint8_t row, uint8_t column)
+uint8_t pc98_kbd_device::translate(uint8_t row, uint8_t column)
{
return row * 8 + column;
}
@@ -263,7 +263,7 @@ static INPUT_PORTS_START( pc9801_kbd )
PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 7-8")
INPUT_PORTS_END
-ioport_constructor pc9801_kbd_device::device_input_ports() const
+ioport_constructor pc98_kbd_device::device_input_ports() const
{
return INPUT_PORTS_NAME( pc9801_kbd );
}
@@ -273,7 +273,7 @@ ioport_constructor pc9801_kbd_device::device_input_ports() const
// device_matrix_keyboard
//**************************************************************************
-void pc9801_kbd_device::key_make(uint8_t row, uint8_t column)
+void pc98_kbd_device::key_make(uint8_t row, uint8_t column)
{
uint8_t code = translate(row, column);
@@ -289,7 +289,7 @@ void pc9801_kbd_device::key_make(uint8_t row, uint8_t column)
}
}
-void pc9801_kbd_device::key_break(uint8_t row, uint8_t column)
+void pc98_kbd_device::key_break(uint8_t row, uint8_t column)
{
if (typematic_is(row, column))
typematic_stop();
@@ -299,7 +299,7 @@ void pc9801_kbd_device::key_break(uint8_t row, uint8_t column)
send_key(code | 0x80);
}
-void pc9801_kbd_device::key_repeat(uint8_t row, uint8_t column)
+void pc98_kbd_device::key_repeat(uint8_t row, uint8_t column)
{
// uint8_t code = translate(row, column);
@@ -309,7 +309,7 @@ void pc9801_kbd_device::key_repeat(uint8_t row, uint8_t column)
// send_key(code);
}
-void pc9801_kbd_device::send_key(uint8_t code)
+void pc98_kbd_device::send_key(uint8_t code)
{
transmit_byte(code);
if (fifo_full())
@@ -320,7 +320,7 @@ void pc9801_kbd_device::send_key(uint8_t code)
// Serial implementation
//**************************************************************************
-void pc9801_kbd_device::tra_complete()
+void pc98_kbd_device::tra_complete()
{
if (fifo_full())
start_processing(attotime::from_hz(BAUD));
@@ -328,7 +328,7 @@ void pc9801_kbd_device::tra_complete()
device_buffered_serial_interface::tra_complete();
}
-void pc9801_kbd_device::transmit_byte(u8 byte)
+void pc98_kbd_device::transmit_byte(u8 byte)
{
device_buffered_serial_interface::transmit_byte(byte);
if (fifo_full())
@@ -339,7 +339,7 @@ void pc9801_kbd_device::transmit_byte(u8 byte)
* 0xff: reset
* everything else: implementation specific, TBD (0x9* command, some have extra parameters)
*/
-void pc9801_kbd_device::received_byte(u8 byte)
+void pc98_kbd_device::received_byte(u8 byte)
{
logerror("received_byte 0x%02x\n", byte);
if (byte == 0xff)
@@ -354,13 +354,13 @@ void pc9801_kbd_device::received_byte(u8 byte)
}
}
-void pc9801_kbd_device::rcv_complete()
+void pc98_kbd_device::rcv_complete()
{
receive_register_extract();
received_byte(get_received_char());
}
-void pc9801_kbd_device::input_kbde(int state)
+void pc98_kbd_device::input_kbde(int state)
{
if (!m_kbde_state && state)
start_processing(attotime::from_hz(BAUD));
@@ -369,7 +369,7 @@ void pc9801_kbd_device::input_kbde(int state)
m_kbde_state = state;
}
-void pc9801_kbd_device::input_rty(int state)
+void pc98_kbd_device::input_rty(int state)
{
m_rty_state = state;
}
diff --git a/src/mame/nec/pc9801_kbd.h b/src/mame/nec/pc98_kbd.h
index 4ad199873e7..69c3a8f65f6 100644
--- a/src/mame/nec/pc9801_kbd.h
+++ b/src/mame/nec/pc98_kbd.h
@@ -5,8 +5,8 @@
PC-9801 Keyboard simulation
***************************************************************************/
-#ifndef MAME_NEC_PC9801_KBD_H
-#define MAME_NEC_PC9801_KBD_H
+#ifndef MAME_NEC_PC98_KBD_H
+#define MAME_NEC_PC98_KBD_H
#pragma once
@@ -17,15 +17,15 @@
// TYPE DEFINITIONS
//**************************************************************************
-// ======================> pc9801_kbd_device
+// ======================> pc98_kbd_device
-class pc9801_kbd_device : public device_t
+class pc98_kbd_device : public device_t
, public device_buffered_serial_interface<16U>
, protected device_matrix_keyboard_interface<16>
{
public:
// construction/destruction
- pc9801_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pc98_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override ATTR_COLD;
@@ -77,7 +77,7 @@ private:
// device type definition
-DECLARE_DEVICE_TYPE(PC9801_KBD, pc9801_kbd_device)
+DECLARE_DEVICE_TYPE(PC98_KBD, pc98_kbd_device)
@@ -87,4 +87,4 @@ DECLARE_DEVICE_TYPE(PC9801_KBD, pc9801_kbd_device)
-#endif // MAME_NEC_PC9801_KBD_H
+#endif // MAME_NEC_PC98_KBD_H
diff --git a/src/mame/nec/pc9801_memsw.cpp b/src/mame/nec/pc98_memsw.cpp
index e0d732a84f6..fa78efe8329 100644
--- a/src/mame/nec/pc9801_memsw.cpp
+++ b/src/mame/nec/pc98_memsw.cpp
@@ -77,7 +77,7 @@
***************************************************************************/
#include "emu.h"
-#include "pc9801_memsw.h"
+#include "pc98_memsw.h"
#include "coreutil.h"
@@ -86,7 +86,7 @@
//**************************************************************************
// device type definition
-DEFINE_DEVICE_TYPE(PC9801_MEMSW, pc9801_memsw_device, "pc9801_memsw", "NEC PC-9801 Memory Switch device")
+DEFINE_DEVICE_TYPE(PC98_MEMSW, pc98_memsw_device, "pc98_memsw", "NEC PC-98 Memory Switch device")
//**************************************************************************
@@ -94,11 +94,11 @@ DEFINE_DEVICE_TYPE(PC9801_MEMSW, pc9801_memsw_device, "pc9801_memsw", "NEC PC-98
//**************************************************************************
//-------------------------------------------------
-// pc9801_memsw_device - constructor
+// pc98_memsw_device - constructor
//-------------------------------------------------
-pc9801_memsw_device::pc9801_memsw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PC9801_MEMSW, tag, owner, clock),
+pc98_memsw_device::pc98_memsw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, PC98_MEMSW, tag, owner, clock),
device_nvram_interface(mconfig, *this)
{
}
@@ -109,7 +109,7 @@ pc9801_memsw_device::pc9801_memsw_device(const machine_config &mconfig, const ch
// device_start - device-specific startup
//-------------------------------------------------
-void pc9801_memsw_device::device_start()
+void pc98_memsw_device::device_start()
{
save_pointer(NAME(m_bram), m_bram_size);
}
@@ -119,12 +119,12 @@ void pc9801_memsw_device::device_start()
// device_reset - device-specific reset
//-------------------------------------------------
-void pc9801_memsw_device::device_reset()
+void pc98_memsw_device::device_reset()
{
}
-void pc9801_memsw_device::nvram_default()
+void pc98_memsw_device::nvram_default()
{
system_time systime;
@@ -142,13 +142,13 @@ void pc9801_memsw_device::nvram_default()
m_bram[0xf] = dec_2_bcd(systime.local_time.year - 2000) & 0xff;
}
-bool pc9801_memsw_device::nvram_read(util::read_stream &file)
+bool pc98_memsw_device::nvram_read(util::read_stream &file)
{
auto const [err, actual_size] = util::read(file, m_bram, m_bram_size);
return !err && (actual_size == m_bram_size);
}
-bool pc9801_memsw_device::nvram_write(util::write_stream &file)
+bool pc98_memsw_device::nvram_write(util::write_stream &file)
{
auto const [err, actual_size] = util::write(file, m_bram, m_bram_size);
return !err;
@@ -158,12 +158,12 @@ bool pc9801_memsw_device::nvram_write(util::write_stream &file)
// READ/WRITE HANDLERS
//**************************************************************************
-uint8_t pc9801_memsw_device::read(uint8_t offset)
+uint8_t pc98_memsw_device::read(uint8_t offset)
{
return m_bram[offset];
}
-void pc9801_memsw_device::write( uint8_t offset, uint8_t data )
+void pc98_memsw_device::write( uint8_t offset, uint8_t data )
{
m_bram[offset] = data;
}
diff --git a/src/mame/nec/pc9801_memsw.h b/src/mame/nec/pc98_memsw.h
index e376cbae5a4..37f2d69be25 100644
--- a/src/mame/nec/pc9801_memsw.h
+++ b/src/mame/nec/pc98_memsw.h
@@ -6,8 +6,8 @@ Template for skeleton device
***************************************************************************/
-#ifndef MAME_NEC_PC9801_MEMSW_H
-#define MAME_NEC_PC9801_MEMSW_H
+#ifndef MAME_NEC_PC98_MEMSW_H
+#define MAME_NEC_PC98_MEMSW_H
#pragma once
@@ -24,20 +24,18 @@ Template for skeleton device
// TYPE DEFINITIONS
//**************************************************************************
-// ======================> pc9801_memsw_device
+// ======================> pc98_memsw_device
-class pc9801_memsw_device : public device_t,
+class pc98_memsw_device : public device_t,
public device_nvram_interface
{
public:
- // construction/destruction
- pc9801_memsw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pc98_memsw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
uint8_t read(uint8_t offset);
void write(uint8_t offset, uint8_t data);
protected:
- // device-level overrides
virtual void device_start() override ATTR_COLD;
virtual void device_reset() override ATTR_COLD;
virtual void nvram_default() override;
@@ -51,6 +49,6 @@ private:
// device type definition
-DECLARE_DEVICE_TYPE(PC9801_MEMSW, pc9801_memsw_device)
+DECLARE_DEVICE_TYPE(PC98_MEMSW, pc98_memsw_device)
-#endif // MAME_NEC_PC9801_MEMSW_H
+#endif // MAME_NEC_PC98_MEMSW_H
diff --git a/src/mame/nec/pc98ha.cpp b/src/mame/nec/pc98ha.cpp
index 34c195538ce..9a1d7acd9d2 100644
--- a/src/mame/nec/pc98ha.cpp
+++ b/src/mame/nec/pc98ha.cpp
@@ -443,7 +443,7 @@ void pc98lt_state::lt_config(machine_config &config)
pc9801_serial(config);
I8251(config, m_sio_kbd, 0);
- m_sio_kbd->txd_handler().set("keyb", FUNC(pc9801_kbd_device::input_txd));
+ m_sio_kbd->txd_handler().set("keyb", FUNC(pc98_kbd_device::input_txd));
m_sio_kbd->rxrdy_handler().set_inputline(m_maincpu, INPUT_LINE_IRQ1);
m_sio_kbd->write_cts(0);
m_sio_kbd->write_dsr(0);
@@ -452,7 +452,7 @@ void pc98lt_state::lt_config(machine_config &config)
kbd_clock.signal_handler().set(m_sio_kbd, FUNC(i8251_device::write_rxc));
kbd_clock.signal_handler().append(m_sio_kbd, FUNC(i8251_device::write_txc));
- PC9801_KBD(config, m_keyb, 0);
+ PC98_KBD(config, m_keyb, 0);
m_keyb->rxd_callback().set("sio_kbd", FUNC(i8251_device::write_rxd));
I8255(config, m_ppi_sys, 0);