diff options
| author | 2025-10-12 16:59:32 +0200 | |
|---|---|---|
| committer | 2025-10-12 16:59:58 +0200 | |
| commit | 88472ddcfbea035b9a6b56332c9a2c5ecfa4961f (patch) | |
| tree | 0e287230de034d38324f060c83ab37d90934365f | |
| parent | 10d79099817f9b451d384f289f44a8d04e2b2061 (diff) | |
mcs51: Rename the external data bus from io to data
136 files changed, 374 insertions, 390 deletions
diff --git a/src/devices/bus/archimedes/podule/faxpack.cpp b/src/devices/bus/archimedes/podule/faxpack.cpp index bcbce02d706..14a34f9d56d 100644 --- a/src/devices/bus/archimedes/podule/faxpack.cpp +++ b/src/devices/bus/archimedes/podule/faxpack.cpp @@ -45,7 +45,7 @@ private: required_memory_region m_podule_rom; void mem_map(address_map &map) ATTR_COLD; - void io_map(address_map &map) ATTR_COLD; + void data_map(address_map &map) ATTR_COLD; }; @@ -60,7 +60,7 @@ void arc_faxpack_device::mem_map(address_map &map) map(0x0000, 0x7fff).rom().region("podule_rom", 0); } -void arc_faxpack_device::io_map(address_map &map) +void arc_faxpack_device::data_map(address_map &map) { //map(0x2000, 0x201f).rw("modem", FUNC(r96dfx_device::read), FUNC(r96dfx_device::write)); map(0x6000, 0x63ff).rw("dpram", FUNC(idt7130_device::left_r), FUNC(idt7130_device::left_w)); @@ -90,7 +90,7 @@ void arc_faxpack_device::device_add_mconfig(machine_config &config) { I8031(config, m_mcu, 11.0592_MHz_XTAL); m_mcu->set_addrmap(AS_PROGRAM, &arc_faxpack_device::mem_map); - m_mcu->set_addrmap(AS_IO, &arc_faxpack_device::io_map); + m_mcu->set_addrmap(AS_DATA, &arc_faxpack_device::data_map); idt7130_device &dpram(IDT7130(config, "dpram")); dpram.intl_callback().set_inputline(m_mcu, MCS51_INT0_LINE); diff --git a/src/devices/bus/ata/zip100.cpp b/src/devices/bus/ata/zip100.cpp index 53a12eeda1b..b7d24c340b4 100644 --- a/src/devices/bus/ata/zip100.cpp +++ b/src/devices/bus/ata/zip100.cpp @@ -85,7 +85,7 @@ void zip100_ide_device::device_add_mconfig(machine_config &config) { i80c32_device &mcu(I80C32(config, "mcu", 12'000'000)); // custom SoC; clock unknown mcu.set_addrmap(AS_PROGRAM, &zip100_ide_device::mem_map); - mcu.set_addrmap(AS_IO, &zip100_ide_device::ext_map); + mcu.set_addrmap(AS_DATA, &zip100_ide_device::ext_map); } ROM_START(zip100_ide) diff --git a/src/devices/bus/isa/cl_sh260.cpp b/src/devices/bus/isa/cl_sh260.cpp index a06b7b625a6..231c1deab6a 100644 --- a/src/devices/bus/isa/cl_sh260.cpp +++ b/src/devices/bus/isa/cl_sh260.cpp @@ -57,7 +57,7 @@ void isa16_ev346_device::device_add_mconfig(machine_config &config) { i8031_device &mcu(I8031(config, "mcu", 12_MHz_XTAL)); // SCN8031HCCN40 mcu.set_addrmap(AS_PROGRAM, &isa16_ev346_device::i8031_map); - mcu.set_addrmap(AS_IO, &isa16_ev346_device::ext_map); + mcu.set_addrmap(AS_DATA, &isa16_ev346_device::ext_map); DP8473(config, m_fdc, 24_MHz_XTAL); } @@ -66,7 +66,7 @@ void isa16_jc1310_device::device_add_mconfig(machine_config &config) { i8031_device &mcu(I8031(config, "mcu", 10_MHz_XTAL)); // P8031AH mcu.set_addrmap(AS_PROGRAM, &isa16_jc1310_device::i8031_map); - mcu.set_addrmap(AS_IO, &isa16_jc1310_device::ext_map); + mcu.set_addrmap(AS_DATA, &isa16_jc1310_device::ext_map); WD37C65C(config, m_fdc, 16_MHz_XTAL, 9.6_MHz_XTAL); // WD37C65B-PL } diff --git a/src/devices/bus/isa/lrk330.cpp b/src/devices/bus/isa/lrk330.cpp index 18cd1bfe29e..659a0855598 100644 --- a/src/devices/bus/isa/lrk330.cpp +++ b/src/devices/bus/isa/lrk330.cpp @@ -107,7 +107,7 @@ void lrk331_device::device_add_mconfig(machine_config &config) { I8032(config, m_mcu, 24_MHz_XTAL / 2); m_mcu->set_addrmap(AS_PROGRAM, &lrk331_device::ucode_map); - m_mcu->set_addrmap(AS_IO, &lrk331_device::ext_map); + m_mcu->set_addrmap(AS_DATA, &lrk331_device::ext_map); //LD1111(config, m_hdc, 24_MHz_XTAL); diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp index b260edca7b9..40da4499f4f 100644 --- a/src/devices/bus/isa/sb16.cpp +++ b/src/devices/bus/isa/sb16.cpp @@ -380,7 +380,7 @@ ROM_START( sb16 ) ROM_LOAD("ct1741_v413_xor.bin", 0x00, 0x40, CRC(5243d15a) SHA1(c7637c92828843f47e6e2f956af639b07aee4571)) ROM_END -void sb16_lle_device::sb16_io(address_map &map) +void sb16_lle_device::sb16_data(address_map &map) { map(0x0000, 0x0000).mirror(0xff00).rw(FUNC(sb16_lle_device::dsp_data_r), FUNC(sb16_lle_device::dsp_data_w)); // map(0x0001, 0x0001) // MIDI related? @@ -428,7 +428,7 @@ const tiny_rom_entry *sb16_lle_device::device_rom_region() const void sb16_lle_device::device_add_mconfig(machine_config &config) { I80C52(config, m_cpu, XTAL(24'000'000)); - m_cpu->set_addrmap(AS_IO, &sb16_lle_device::sb16_io); + m_cpu->set_addrmap(AS_DATA, &sb16_lle_device::sb16_data); m_cpu->port_in_cb<1>().set(FUNC(sb16_lle_device::p1_r)); m_cpu->port_out_cb<1>().set(FUNC(sb16_lle_device::p1_w)); m_cpu->port_in_cb<2>().set(FUNC(sb16_lle_device::p2_r)); diff --git a/src/devices/bus/isa/sb16.h b/src/devices/bus/isa/sb16.h index 9facc1e201e..8bb8d2a79a0 100644 --- a/src/devices/bus/isa/sb16.h +++ b/src/devices/bus/isa/sb16.h @@ -82,7 +82,7 @@ private: uint8_t dsp_wbuf_status_r(offs_t offset); uint8_t dsp_rbuf_status_r(offs_t offset); - void sb16_io(address_map &map) ATTR_COLD; + void sb16_data(address_map &map) ATTR_COLD; void host_io(address_map &map) ATTR_COLD; void control_timer(bool start); diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp index bfd6eb6cfe5..a5fc2a0b870 100644 --- a/src/devices/bus/isa/stereo_fx.cpp +++ b/src/devices/bus/isa/stereo_fx.cpp @@ -93,7 +93,7 @@ ROM_START( stereo_fx ) ROM_LOAD("ati_stereo_fx.bin", 0x0000, 0x8000, CRC(1bebffa6) SHA1(e66c2619a6c05199554b5702d67877ae3799d415)) ROM_END -void stereo_fx_device::stereo_fx_io(address_map &map) +void stereo_fx_device::stereo_fx_data(address_map &map) { map(0xFF00, 0xFF00).w(FUNC(stereo_fx_device::port00_w)); map(0xFF10, 0xFF10).w("rdac", FUNC(dac_byte_interface::data_w)); @@ -118,7 +118,7 @@ void stereo_fx_device::device_add_mconfig(machine_config &config) { I80C31(config, m_cpu, XTAL(30'000'000)); m_cpu->set_addrmap(AS_PROGRAM, &stereo_fx_device::stereo_fx_rom); - m_cpu->set_addrmap(AS_IO, &stereo_fx_device::stereo_fx_io); + m_cpu->set_addrmap(AS_DATA, &stereo_fx_device::stereo_fx_data); m_cpu->port_in_cb<1>().set(FUNC(stereo_fx_device::p1_r)); m_cpu->port_out_cb<1>().set("ldac", FUNC(dac_byte_interface::data_w)); m_cpu->port_in_cb<3>().set(FUNC(stereo_fx_device::p3_r)); diff --git a/src/devices/bus/isa/stereo_fx.h b/src/devices/bus/isa/stereo_fx.h index e31fbe35e25..32135ed3f98 100644 --- a/src/devices/bus/isa/stereo_fx.h +++ b/src/devices/bus/isa/stereo_fx.h @@ -73,7 +73,7 @@ private: uint8_t invalid_r(); void invalid_w(uint8_t data); - void stereo_fx_io(address_map &map) ATTR_COLD; + void stereo_fx_data(address_map &map) ATTR_COLD; void stereo_fx_rom(address_map &map) ATTR_COLD; }; diff --git a/src/devices/bus/nscsi/applecd.cpp b/src/devices/bus/nscsi/applecd.cpp index aec8a154c7a..34d919e2b06 100644 --- a/src/devices/bus/nscsi/applecd.cpp +++ b/src/devices/bus/nscsi/applecd.cpp @@ -68,7 +68,7 @@ void applecd150_device::device_add_mconfig(machine_config &config) { i80c31_device &mcu1(I80C31(config, "mcu1", 12_MHz_XTAL)); mcu1.set_addrmap(AS_PROGRAM, &applecd150_device::prog_map); - mcu1.set_addrmap(AS_IO, &applecd150_device::ext_map); + mcu1.set_addrmap(AS_DATA, &applecd150_device::ext_map); M37450(config, "mcu2", 16.9344_MHz_XTAL / 2).set_disable(); diff --git a/src/devices/bus/pc_kbd/cherry_mx1500.cpp b/src/devices/bus/pc_kbd/cherry_mx1500.cpp index c0f796d40e6..cc6fe1c2fc8 100644 --- a/src/devices/bus/pc_kbd/cherry_mx1500.cpp +++ b/src/devices/bus/pc_kbd/cherry_mx1500.cpp @@ -316,7 +316,7 @@ void cherry_g80_1500_device::device_add_mconfig(machine_config &config) { i8032_device &mcu(I8032(config, m_mcu, 7'392'000)); // exact type and clock unknown (might actually use a more conventional 7.3728 MHz XTAL, as on G80-1000) mcu.set_addrmap(AS_PROGRAM, &cherry_g80_1500_device::prog_map); - mcu.set_addrmap(AS_IO, &cherry_g80_1500_device::ext_map); + mcu.set_addrmap(AS_DATA, &cherry_g80_1500_device::ext_map); mcu.port_out_cb<1>().set(FUNC(cherry_g80_1500_device::mcu_p1_w)); mcu.port_in_cb<3>().set(FUNC(cherry_g80_1500_device::mcu_p3_r)); mcu.port_out_cb<3>().set(FUNC(cherry_g80_1500_device::mcu_p3_w)); diff --git a/src/devices/bus/pc_kbd/keytro.cpp b/src/devices/bus/pc_kbd/keytro.cpp index 53a140894e7..bc6c8342115 100644 --- a/src/devices/bus/pc_kbd/keytro.cpp +++ b/src/devices/bus/pc_kbd/keytro.cpp @@ -348,7 +348,7 @@ void pc_kbd_keytronic_pc3270_device::keytronic_pc3270_program(address_map &map) map(0x0000, 0x0fff).rom().region("kb_keytr", 0); } -void pc_kbd_keytronic_pc3270_device::keytronic_pc3270_io(address_map &map) +void pc_kbd_keytronic_pc3270_device::keytronic_pc3270_data(address_map &map) { map(0x0000, 0xffff).rw(FUNC(pc_kbd_keytronic_pc3270_device::internal_data_read), FUNC(pc_kbd_keytronic_pc3270_device::internal_data_write)); } @@ -424,7 +424,7 @@ void pc_kbd_keytronic_pc3270_device::device_add_mconfig(machine_config &config) { I8051(config, m_cpu, 11060250); m_cpu->set_addrmap(AS_PROGRAM, &pc_kbd_keytronic_pc3270_device::keytronic_pc3270_program); - m_cpu->set_addrmap(AS_IO, &pc_kbd_keytronic_pc3270_device::keytronic_pc3270_io); + m_cpu->set_addrmap(AS_DATA, &pc_kbd_keytronic_pc3270_device::keytronic_pc3270_data); m_cpu->port_in_cb<1>().set(FUNC(pc_kbd_keytronic_pc3270_device::p1_read)); m_cpu->port_out_cb<1>().set(FUNC(pc_kbd_keytronic_pc3270_device::p1_write)); m_cpu->port_in_cb<2>().set(FUNC(pc_kbd_keytronic_pc3270_device::p2_read)); diff --git a/src/devices/bus/pc_kbd/keytro.h b/src/devices/bus/pc_kbd/keytro.h index df4515511df..3f14d9bf1a5 100644 --- a/src/devices/bus/pc_kbd/keytro.h +++ b/src/devices/bus/pc_kbd/keytro.h @@ -56,7 +56,7 @@ protected: uint8_t p3_read(); void p3_write(uint8_t data); - void keytronic_pc3270_io(address_map &map) ATTR_COLD; + void keytronic_pc3270_data(address_map &map) ATTR_COLD; void keytronic_pc3270_program(address_map &map) ATTR_COLD; required_device<i8051_device> m_cpu; diff --git a/src/devices/bus/psi_kbd/ergoline.cpp b/src/devices/bus/psi_kbd/ergoline.cpp index 7b892cf861b..dba0f5b7bfe 100644 --- a/src/devices/bus/psi_kbd/ergoline.cpp +++ b/src/devices/bus/psi_kbd/ergoline.cpp @@ -27,7 +27,7 @@ void ergoline_keyboard_device::kbd_mem(address_map &map) map(0x0000, 0x0fff).rom().region("firmware", 0); } -void ergoline_keyboard_device::kbd_io(address_map &map) +void ergoline_keyboard_device::kbd_data(address_map &map) { } @@ -62,7 +62,7 @@ void ergoline_keyboard_device::device_add_mconfig(machine_config &config) { i8031_device &maincpu(I8031(config, "maincpu", XTAL(5'529'600))); maincpu.set_addrmap(AS_PROGRAM, &ergoline_keyboard_device::kbd_mem); - maincpu.set_addrmap(AS_IO, &ergoline_keyboard_device::kbd_io); + maincpu.set_addrmap(AS_DATA, &ergoline_keyboard_device::kbd_data); } diff --git a/src/devices/bus/psi_kbd/ergoline.h b/src/devices/bus/psi_kbd/ergoline.h index 4a94376167e..d83f4e2dc54 100644 --- a/src/devices/bus/psi_kbd/ergoline.h +++ b/src/devices/bus/psi_kbd/ergoline.h @@ -42,7 +42,7 @@ protected: virtual void tx_w(int state) override; private: - void kbd_io(address_map &map) ATTR_COLD; + void kbd_data(address_map &map) ATTR_COLD; void kbd_mem(address_map &map) ATTR_COLD; }; diff --git a/src/devices/cpu/mcs51/mcs51.cpp b/src/devices/cpu/mcs51/mcs51.cpp index 5c0e9034f6d..9d64c842c84 100644 --- a/src/devices/cpu/mcs51/mcs51.cpp +++ b/src/devices/cpu/mcs51/mcs51.cpp @@ -55,8 +55,8 @@ * * Notes: * - * The term cycles is used here to really refer to clock oscilations, because 1 machine cycle - * actually takes 12 oscilations. + * The term cycles is used here to really refer to clock oscillations, because 1 machine cycle + * actually takes 12 oscillations. * * Read/Write/Modify Instruction - * Data is read from the Port Latch (not the Port Pin!), possibly modified, and @@ -236,7 +236,7 @@ void mcs51_cpu_device::program_internal(address_map &map) map(0, m_rom_size - 1).rom().region(DEVICE_SELF, 0); } -void mcs51_cpu_device::data_internal(address_map &map) +void mcs51_cpu_device::io_internal(address_map &map) { map(0x0000, m_ram_mask).ram().share("scratchpad"); map(0x0100, 0x01ff).ram().share("sfr_ram"); /* SFR */ @@ -244,16 +244,16 @@ void mcs51_cpu_device::data_internal(address_map &map) -mcs51_cpu_device::mcs51_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor program_map, address_map_constructor data_map, int program_width, int data_width, uint8_t features) +mcs51_cpu_device::mcs51_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor program_map, address_map_constructor io_map, int program_width, int io_width, uint8_t features) : cpu_device(mconfig, type, tag, owner, clock) , m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0, program_map) - , m_data_config("data", ENDIANNESS_LITTLE, 8, 9, 0, data_map) - , m_io_config("io", ENDIANNESS_LITTLE, 8, (features & FEATURE_DS5002FP) ? 18 : 16, 0) + , m_data_config("data", ENDIANNESS_LITTLE, 8, (features & FEATURE_DS5002FP) ? 18 : 16, 0) + , m_intd_config("internal_direct", ENDIANNESS_LITTLE, 8, 9, 0, io_map) , m_pc(0) , m_features(features) , m_inst_cycles(0) , m_rom_size(program_width > 0 ? 1 << program_width : 0) - , m_ram_mask((data_width == 8) ? 0xff : 0x7f) + , m_ram_mask((io_width == 8) ? 0xff : 0x7f) , m_num_interrupts(5) , m_sfr_ram(*this, "sfr_ram") , m_scratchpad(*this, "scratchpad") @@ -271,8 +271,8 @@ mcs51_cpu_device::mcs51_cpu_device(const machine_config &mconfig, device_type ty } -mcs51_cpu_device::mcs51_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int data_width, uint8_t features) - : mcs51_cpu_device(mconfig, type, tag, owner, clock, address_map_constructor(FUNC(mcs51_cpu_device::program_internal), this), address_map_constructor(FUNC(mcs51_cpu_device::data_internal), this), program_width, data_width, features) +mcs51_cpu_device::mcs51_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int io_width, uint8_t features) + : mcs51_cpu_device(mconfig, type, tag, owner, clock, address_map_constructor(FUNC(mcs51_cpu_device::program_internal), this), address_map_constructor(FUNC(mcs51_cpu_device::io_internal), this), program_width, io_width, features) { } @@ -297,8 +297,8 @@ am8753_device::am8753_device(const machine_config &mconfig, const char *tag, dev { } -i8052_device::i8052_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int data_width, uint8_t features) - : mcs51_cpu_device(mconfig, type, tag, owner, clock, program_width, data_width, features | FEATURE_I8052) +i8052_device::i8052_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int io_width, uint8_t features) + : mcs51_cpu_device(mconfig, type, tag, owner, clock, program_width, io_width, features | FEATURE_I8052) { m_num_interrupts = 6; } @@ -323,8 +323,8 @@ i80c31_device::i80c31_device(const machine_config &mconfig, const char *tag, dev { } -i80c51_device::i80c51_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int data_width, uint8_t features) - : mcs51_cpu_device(mconfig, type, tag, owner, clock, program_width, data_width, features | FEATURE_CMOS) +i80c51_device::i80c51_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int io_width, uint8_t features) + : mcs51_cpu_device(mconfig, type, tag, owner, clock, program_width, io_width, features | FEATURE_CMOS) { } @@ -339,8 +339,8 @@ i87c51_device::i87c51_device(const machine_config &mconfig, const char *tag, dev } -i80c52_device::i80c52_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int data_width, uint8_t features) - : i8052_device(mconfig, type, tag, owner, clock, program_width, data_width, features | FEATURE_I80C52 | FEATURE_CMOS) +i80c52_device::i80c52_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int io_width, uint8_t features) + : i8052_device(mconfig, type, tag, owner, clock, program_width, io_width, features | FEATURE_I80C52 | FEATURE_CMOS) { } @@ -360,8 +360,8 @@ i87c52_device::i87c52_device(const machine_config &mconfig, const char *tag, dev { } -i87c51fa_device::i87c51fa_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int data_width, uint8_t features) - : i80c52_device(mconfig, type, tag, owner, clock, program_width, data_width, features) +i87c51fa_device::i87c51fa_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int io_width, uint8_t features) + : i80c52_device(mconfig, type, tag, owner, clock, program_width, io_width, features) { } @@ -410,8 +410,8 @@ i8744_device::i8744_device(const machine_config &mconfig, const char *tag, devic { } -p80c562_device::p80c562_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int data_width, uint8_t features) - : i80c51_device(mconfig, type, tag, owner, clock, program_width, data_width, features) +p80c562_device::p80c562_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int io_width, uint8_t features) + : i80c51_device(mconfig, type, tag, owner, clock, program_width, io_width, features) { } @@ -443,7 +443,7 @@ device_memory_interface::space_config_vector mcs51_cpu_device::memory_space_conf return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config), - std::make_pair(AS_IO, &m_io_config) + std::make_pair(AS_INTD, &m_intd_config) }; } @@ -460,8 +460,8 @@ device_memory_interface::space_config_vector mcs51_cpu_device::memory_space_conf #define CODEMEM_R(a) (uint8_t)m_program.read_byte(a) /* Read/Write a byte from/to External Data Memory (Usually RAM or other I/O) */ -#define DATAMEM_R(a) (uint8_t)m_io.read_byte(a) -#define DATAMEM_W(a,v) m_io.write_byte(a, v) +#define DATAMEM_R(a) (uint8_t)m_data.read_byte(a) +#define DATAMEM_W(a,v) m_data.write_byte(a, v) /* Read/Write a byte from/to the Internal RAM */ @@ -470,8 +470,8 @@ device_memory_interface::space_config_vector mcs51_cpu_device::memory_space_conf /* Read/Write a byte from/to the Internal RAM indirectly */ /* (called from indirect addressing) */ -uint8_t mcs51_cpu_device::iram_iread(offs_t a) { return (a <= m_ram_mask) ? m_data.read_byte(a) : 0xff; } -void mcs51_cpu_device::iram_iwrite(offs_t a, uint8_t d) { if (a <= m_ram_mask) m_data.write_byte(a, d); } +uint8_t mcs51_cpu_device::iram_iread(offs_t a) { return (a <= m_ram_mask) ? m_intd.read_byte(a) : 0xff; } +void mcs51_cpu_device::iram_iwrite(offs_t a, uint8_t d) { if (a <= m_ram_mask) m_intd.write_byte(a, d); } #define IRAM_IR(a) iram_iread(a) #define IRAM_IW(a, d) iram_iwrite(a, d) @@ -875,13 +875,13 @@ offs_t mcs51_cpu_device::external_ram_iaddr(offs_t offset, offs_t mem_mask) uint8_t mcs51_cpu_device::iram_read(size_t offset) { - return ((offset < 0x80) ? m_data.read_byte(offset) : sfr_read(offset)); + return ((offset < 0x80) ? m_intd.read_byte(offset) : sfr_read(offset)); } void mcs51_cpu_device::iram_write(size_t offset, uint8_t data) { if (offset < 0x80) - m_data.write_byte(offset, data); + m_intd.write_byte(offset, data); else sfr_write(offset, data); } @@ -1817,7 +1817,7 @@ void mcs51_cpu_device::execute_op(uint8_t op) OPCODE CYCLES ***************************************************************************/ -/* # of oscilations each opcode requires*/ +/* # of oscillations each opcode requires*/ const uint8_t mcs51_cpu_device::mcs51_cycles[256] = { 1,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1, @@ -2220,7 +2220,7 @@ void mcs51_cpu_device::sfr_write(size_t offset, uint8_t data) /* no write in this case according to manual */ return; } - m_data.write_byte((size_t)offset | 0x100, data); + m_intd.write_byte((size_t)offset | 0x100, data); } uint8_t mcs51_cpu_device::sfr_read(size_t offset) @@ -2255,7 +2255,7 @@ uint8_t mcs51_cpu_device::sfr_read(size_t offset) case ADDR_SBUF: case ADDR_IE: case ADDR_IP: - return m_data.read_byte((size_t) offset | 0x100); + return m_intd.read_byte((size_t) offset | 0x100); /* Illegal or non-implemented sfr */ default: LOG("attemping to read an invalid/non-implemented SFR address: %x at 0x%04x\n", (uint32_t)offset,PC); @@ -2269,7 +2269,7 @@ void mcs51_cpu_device::device_start() { space(AS_PROGRAM).cache(m_program); space(AS_DATA).specific(m_data); - space(AS_IO).specific(m_io); + space(AS_INTD).specific(m_intd); /* Save states */ save_item(NAME(m_ppc)); @@ -2469,7 +2469,7 @@ void i8052_device::sfr_write(size_t offset, uint8_t data) case ADDR_RCAP2H: case ADDR_TL2: case ADDR_TH2: - m_data.write_byte((size_t) offset | 0x100, data); + m_intd.write_byte((size_t) offset | 0x100, data); break; default: @@ -2487,7 +2487,7 @@ uint8_t i8052_device::sfr_read(size_t offset) case ADDR_RCAP2H: case ADDR_TL2: case ADDR_TH2: - return m_data.read_byte((size_t) offset | 0x100); + return m_intd.read_byte((size_t) offset | 0x100); default: return mcs51_cpu_device::sfr_read(offset); } @@ -2517,7 +2517,7 @@ void i80c52_device::sfr_write(size_t offset, uint8_t data) i8052_device::sfr_write(offset, data); return; } - m_data.write_byte((size_t) offset | 0x100, data); + m_intd.write_byte((size_t) offset | 0x100, data); } uint8_t i80c52_device::sfr_read(size_t offset) @@ -2528,7 +2528,7 @@ uint8_t i80c52_device::sfr_read(size_t offset) case ADDR_IPH: case ADDR_SADDR: case ADDR_SADEN: - return m_data.read_byte((size_t) offset | 0x100); + return m_intd.read_byte((size_t) offset | 0x100); default: return i8052_device::sfr_read(offset); } @@ -2581,7 +2581,7 @@ void ds5002fp_device::sfr_write(size_t offset, uint8_t data) mcs51_cpu_device::sfr_write(offset, data); return; } - m_data.write_byte((size_t) offset | 0x100, data); + m_intd.write_byte((size_t) offset | 0x100, data); } @@ -2624,7 +2624,7 @@ uint8_t ds5002fp_device::sfr_read(size_t offset) default: return mcs51_cpu_device::sfr_read(offset); } - return m_data.read_byte((size_t) offset | 0x100); + return m_intd.read_byte((size_t) offset | 0x100); } /* diff --git a/src/devices/cpu/mcs51/mcs51.h b/src/devices/cpu/mcs51/mcs51.h index 340f520eed4..da4ab9d4908 100644 --- a/src/devices/cpu/mcs51/mcs51.h +++ b/src/devices/cpu/mcs51/mcs51.h @@ -46,12 +46,17 @@ public: template <unsigned N> auto port_out_cb() { return m_port_out_cb[N].bind(); } void program_internal(address_map &map) ATTR_COLD; - void data_internal(address_map &map) ATTR_COLD; + void io_internal(address_map &map) ATTR_COLD; protected: + enum { + AS_INTD = 4, + AS_INTI = 5, + }; + // construction/destruction - mcs51_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int data_width, uint8_t features = 0); - mcs51_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor program_map, address_map_constructor data_map, int program_width, int data_width, uint8_t features = 0); + mcs51_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int io_width, uint8_t features = 0); + mcs51_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor program_map, address_map_constructor io_map, int program_width, int io_width, uint8_t features = 0); // device-level overrides virtual void device_start() override ATTR_COLD; @@ -76,7 +81,7 @@ protected: address_space_config m_program_config; address_space_config m_data_config; - address_space_config m_io_config; + address_space_config m_intd_config; // Internal stuff uint16_t m_ppc; // previous pc @@ -132,8 +137,8 @@ protected: // Memory spaces memory_access<16, 0, 0, ENDIANNESS_LITTLE>::cache m_program; - memory_access< 9, 0, 0, ENDIANNESS_LITTLE>::specific m_data; - memory_access<18, 0, 0, ENDIANNESS_LITTLE>::specific m_io; + memory_access<18, 0, 0, ENDIANNESS_LITTLE>::specific m_data; + memory_access< 9, 0, 0, ENDIANNESS_LITTLE>::specific m_intd; devcb_read8::array<4> m_port_in_cb; devcb_write8::array<4> m_port_out_cb; @@ -374,7 +379,7 @@ public: i8052_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - i8052_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int data_width, uint8_t features = 0); + i8052_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int io_width, uint8_t features = 0); virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; @@ -415,7 +420,7 @@ public: i80c51_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - i80c51_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int data_width, uint8_t features = 0); + i80c51_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int io_width, uint8_t features = 0); virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; }; @@ -435,7 +440,7 @@ public: i80c52_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - i80c52_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int data_width, uint8_t features = 0); + i80c52_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int io_width, uint8_t features = 0); virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; @@ -465,7 +470,7 @@ public: i87c51fa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - i87c51fa_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int data_width, uint8_t features = 0); + i87c51fa_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int io_width, uint8_t features = 0); virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; }; @@ -548,7 +553,7 @@ public: p80c562_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - p80c562_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int data_width, uint8_t features = 0); + p80c562_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int program_width, int io_width, uint8_t features = 0); virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; }; diff --git a/src/devices/sound/qs1000.cpp b/src/devices/sound/qs1000.cpp index b3e87b1515a..c5b99a167f4 100644 --- a/src/devices/sound/qs1000.cpp +++ b/src/devices/sound/qs1000.cpp @@ -143,7 +143,7 @@ void qs1000_device::qs1000_prg_map(address_map &map) } -void qs1000_device::qs1000_io_map(address_map &map) +void qs1000_device::qs1000_data_map(address_map &map) { map(0x0000, 0x00ff).ram(); map(0x0200, 0x0211).w(FUNC(qs1000_device::wave_w)); @@ -199,7 +199,7 @@ void qs1000_device::device_add_mconfig(machine_config &config) { I8052(config, m_cpu, DERIVED_CLOCK(1, 1)); m_cpu->set_addrmap(AS_PROGRAM, &qs1000_device::qs1000_prg_map); - m_cpu->set_addrmap(AS_IO, &qs1000_device::qs1000_io_map); + m_cpu->set_addrmap(AS_DATA, &qs1000_device::qs1000_data_map); m_cpu->port_in_cb<1>().set(FUNC(qs1000_device::p1_r)); m_cpu->port_out_cb<1>().set(FUNC(qs1000_device::p1_w)); m_cpu->port_in_cb<2>().set(FUNC(qs1000_device::p2_r)); diff --git a/src/devices/sound/qs1000.h b/src/devices/sound/qs1000.h index 6a45ce83f6b..a2838885529 100644 --- a/src/devices/sound/qs1000.h +++ b/src/devices/sound/qs1000.h @@ -59,7 +59,7 @@ public: uint8_t p3_r(); void p3_w(uint8_t data); - void qs1000_io_map(address_map &map) ATTR_COLD; + void qs1000_data_map(address_map &map) ATTR_COLD; void qs1000_prg_map(address_map &map) ATTR_COLD; protected: diff --git a/src/mame/access/acvirus.cpp b/src/mame/access/acvirus.cpp index cd14ae6690a..74214d98196 100644 --- a/src/mame/access/acvirus.cpp +++ b/src/mame/access/acvirus.cpp @@ -95,7 +95,7 @@ private: void acvirus_state::machine_start() { - m_rombank->configure_entries(0, 15, memregion("maincpu")->base(), 0x8000); + m_rombank->configure_entries(0, 16, memregion("maincpu")->base(), 0x8000); m_rombank->set_entry(3); } @@ -106,7 +106,7 @@ void acvirus_state::machine_reset() void acvirus_state::virus_map(address_map &map) { map(0x0000, 0x7fff).rom().region("maincpu", 0); // fixed 32K of flash image - map(0x8000, 0xffff).bankr("rombank"); + map(0x8000, 0xffff).bankr(m_rombank); } void acvirus_state::virus(machine_config &config) diff --git a/src/mame/adds/4000_260.cpp b/src/mame/adds/4000_260.cpp index 21175f7f289..33080372b16 100644 --- a/src/mame/adds/4000_260.cpp +++ b/src/mame/adds/4000_260.cpp @@ -277,7 +277,7 @@ void _4000_260_state::_4000_260(machine_config &config) { I80C32(config, m_maincpu, 16_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &_4000_260_state::mem_map); - m_maincpu->set_addrmap(AS_IO, &_4000_260_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, &_4000_260_state::ext_map); PALETTE(config, "palette", palette_device::MONOCHROME); diff --git a/src/mame/adds/adds2020.cpp b/src/mame/adds/adds2020.cpp index dbef542dd52..6a3d568157d 100644 --- a/src/mame/adds/adds2020.cpp +++ b/src/mame/adds/adds2020.cpp @@ -106,7 +106,7 @@ void adds2020_state::adds2020(machine_config &config) { I8031(config, m_maincpu, 10.92_MHz_XTAL); // P8031AH m_maincpu->set_addrmap(AS_PROGRAM, &adds2020_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &adds2020_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, &adds2020_state::ext_map); INPUT_MERGER_ANY_HIGH(config, "mainint").output_handler().set_inputline(m_maincpu, MCS51_INT1_LINE); diff --git a/src/mame/adds/vp60.cpp b/src/mame/adds/vp60.cpp index e61642705ed..5c7425353ea 100644 --- a/src/mame/adds/vp60.cpp +++ b/src/mame/adds/vp60.cpp @@ -34,7 +34,7 @@ private: u8 crtc_r(offs_t offset); void crtc_w(offs_t offset, u8 data); - void io_map(address_map &map) ATTR_COLD; + void data_map(address_map &map) ATTR_COLD; void kbd_map(address_map &map) ATTR_COLD; void mem_map(address_map &map) ATTR_COLD; @@ -62,7 +62,7 @@ void vp60_state::mem_map(address_map &map) map(0x0000, 0x2fff).rom().region("maincpu", 0); } -void vp60_state::io_map(address_map &map) +void vp60_state::data_map(address_map &map) { map(0x8000, 0x87ff).ram(); map(0xc000, 0xc000).select(0x100).mirror(0xff).rw(FUNC(vp60_state::crtc_r), FUNC(vp60_state::crtc_w)); @@ -80,7 +80,7 @@ void vp60_state::vp60(machine_config &config) { I8051(config, m_maincpu, 10.92_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &vp60_state::mem_map); - m_maincpu->set_addrmap(AS_IO, &vp60_state::io_map); + m_maincpu->set_addrmap(AS_DATA, &vp60_state::data_map); screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); screen.set_raw(25.92_MHz_XTAL, 1600, 0, 1280, 270, 0, 250); diff --git a/src/mame/adp/servicetastatur.cpp b/src/mame/adp/servicetastatur.cpp index 5d7d341e51b..19038c1d620 100644 --- a/src/mame/adp/servicetastatur.cpp +++ b/src/mame/adp/servicetastatur.cpp @@ -97,7 +97,7 @@ private: uint8_t bus_r(offs_t offset); void bus_w(offs_t offset, uint8_t data); - void servicet_io(address_map &map) ATTR_COLD; + void servicet_data(address_map &map) ATTR_COLD; void servicet_map(address_map &map) ATTR_COLD; HD44780_PIXEL_UPDATE(servicet_pixel_update); @@ -117,7 +117,7 @@ void servicet_state::servicet_map(address_map &map) map(0x0000, 0x7fff).rom(); } -void servicet_state::servicet_io(address_map &map) +void servicet_state::servicet_data(address_map &map) { map(0x0000, 0xffff).rw(FUNC(servicet_state::bus_r), FUNC(servicet_state::bus_w)); } @@ -283,7 +283,7 @@ void servicet_state::servicet(machine_config &config) { I80C31(config, m_maincpu, 11.0592_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &servicet_state::servicet_map); - m_maincpu->set_addrmap(AS_IO, &servicet_state::servicet_io); + m_maincpu->set_addrmap(AS_DATA, &servicet_state::servicet_data); m_maincpu->port_in_cb<1>().set(FUNC(servicet_state::port1_r)); m_maincpu->port_out_cb<1>().set(FUNC(servicet_state::port1_w)); diff --git a/src/mame/alesis/alesis.cpp b/src/mame/alesis/alesis.cpp index 7b94da94784..61d3b73d35d 100644 --- a/src/mame/alesis/alesis.cpp +++ b/src/mame/alesis/alesis.cpp @@ -115,7 +115,7 @@ void alesis_state::hr16_mem(address_map &map) map(0x0000, 0x7fff).mirror(0x8000).rom(); } -void alesis_state::hr16_io(address_map &map) +void alesis_state::hr16_data(address_map &map) { map.unmap_value_high(); map(0x0000, 0x0000).r(FUNC(alesis_state::kb_r)); @@ -132,7 +132,7 @@ void alesis_state::sr16_mem(address_map &map) map(0x0000, 0xffff).rom(); } -void alesis_state::sr16_io(address_map &map) +void alesis_state::sr16_data(address_map &map) { //map.unmap_value_high(); map(0x0000, 0x0000).mirror(0xff).w("dm3ag", FUNC(alesis_dm3ag_device::write)); @@ -142,7 +142,7 @@ void alesis_state::sr16_io(address_map &map) map(0x8000, 0xffff).ram().share("nvram"); // 32Kx8 SRAM, (battery-backed) } -void alesis_state::mmt8_io(address_map &map) +void alesis_state::mmt8_data(address_map &map) { map.unmap_value_high(); map(0x0000, 0xffff).ram().share("nvram"); // 2x32Kx8 SRAM, (battery-backed) @@ -411,7 +411,7 @@ void alesis_state::hr16(machine_config &config) /* basic machine hardware */ I80C31(config, m_maincpu, 12_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &alesis_state::hr16_mem); - m_maincpu->set_addrmap(AS_IO, &alesis_state::hr16_io); + m_maincpu->set_addrmap(AS_DATA, &alesis_state::hr16_data); m_maincpu->port_in_cb<1>().set_ioport("SELECT"); m_maincpu->port_in_cb<3>().set(FUNC(alesis_state::p3_r)); m_maincpu->port_out_cb<3>().set(FUNC(alesis_state::p3_w)); @@ -446,7 +446,7 @@ void alesis_state::sr16(machine_config &config) /* basic machine hardware */ m_maincpu->set_addrmap(AS_PROGRAM, &alesis_state::sr16_mem); - m_maincpu->set_addrmap(AS_IO, &alesis_state::sr16_io); + m_maincpu->set_addrmap(AS_DATA, &alesis_state::sr16_data); m_maincpu->port_in_cb<1>().set_constant(0); /* video hardware */ @@ -465,7 +465,7 @@ void alesis_state::mmt8(machine_config &config) hr16(config); /* basic machine hardware */ - m_maincpu->set_addrmap(AS_IO, &alesis_state::mmt8_io); + m_maincpu->set_addrmap(AS_DATA, &alesis_state::mmt8_data); m_maincpu->port_in_cb<1>().set(FUNC(alesis_state::kb_r)); m_maincpu->port_in_cb<3>().set(FUNC(alesis_state::mmt8_p3_r)); m_maincpu->port_out_cb<3>().set(FUNC(alesis_state::mmt8_p3_w)); diff --git a/src/mame/alesis/alesis.h b/src/mame/alesis/alesis.h index ae182f1f861..aa314d18bd7 100644 --- a/src/mame/alesis/alesis.h +++ b/src/mame/alesis/alesis.h @@ -149,10 +149,10 @@ protected: void sr16_lcd_w(uint8_t data); HD44780_PIXEL_UPDATE(sr16_pixel_update); - void hr16_io(address_map &map) ATTR_COLD; + void hr16_data(address_map &map) ATTR_COLD; void hr16_mem(address_map &map) ATTR_COLD; - void mmt8_io(address_map &map) ATTR_COLD; - void sr16_io(address_map &map) ATTR_COLD; + void mmt8_data(address_map &map) ATTR_COLD; + void sr16_data(address_map &map) ATTR_COLD; void sr16_mem(address_map &map) ATTR_COLD; private: diff --git a/src/mame/alesis/midiverb.cpp b/src/mame/alesis/midiverb.cpp index 163640de243..8ee74402316 100644 --- a/src/mame/alesis/midiverb.cpp +++ b/src/mame/alesis/midiverb.cpp @@ -541,7 +541,7 @@ void midiverb_state::midiverb(machine_config &config) { I80C31(config, m_maincpu, 6_MHz_XTAL); // U55. m_maincpu->set_addrmap(AS_PROGRAM, &midiverb_state::program_map); - m_maincpu->set_addrmap(AS_IO, &midiverb_state::external_memory_map); + m_maincpu->set_addrmap(AS_DATA, &midiverb_state::external_memory_map); m_maincpu->port_out_cb<1>().set(FUNC(midiverb_state::digit_select_w)).mask(0x03); // P1.0-P1.1 m_maincpu->port_out_cb<1>().append(m_dsp, FUNC(midiverb_dsp_device::program_select_w)).rshift(2); // P1.2-P1.7 diff --git a/src/mame/amirix/wxstar4000.cpp b/src/mame/amirix/wxstar4000.cpp index 43b18945510..86dd9ec0ea6 100644 --- a/src/mame/amirix/wxstar4000.cpp +++ b/src/mame/amirix/wxstar4000.cpp @@ -94,11 +94,11 @@ private: void cpubd_main(address_map &map) ATTR_COLD; void vidbd_main(address_map &map) ATTR_COLD; void vidbd_sub(address_map &map) ATTR_COLD; - void vidbd_sub_io(address_map &map) ATTR_COLD; + void vidbd_sub_data(address_map &map) ATTR_COLD; void databd_main(address_map &map) ATTR_COLD; - void databd_main_io(address_map &map) ATTR_COLD; + void databd_main_data(address_map &map) ATTR_COLD; void iobd_main(address_map &map) ATTR_COLD; - void iobd_main_io(address_map &map) ATTR_COLD; + void iobd_main_data(address_map &map) ATTR_COLD; virtual void machine_start() override ATTR_COLD; virtual void machine_reset() override ATTR_COLD; @@ -167,7 +167,7 @@ void wxstar4k_state::vidbd_sub(address_map &map) map(0x0000, 0x1fff).rom().region("gfxsubcpu", 0); } -void wxstar4k_state::vidbd_sub_io(address_map &map) +void wxstar4k_state::vidbd_sub_data(address_map &map) { map(0x0000, 0x07ff).ram(); // 1000-17FF - VRAM counter low byte @@ -188,7 +188,7 @@ void wxstar4k_state::databd_main(address_map &map) map(0x0000, 0x1fff).rom().region("datacpu", 0); } -void wxstar4k_state::databd_main_io(address_map &map) +void wxstar4k_state::databd_main_data(address_map &map) { map(0x0000, 0x01ff).ram(); // 0200 - UART data @@ -212,7 +212,7 @@ void wxstar4k_state::iobd_main(address_map &map) map(0x0000, 0x7fff).rom().region("iocpu", 0); } -void wxstar4k_state::iobd_main_io(address_map &map) +void wxstar4k_state::iobd_main_data(address_map &map) { } @@ -241,15 +241,15 @@ void wxstar4k_state::wxstar4k(machine_config &config) I8051(config, m_gfxsubcpu, XTAL(12'000'000)); // 12 MHz crystal connected directly to the CPU m_gfxsubcpu->set_addrmap(AS_PROGRAM, &wxstar4k_state::vidbd_sub); - m_gfxsubcpu->set_addrmap(AS_IO, &wxstar4k_state::vidbd_sub_io); + m_gfxsubcpu->set_addrmap(AS_DATA, &wxstar4k_state::vidbd_sub_data); I8344(config, m_datacpu, XTAL(7'372'800)); // 7.3728 MHz crystal connected directly to the CPU m_datacpu->set_addrmap(AS_PROGRAM, &wxstar4k_state::databd_main); - m_datacpu->set_addrmap(AS_IO, &wxstar4k_state::databd_main_io); + m_datacpu->set_addrmap(AS_DATA, &wxstar4k_state::databd_main_data); I8031(config, m_iocpu, XTAL(11'059'200)); // 11.0592 MHz crystal connected directly to the CPU m_iocpu->set_addrmap(AS_PROGRAM, &wxstar4k_state::iobd_main); - m_iocpu->set_addrmap(AS_IO, &wxstar4k_state::iobd_main_io); + m_iocpu->set_addrmap(AS_DATA, &wxstar4k_state::iobd_main_data); /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); diff --git a/src/mame/ausnz/applix.cpp b/src/mame/ausnz/applix.cpp index 2b47b7192aa..f1f8bf60746 100644 --- a/src/mame/ausnz/applix.cpp +++ b/src/mame/ausnz/applix.cpp @@ -136,7 +136,7 @@ private: required_shared_ptr<u16> m_base; void main_mem(address_map &map) ATTR_COLD; - void keytronic_pc3270_io(address_map &map) ATTR_COLD; + void keytronic_pc3270_data(address_map &map) ATTR_COLD; void keytronic_pc3270_program(address_map &map) ATTR_COLD; void sub_io(address_map &map) ATTR_COLD; void sub_mem(address_map &map) ATTR_COLD; @@ -466,7 +466,7 @@ void applix_state::keytronic_pc3270_program(address_map &map) map(0x0000, 0x0fff).rom().region("kbdcpu", 0); } -void applix_state::keytronic_pc3270_io(address_map &map) +void applix_state::keytronic_pc3270_data(address_map &map) { map(0x0000, 0xffff).rw(FUNC(applix_state::internal_data_read), FUNC(applix_state::internal_data_write)); } @@ -852,7 +852,7 @@ void applix_state::applix(machine_config &config) i8051_device &kbdcpu(I8051(config, "kbdcpu", 11060250)); kbdcpu.set_addrmap(AS_PROGRAM, &applix_state::keytronic_pc3270_program); - kbdcpu.set_addrmap(AS_IO, &applix_state::keytronic_pc3270_io); + kbdcpu.set_addrmap(AS_DATA, &applix_state::keytronic_pc3270_data); kbdcpu.port_in_cb<1>().set(FUNC(applix_state::p1_read)); kbdcpu.port_out_cb<1>().set(FUNC(applix_state::p1_write)); kbdcpu.port_in_cb<2>().set(FUNC(applix_state::p2_read)); diff --git a/src/mame/capcom/bionicc.cpp b/src/mame/capcom/bionicc.cpp index aeb4c313f6d..ee708058459 100644 --- a/src/mame/capcom/bionicc.cpp +++ b/src/mame/capcom/bionicc.cpp @@ -140,7 +140,7 @@ private: void main_map(address_map &map) ATTR_COLD; void sound_map(address_map &map) ATTR_COLD; - void mcu_io(address_map &map) ATTR_COLD; + void mcu_data(address_map &map) ATTR_COLD; void output_w(u8 data); @@ -211,7 +211,7 @@ void bionicc_state::sound_map(address_map &map) map(0xc000, 0xc7ff).ram(); } -void bionicc_state::mcu_io(address_map &map) +void bionicc_state::mcu_data(address_map &map) { map.global_mask(0x7ff); map(0x000, 0x7ff).rw(FUNC(bionicc_state::mcu_dma_r), FUNC(bionicc_state::mcu_dma_w)); @@ -644,7 +644,7 @@ void bionicc_state::bionicc(machine_config &config) // Protection MCU Intel C8751H-88 @ 6 MHz I8751(config, m_mcu, 24_MHz_XTAL / 4); - m_mcu->set_addrmap(AS_IO, &bionicc_state::mcu_io); + m_mcu->set_addrmap(AS_DATA, &bionicc_state::mcu_data); m_mcu->port_in_cb<1>().set([this](){ return m_audiocpu_to_mcu; }); m_mcu->port_out_cb<1>().set([this](u8 data){ m_mcu_p1 = data; }); m_mcu->port_out_cb<3>().set(FUNC(bionicc_state::mcu_p3_w)); diff --git a/src/mame/capcom/sf.cpp b/src/mame/capcom/sf.cpp index 880bb4a2816..d7767cc63ab 100644 --- a/src/mame/capcom/sf.cpp +++ b/src/mame/capcom/sf.cpp @@ -808,7 +808,7 @@ void sf_state::sfjp(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &sf_state::sfjp_map); I8751(config, m_protcpu, XTAL(8'000'000)); // Clock unknown, but shares the bus with the 68k, so could be similar - m_protcpu->set_addrmap(AS_IO, &sf_state::prot_map); + m_protcpu->set_addrmap(AS_DATA, &sf_state::prot_map); m_protcpu->port_out_cb<3>().set(FUNC(sf_state::prot_p3_w)); } diff --git a/src/mame/capcom/tigeroad.cpp b/src/mame/capcom/tigeroad.cpp index 0c705a55448..b11fa319716 100644 --- a/src/mame/capcom/tigeroad.cpp +++ b/src/mame/capcom/tigeroad.cpp @@ -138,7 +138,7 @@ void f1dream_state::f1dream_map(address_map &map) map(0xfe4002, 0xfe4003).portr("SYSTEM").w(FUNC(f1dream_state::to_mcu_w)); } -void f1dream_state::f1dream_mcu_io(address_map &map) +void f1dream_state::f1dream_mcu_data(address_map &map) { map(0x7f0, 0x7ff).rw(FUNC(f1dream_state::mcu_shared_r), FUNC(f1dream_state::mcu_shared_w)); } @@ -676,7 +676,7 @@ void f1dream_state::f1dream(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &f1dream_state::f1dream_map); I8751(config, m_mcu, XTAL(10'000'000)); // 8MHz rated chip, 24.0000MHz/3??? - m_mcu->set_addrmap(AS_IO, &f1dream_state::f1dream_mcu_io); + m_mcu->set_addrmap(AS_DATA, &f1dream_state::f1dream_mcu_data); m_mcu->port_out_cb<1>().set("soundlatch", FUNC(generic_latch_8_device::write)); m_mcu->port_out_cb<3>().set(FUNC(f1dream_state::out3_w)); } diff --git a/src/mame/capcom/tigeroad.h b/src/mame/capcom/tigeroad.h index af2c2e0fea0..b09bbbd312f 100644 --- a/src/mame/capcom/tigeroad.h +++ b/src/mame/capcom/tigeroad.h @@ -141,7 +141,7 @@ protected: private: void f1dream_map(address_map &map) ATTR_COLD; - void f1dream_mcu_io(address_map &map) ATTR_COLD; + void f1dream_mcu_data(address_map &map) ATTR_COLD; void out3_w(u8 data); diff --git a/src/mame/dataeast/karnov.cpp b/src/mame/dataeast/karnov.cpp index a28ebe84dc1..61b446e2c3d 100644 --- a/src/mame/dataeast/karnov.cpp +++ b/src/mame/dataeast/karnov.cpp @@ -162,7 +162,7 @@ private: void base_sound_map(address_map &map) ATTR_COLD; void chelnovjbl_mcu_map(address_map &map) ATTR_COLD; - void chelnovjbl_mcu_io_map(address_map &map) ATTR_COLD; + void chelnovjbl_mcu_data_map(address_map &map) ATTR_COLD; void karnov_map(address_map &map) ATTR_COLD; void karnovjbl_map(address_map &map) ATTR_COLD; void karnov_sound_map(address_map &map) ATTR_COLD; @@ -267,7 +267,7 @@ void karnov_state::chelnovjbl_mcu_map(address_map &map) map(0x0000, 0x1fff).rom(); } -void karnov_state::chelnovjbl_mcu_io_map(address_map &map) +void karnov_state::chelnovjbl_mcu_data_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).rw(FUNC(karnov_state::mcu_data_l_r), FUNC(karnov_state::mcu_data_l_w)); @@ -835,7 +835,7 @@ void karnov_state::chelnovjbl(machine_config &config) I8031(config, m_mcu, 8_MHz_XTAL); // info below states 8MHz for MCU m_mcu->set_addrmap(AS_PROGRAM, &karnov_state::chelnovjbl_mcu_map); - m_mcu->set_addrmap(AS_IO, &karnov_state::chelnovjbl_mcu_io_map); + m_mcu->set_addrmap(AS_DATA, &karnov_state::chelnovjbl_mcu_data_map); m_mcu->port_out_cb<1>().set(FUNC(karnov_state::mcubl_p1_w)); m_mcu->port_in_cb<3>().set_ioport("COIN"); } diff --git a/src/mame/dec/decmate2.cpp b/src/mame/dec/decmate2.cpp index cae9c442c31..b0aa2cd7aca 100644 --- a/src/mame/dec/decmate2.cpp +++ b/src/mame/dec/decmate2.cpp @@ -879,7 +879,7 @@ void decmate2_state::pc278(machine_config &config) m_maincpu->strtup_callback().set_constant(0); I8051(config, m_rxcpu, 16_MHz_XTAL / 2); - m_rxcpu->set_addrmap(AS_IO, &decmate2_state::rx_map); + m_rxcpu->set_addrmap(AS_DATA, &decmate2_state::rx_map); m_rxcpu->port_in_cb<1>().set(FUNC(decmate2_state::rx_intr_r)); m_rxcpu->port_out_cb<1>().set(FUNC(decmate2_state::rx_sel_w)); m_rxcpu->port_in_cb<2>().set(FUNC(decmate2_state::rx_rdy_r)); diff --git a/src/mame/dec/vt220.cpp b/src/mame/dec/vt220.cpp index 2ecba445a1b..03edeb2fc02 100644 --- a/src/mame/dec/vt220.cpp +++ b/src/mame/dec/vt220.cpp @@ -62,9 +62,9 @@ private: uint32_t screen_update_vt220(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<i8051_device> m_maincpu; required_device<ram_device> m_ram; - void vt220_io(address_map &map) ATTR_COLD; + void vt220_data(address_map &map) ATTR_COLD; void vt220_mem(address_map &map) ATTR_COLD; - void vt220a_io(address_map &map) ATTR_COLD; + void vt220a_data(address_map &map) ATTR_COLD; void vt220a_mem(address_map &map) ATTR_COLD; }; @@ -79,14 +79,14 @@ void vt220_state::vt220a_mem(address_map &map) map(0x0000, 0xffff).rom().region("maincpu", 0); } -void vt220_state::vt220_io(address_map &map) +void vt220_state::vt220_data(address_map &map) { map.unmap_value_high(); map(0x2000, 0x2fff).mirror(0xc000).ram(); map(0x3800, 0x380f).mirror(0xc7f0).rw("duart", FUNC(scn2681_device::read), FUNC(scn2681_device::write)); } -void vt220_state::vt220a_io(address_map &map) +void vt220_state::vt220a_data(address_map &map) { map.unmap_value_high(); } @@ -115,7 +115,7 @@ void vt220_state::vt220(machine_config &config) /* basic machine hardware */ I8051(config, m_maincpu, XTAL(11'059'200)); // from schematic for earlier version m_maincpu->set_addrmap(AS_PROGRAM, &vt220_state::vt220_mem); - m_maincpu->set_addrmap(AS_IO, &vt220_state::vt220_io); + m_maincpu->set_addrmap(AS_DATA, &vt220_state::vt220_data); m_maincpu->port_in_cb<1>().set_constant(0); // ??? scn2681_device &duart(SCN2681(config, "duart", XTAL(3'686'400))); @@ -140,7 +140,7 @@ void vt220_state::vt220a(machine_config &config) { vt220(config); m_maincpu->set_addrmap(AS_PROGRAM, &vt220_state::vt220a_mem); - m_maincpu->set_addrmap(AS_IO, &vt220_state::vt220a_io); + m_maincpu->set_addrmap(AS_DATA, &vt220_state::vt220a_data); } /* ROM definitions */ diff --git a/src/mame/dec/vt320.cpp b/src/mame/dec/vt320.cpp index c0dee4f9007..a6758cb962c 100644 --- a/src/mame/dec/vt320.cpp +++ b/src/mame/dec/vt320.cpp @@ -35,7 +35,7 @@ private: uint32_t screen_update_vt320(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<ram_device> m_ram; - void vt320_io(address_map &map) ATTR_COLD; + void vt320_data(address_map &map) ATTR_COLD; void vt320_mem(address_map &map) ATTR_COLD; }; @@ -71,7 +71,7 @@ void vt320_state::vt320_mem(address_map &map) map(0x0000, 0xffff).rom(); } -void vt320_state::vt320_io(address_map &map) +void vt320_state::vt320_data(address_map &map) { } @@ -99,7 +99,7 @@ void vt320_state::vt320(machine_config &config) /* basic machine hardware */ I8051(config, m_maincpu, XTAL(16'000'000)); m_maincpu->set_addrmap(AS_PROGRAM, &vt320_state::vt320_mem); - m_maincpu->set_addrmap(AS_IO, &vt320_state::vt320_io); + m_maincpu->set_addrmap(AS_DATA, &vt320_state::vt320_data); /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); diff --git a/src/mame/dec/vt520.cpp b/src/mame/dec/vt520.cpp index bc86d3bd1c9..cf5910a9056 100644 --- a/src/mame/dec/vt520.cpp +++ b/src/mame/dec/vt520.cpp @@ -37,7 +37,7 @@ private: uint32_t screen_update_vt520(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_region_ptr<uint8_t> m_rom; - void vt520_io(address_map &map) ATTR_COLD; + void vt520_data(address_map &map) ATTR_COLD; void vt520_mem(address_map &map) ATTR_COLD; }; @@ -60,7 +60,7 @@ uint8_t vt520_state::vt520_some_r() return 0x40; } -void vt520_state::vt520_io(address_map &map) +void vt520_state::vt520_data(address_map &map) { map.unmap_value_high(); map(0x7ffb, 0x7ffb).r(FUNC(vt520_state::vt520_some_r)); @@ -92,7 +92,7 @@ void vt520_state::vt420(machine_config &config) /* basic machine hardware */ I80C31(config, m_maincpu, XTAL(43'320'000) / 3); // SCN8031HCFN40 (divider not verified) m_maincpu->set_addrmap(AS_PROGRAM, &vt520_state::vt520_mem); - m_maincpu->set_addrmap(AS_IO, &vt520_state::vt520_io); + m_maincpu->set_addrmap(AS_DATA, &vt520_state::vt520_data); /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); @@ -111,7 +111,7 @@ void vt520_state::vt520(machine_config &config) /* basic machine hardware */ I80C32(config, m_maincpu, XTAL(20'000'000)); // Philips P80C32IBPN m_maincpu->set_addrmap(AS_PROGRAM, &vt520_state::vt520_mem); - m_maincpu->set_addrmap(AS_IO, &vt520_state::vt520_io); + m_maincpu->set_addrmap(AS_DATA, &vt520_state::vt520_data); /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); diff --git a/src/mame/eolith/eolith.cpp b/src/mame/eolith/eolith.cpp index e3ad5150b1e..984605e8f86 100644 --- a/src/mame/eolith/eolith.cpp +++ b/src/mame/eolith/eolith.cpp @@ -160,7 +160,7 @@ private: uint32_t screen_update_eolith(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void sound_io_map(address_map &map) ATTR_COLD; + void sound_data_map(address_map &map) ATTR_COLD; void sound_prg_map(address_map &map) ATTR_COLD; void patch_mcu_protection(uint32_t address) ATTR_COLD; @@ -407,7 +407,7 @@ void eolith_state::sound_prg_map(address_map &map) map(0x0000, 0x7fff).rom(); } -void eolith_state::sound_io_map(address_map &map) +void eolith_state::sound_data_map(address_map &map) { map(0x0000, 0x7fff).bankr("sound_bank"); map(0x8000, 0x8000).r("soundlatch", FUNC(generic_latch_8_device::read)); @@ -698,7 +698,7 @@ void eolith_state::eolith45(machine_config &config) /* Sound CPU */ I8032(config, m_soundcpu, XTAL(12'000'000)); m_soundcpu->set_addrmap(AS_PROGRAM, &eolith_state::sound_prg_map); - m_soundcpu->set_addrmap(AS_IO, &eolith_state::sound_io_map); + m_soundcpu->set_addrmap(AS_DATA, &eolith_state::sound_data_map); m_soundcpu->port_out_cb<1>().set(FUNC(eolith_state::sound_p1_w)); m_soundcpu->port_out_cb<3>().set(FUNC(eolith_state::sound_p3_w)); config.set_perfect_quantum(m_soundcpu); // HACK: ensure serial sync between Sound CPU and QS1000 diff --git a/src/mame/gaelco/gaelco_ds5002fp.cpp b/src/mame/gaelco/gaelco_ds5002fp.cpp index ca19f2ed2a2..231c72eb46c 100644 --- a/src/mame/gaelco/gaelco_ds5002fp.cpp +++ b/src/mame/gaelco/gaelco_ds5002fp.cpp @@ -42,7 +42,7 @@ void gaelco_ds5002fp_device::device_add_mconfig(machine_config &config) { ds5002fp_device &mcu(DS5002FP(config, "mcu", DERIVED_CLOCK(1, 1))); mcu.set_addrmap(AS_PROGRAM, &gaelco_ds5002fp_device::dallas_rom); - mcu.set_addrmap(AS_IO, &gaelco_ds5002fp_device::dallas_ram); + mcu.set_addrmap(AS_DATA, &gaelco_ds5002fp_device::dallas_ram); NVRAM(config, "sram", nvram_device::DEFAULT_ALL_0); } diff --git a/src/mame/gaelco/goldart.cpp b/src/mame/gaelco/goldart.cpp index e4d12e300a1..beb9809f742 100644 --- a/src/mame/gaelco/goldart.cpp +++ b/src/mame/gaelco/goldart.cpp @@ -331,7 +331,7 @@ void goldart_state::goldart(machine_config &config) // basic machine hardware ds5002fp_device &maincpu(DS5002FP(config, "maincpu", 32_MHz_XTAL / 2)); maincpu.set_addrmap(AS_PROGRAM, &goldart_state::main_prgmap); - maincpu.set_addrmap(AS_IO, &goldart_state::main_datamap); + maincpu.set_addrmap(AS_DATA, &goldart_state::main_datamap); maincpu.set_vblank_int("screen", FUNC(goldart_state::irq0_line_hold)); // only uses port 1? maincpu.port_out_cb<1>().set(FUNC(goldart_state::port1_w)); diff --git a/src/mame/handheld/talkingbb.cpp b/src/mame/handheld/talkingbb.cpp index 2813848b1b5..77c5e67bed1 100644 --- a/src/mame/handheld/talkingbb.cpp +++ b/src/mame/handheld/talkingbb.cpp @@ -141,7 +141,7 @@ private: u8 m_inp_mux = 0; void main_map(address_map &map) ATTR_COLD; - void main_io(address_map &map) ATTR_COLD; + void main_data(address_map &map) ATTR_COLD; // I/O handlers void bank_w(u8 data); @@ -228,7 +228,7 @@ void talkingbb_state::main_map(address_map &map) map(0x8000, 0xffff).r(FUNC(talkingbb_state::bank_r)); } -void talkingbb_state::main_io(address_map &map) +void talkingbb_state::main_data(address_map &map) { map(0x0000, 0x07ff).mirror(0x7800).ram(); map(0x8000, 0x8000).mirror(0x7fff).rw(FUNC(talkingbb_state::input_r), FUNC(talkingbb_state::input_w)); @@ -313,7 +313,7 @@ void talkingbb_state::talkingbb(machine_config &config) // basic machine hardware I80C31(config, m_maincpu, 12_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &talkingbb_state::main_map); - m_maincpu->set_addrmap(AS_IO, &talkingbb_state::main_io); + m_maincpu->set_addrmap(AS_DATA, &talkingbb_state::main_data); m_maincpu->port_out_cb<1>().set("dac", FUNC(dac_8bit_r2r_device::write)); m_maincpu->port_out_cb<3>().set(FUNC(talkingbb_state::bank_w)); m_maincpu->port_in_cb<3>().set(FUNC(talkingbb_state::switch_r)); diff --git a/src/mame/handheld/talkingfb.cpp b/src/mame/handheld/talkingfb.cpp index f2c7e751820..240839ad0b8 100644 --- a/src/mame/handheld/talkingfb.cpp +++ b/src/mame/handheld/talkingfb.cpp @@ -62,7 +62,7 @@ private: u8 m_inp_mux = 0; void main_map(address_map &map) ATTR_COLD; - void main_io(address_map &map) ATTR_COLD; + void main_data(address_map &map) ATTR_COLD; // I/O handlers void bank_w(u8 data); @@ -134,7 +134,7 @@ void talkingfb_state::main_map(address_map &map) map(0x8000, 0xffff).r(FUNC(talkingfb_state::bank_r<0>)); } -void talkingfb_state::main_io(address_map &map) +void talkingfb_state::main_data(address_map &map) { map(0x0000, 0x07ff).mirror(0x3800).ram(); map(0x4000, 0x4000).mirror(0x3fff).rw(FUNC(talkingfb_state::input_r), FUNC(talkingfb_state::input_w)); @@ -226,7 +226,7 @@ void talkingfb_state::talkingfb(machine_config &config) // basic machine hardware I80C31(config, m_maincpu, 12_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &talkingfb_state::main_map); - m_maincpu->set_addrmap(AS_IO, &talkingfb_state::main_io); + m_maincpu->set_addrmap(AS_DATA, &talkingfb_state::main_data); m_maincpu->port_out_cb<1>().set("dac", FUNC(dac_8bit_r2r_device::write)); m_maincpu->port_out_cb<3>().set(FUNC(talkingfb_state::bank_w)); diff --git a/src/mame/heathzenith/z29.cpp b/src/mame/heathzenith/z29.cpp index 301a311acf4..24355dddc07 100644 --- a/src/mame/heathzenith/z29.cpp +++ b/src/mame/heathzenith/z29.cpp @@ -161,7 +161,7 @@ void z29_state::z29(machine_config &config) { I8031(config, m_maincpu, 14.784_MHz_XTAL / 2); // Intel P8031AH m_maincpu->set_addrmap(AS_PROGRAM, &z29_state::prg_map); - m_maincpu->set_addrmap(AS_IO, &z29_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, &z29_state::ext_map); m_maincpu->port_in_cb<1>().set(FUNC(z29_state::p1_r)); m_maincpu->port_out_cb<1>().set(m_keyboard, FUNC(z29_keyboard_port_device::keyout_w)).bit(0).invert(); m_maincpu->port_out_cb<3>().set(FUNC(z29_state::p3_w)); diff --git a/src/mame/ibm/ibm3153.cpp b/src/mame/ibm/ibm3153.cpp index 66e7cd8d3a2..e54f2207d2f 100644 --- a/src/mame/ibm/ibm3153.cpp +++ b/src/mame/ibm/ibm3153.cpp @@ -61,7 +61,7 @@ private: void ibm3153_palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void io_map(address_map &map) ATTR_COLD; + void data_map(address_map &map) ATTR_COLD; void mem_map(address_map &map) ATTR_COLD; required_device<cpu_device> m_maincpu; @@ -75,7 +75,7 @@ void ibm3153_state::mem_map(address_map &map) map(0x00000, 0x0ffff).rom().region("user1", 0); } -void ibm3153_state::io_map(address_map &map) +void ibm3153_state::data_map(address_map &map) { map(0x0000, 0xffff).ram(); //map.unmap_value_high(); @@ -108,7 +108,7 @@ void ibm3153_state::ibm3153(machine_config &config) /* basic machine hardware */ I80C32(config, m_maincpu, XTAL(16'000'000)); // no idea of clock m_maincpu->set_addrmap(AS_PROGRAM, &ibm3153_state::mem_map); - m_maincpu->set_addrmap(AS_IO, &ibm3153_state::io_map); + m_maincpu->set_addrmap(AS_DATA, &ibm3153_state::data_map); /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); diff --git a/src/mame/igs/goldstar.cpp b/src/mame/igs/goldstar.cpp index d93aa1d3f85..da0e07df542 100644 --- a/src/mame/igs/goldstar.cpp +++ b/src/mame/igs/goldstar.cpp @@ -717,8 +717,8 @@ private: void z80_io_w(offs_t offset, uint8_t data); uint8_t z80_io_r(offs_t offset); - void tmcu_io_w(offs_t offset, uint8_t data); - uint8_t tmcu_io_r(offs_t offset); + void tmcu_data_w(offs_t offset, uint8_t data); + uint8_t tmcu_data_r(offs_t offset); void tmcu_p1_out(uint8_t data); uint8_t m_z80_io_c0; uint8_t tetin3_r(); @@ -757,7 +757,7 @@ private: void superdrg_opcodes_map(address_map &map) ATTR_COLD; void wcat3_map(address_map &map) ATTR_COLD; void tmcu_program_map(address_map &map) ATTR_COLD; - void tmcu_io_map(address_map &map) ATTR_COLD; + void tmcu_data_map(address_map &map) ATTR_COLD; }; @@ -2769,13 +2769,13 @@ void wingco_state::z80_io_w(offs_t offset, uint8_t data) logerror("Z80_io_w(): offset:%02x - data: %02x\n", offset, data); // investigate functionality port 0xc0 } -void wingco_state::tmcu_io_w(offs_t offset, uint8_t data) +void wingco_state::tmcu_data_w(offs_t offset, uint8_t data) { if ((offset != 0x122) & (offset != 0x123)) - logerror("tmcu_io Write: Offs:%04x - Data:%02x\n", offset, data); + logerror("tmcu_data Write: Offs:%04x - Data:%02x\n", offset, data); } -uint8_t wingco_state::tmcu_io_r(offs_t offset) +uint8_t wingco_state::tmcu_data_r(offs_t offset) { return 0x00; } @@ -4481,9 +4481,9 @@ void wingco_state::tmcu_program_map(address_map &map) map(0x0000, 0x1fff).rom().region("tmcu",0); } -void wingco_state::tmcu_io_map(address_map &map) +void wingco_state::tmcu_data_map(address_map &map) { - map(0x0000, 0x01ff).rw(FUNC(wingco_state::tmcu_io_r), FUNC(wingco_state::tmcu_io_w)); + map(0x0000, 0x01ff).rw(FUNC(wingco_state::tmcu_data_r), FUNC(wingco_state::tmcu_data_w)); } @@ -14759,7 +14759,7 @@ void wingco_state::lucky8tet(machine_config &config) I80C51(config, m_tmcu, 24'500'000); // Internal Clock m_tmcu->set_addrmap(AS_PROGRAM, &wingco_state::tmcu_program_map); - m_tmcu->set_addrmap(AS_IO, &wingco_state::tmcu_io_map); + m_tmcu->set_addrmap(AS_DATA, &wingco_state::tmcu_data_map); m_tmcu->port_out_cb<1>().set(FUNC(wingco_state::tmcu_p1_out)); diff --git a/src/mame/igt/fortune1.cpp b/src/mame/igt/fortune1.cpp index 1a8e9d67cdd..857e2f680b0 100644 --- a/src/mame/igt/fortune1.cpp +++ b/src/mame/igt/fortune1.cpp @@ -455,7 +455,7 @@ private: void babypkr_palette(palette_device &palette) const; void i8751_map(address_map &map) ATTR_COLD; - void i8751_io_port(address_map &map) ATTR_COLD; + void i8751_data_port(address_map &map) ATTR_COLD; void i8051_sound_mem(address_map &map) ATTR_COLD; void i8051_sound_port(address_map &map) ATTR_COLD; @@ -1102,7 +1102,7 @@ void babypkr_state::i8751_map(address_map &map) map(0x0000, 0x7fff).rom(); } -void babypkr_state::i8751_io_port(address_map &map) +void babypkr_state::i8751_data_port(address_map &map) { map(0x0000, 0x3fff).ram().share("nvram"); map(0x4900, 0x49ff).rw(FUNC(babypkr_state::bp_timekeep_r), FUNC(babypkr_state::bp_timekeep_w)); @@ -1493,7 +1493,7 @@ void babypkr_state::babypkr(machine_config &config) // most likely romless or eprom i8031_device &soundcpu(I8031(config.replace(), m_soundcpu, CPU_CLOCK)); soundcpu.set_addrmap(AS_PROGRAM, &babypkr_state::i8051_sound_mem); - soundcpu.set_addrmap(AS_IO, &babypkr_state::i8051_sound_port); + soundcpu.set_addrmap(AS_DATA, &babypkr_state::i8051_sound_port); soundcpu.port_in_cb<0>().set(FUNC(babypkr_state::baby_sound_p0_r)); soundcpu.port_out_cb<0>().set(FUNC(babypkr_state::baby_sound_p0_w)); soundcpu.port_in_cb<1>().set(FUNC(babypkr_state::baby_sound_p1_r)); @@ -1519,7 +1519,7 @@ void babypkr_state::bpoker(machine_config &config) i8751_device &maincpu(I8751(config.replace(), m_maincpu, XTAL(6'000'000))); maincpu.set_addrmap(AS_PROGRAM, &babypkr_state::i8751_map); - maincpu.set_addrmap(AS_IO, &babypkr_state::i8751_io_port); + maincpu.set_addrmap(AS_DATA, &babypkr_state::i8751_data_port); maincpu.set_vblank_int("screen", FUNC(babypkr_state::irq0_line_assert)); maincpu.port_in_cb<0>().set_constant(0); maincpu.port_out_cb<1>().set(FUNC(babypkr_state::bpoker_p1_data_w)); diff --git a/src/mame/igt/peplus.cpp b/src/mame/igt/peplus.cpp index b50076b4a1e..d9ac61574b4 100644 --- a/src/mame/igt/peplus.cpp +++ b/src/mame/igt/peplus.cpp @@ -357,7 +357,7 @@ private: void peplus_palette(palette_device &palette) const; void handle_lightpen(); - void main_iomap(address_map &map) ATTR_COLD; + void main_datamap(address_map &map) ATTR_COLD; void main_map(address_map &map) ATTR_COLD; }; @@ -1027,7 +1027,7 @@ void peplus_state::main_map(address_map &map) map(0x0000, 0xffff).rom(); } -void peplus_state::main_iomap(address_map &map) +void peplus_state::main_datamap(address_map &map) { // Battery-backed RAM (0x1000-0x01fff Extended RAM for Superboards Only) map(0x0000, 0x1fff).ram().w(FUNC(peplus_state::cmos_w)).share(m_cmos_ram); @@ -1415,7 +1415,7 @@ void peplus_state::peplus(machine_config &config) // basic machine hardware I80C32(config, m_maincpu, XTAL(20'000'000) / 2); // 10MHz m_maincpu->set_addrmap(AS_PROGRAM, &peplus_state::main_map); - m_maincpu->set_addrmap(AS_IO, &peplus_state::main_iomap); + m_maincpu->set_addrmap(AS_DATA, &peplus_state::main_datamap); m_maincpu->port_out_cb<1>().set(FUNC(peplus_state::paldata_w<0>)); m_maincpu->port_out_cb<3>().set(FUNC(peplus_state::paldata_w<1>)); diff --git a/src/mame/igt/splus.cpp b/src/mame/igt/splus.cpp index 48bc8959859..6c8e354741b 100644 --- a/src/mame/igt/splus.cpp +++ b/src/mame/igt/splus.cpp @@ -93,7 +93,7 @@ private: void i2c_nvram_w(uint8_t data); uint8_t splus_reel_optics_r(); - void splus_iomap(address_map &map) ATTR_COLD; + void splus_datamap(address_map &map) ATTR_COLD; void splus_map(address_map &map) ATTR_COLD; // EEPROM States @@ -593,7 +593,7 @@ void splus_state::splus_map(address_map &map) map(0x0000, 0xffff).rom(); } -void splus_state::splus_iomap(address_map &map) +void splus_state::splus_datamap(address_map &map) { // Serial I/O map(0x0000, 0x0000).r(FUNC(splus_state::splus_serial_r)).w(FUNC(splus_state::splus_serial_w)); @@ -683,7 +683,7 @@ void splus_state::splus(machine_config &config) // basic machine hardware { I80C32(config, m_maincpu, CPU_CLOCK); m_maincpu->set_addrmap(AS_PROGRAM, &splus_state::splus_map); - m_maincpu->set_addrmap(AS_IO, &splus_state::splus_iomap); + m_maincpu->set_addrmap(AS_DATA, &splus_state::splus_datamap); m_maincpu->port_out_cb<1>().set(FUNC(splus_state::splus_p1_w)); m_maincpu->port_in_cb<3>().set(FUNC(splus_state::splus_p3_r)); diff --git a/src/mame/intel/basic52.cpp b/src/mame/intel/basic52.cpp index c7b48c63dd5..f5d6a473365 100644 --- a/src/mame/intel/basic52.cpp +++ b/src/mame/intel/basic52.cpp @@ -121,7 +121,7 @@ void basic52_state::basic31(machine_config &config) /* basic machine hardware */ I8031(config, m_maincpu, XTAL(11'059'200)); m_maincpu->set_addrmap(AS_PROGRAM, &basic52_state::mem_map); - m_maincpu->set_addrmap(AS_IO, &basic52_state::io_map); + m_maincpu->set_addrmap(AS_DATA, &basic52_state::io_map); m_maincpu->port_out_cb<1>().set(FUNC(basic52_state::port1_w)); m_maincpu->port_out_cb<3>().set(FUNC(basic52_state::port3_w)); m_maincpu->port_in_cb<3>().set(FUNC(basic52_state::port3_r)); @@ -142,7 +142,7 @@ void basic52_state::basic52(machine_config &config) /* basic machine hardware */ I8052(config.replace(), m_maincpu, XTAL(11'059'200)); m_maincpu->set_addrmap(AS_PROGRAM, &basic52_state::mem_map); - m_maincpu->set_addrmap(AS_IO, &basic52_state::io_map); + m_maincpu->set_addrmap(AS_DATA, &basic52_state::io_map); m_maincpu->port_out_cb<3>().set(FUNC(basic52_state::port3_w)); m_maincpu->port_in_cb<3>().set(FUNC(basic52_state::port3_r)); } diff --git a/src/mame/intel/sdk51.cpp b/src/mame/intel/sdk51.cpp index 211d69b7652..dde691f0f3b 100644 --- a/src/mame/intel/sdk51.cpp +++ b/src/mame/intel/sdk51.cpp @@ -265,7 +265,7 @@ void sdk51_state::sdk51(machine_config &config) { I8031(config, m_maincpu, 12_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &sdk51_state::psen_map); - m_maincpu->set_addrmap(AS_IO, &sdk51_state::movx_map); + m_maincpu->set_addrmap(AS_DATA, &sdk51_state::movx_map); ADDRESS_MAP_BANK(config, m_progmem); m_progmem->set_addrmap(0, &sdk51_state::progmem_map); diff --git a/src/mame/irem/m72.cpp b/src/mame/irem/m72.cpp index ff5ab24933e..f0fbc1e5a34 100644 --- a/src/mame/irem/m72.cpp +++ b/src/mame/irem/m72.cpp @@ -924,7 +924,7 @@ void m72_mcu_state::i80c31_mem_map(address_map &map) map(0x0000, 0x1fff).rom().region("mcu", 0); } -void m72_mcu_state::mcu_io_map(address_map &map) +void m72_mcu_state::mcu_data_map(address_map &map) { /* External access */ map(0x0000, 0x0000).rw(FUNC(m72_mcu_state::mcu_sample_r), FUNC(m72_mcu_state::mcu_low_w)); @@ -1738,7 +1738,7 @@ void m72_mcu_state::m72_8751(machine_config &config) GENERIC_LATCH_8(config, "soundlatch2").data_pending_callback().set_inputline(m_soundcpu, INPUT_LINE_NMI); i8751_device &mcu(I8751(config, m_mcu, XTAL(8'000'000))); // Uses its own XTAL - mcu.set_addrmap(AS_IO, &m72_mcu_state::mcu_io_map); + mcu.set_addrmap(AS_DATA, &m72_mcu_state::mcu_data_map); mcu.port_out_cb<1>().set(m_dac, FUNC(dac_byte_interface::write)); } @@ -1756,7 +1756,7 @@ void m72_mcu_state::imgfightjb(machine_config &config) m72_8751(config); i80c31_device &mcu(I80C31(config.replace(), m_mcu, XTAL(32'000'000) / 4)); mcu.set_addrmap(AS_PROGRAM, &m72_mcu_state::i80c31_mem_map); - mcu.set_addrmap(AS_IO, &m72_mcu_state::mcu_io_map); + mcu.set_addrmap(AS_DATA, &m72_mcu_state::mcu_data_map); mcu.port_out_cb<1>().set(m_dac, FUNC(dac_byte_interface::write)); // TODO: uses 6116 type RAM instead of MB8421 and MB8431 diff --git a/src/mame/irem/m72.h b/src/mame/irem/m72.h index 2a34e1e1669..0be19e22510 100644 --- a/src/mame/irem/m72.h +++ b/src/mame/irem/m72.h @@ -227,7 +227,7 @@ private: void m72_protected_portmap(address_map &map) ATTR_COLD; void m72_airduel_portmap(address_map &map) ATTR_COLD; void i80c31_mem_map(address_map &map) ATTR_COLD; - void mcu_io_map(address_map &map) ATTR_COLD; + void mcu_data_map(address_map &map) ATTR_COLD; void sound_protected_portmap(address_map &map) ATTR_COLD; void xmultiplm72_map(address_map &map) ATTR_COLD; }; diff --git a/src/mame/kawai/sx240.cpp b/src/mame/kawai/sx240.cpp index 2e2e8ccd6e9..f820f450de2 100644 --- a/src/mame/kawai/sx240.cpp +++ b/src/mame/kawai/sx240.cpp @@ -103,7 +103,7 @@ void kawai_sx240_state::sx240(machine_config &config) { I8031(config, m_master, 12_MHz_XTAL); m_master->set_addrmap(AS_PROGRAM, &kawai_sx240_state::master_prog); - m_master->set_addrmap(AS_IO, &kawai_sx240_state::master_ext); + m_master->set_addrmap(AS_DATA, &kawai_sx240_state::master_ext); NVRAM(config, "ram0", nvram_device::DEFAULT_ALL_0); // HM6116ALSP-20 (I9) + battery NVRAM(config, "ram1", nvram_device::DEFAULT_ALL_0); // HM6116ALSP-20 (I10) + battery @@ -112,7 +112,7 @@ void kawai_sx240_state::sx240(machine_config &config) I8031(config, m_slave, 12_MHz_XTAL); m_slave->set_addrmap(AS_PROGRAM, &kawai_sx240_state::slave_prog); - m_slave->set_addrmap(AS_IO, &kawai_sx240_state::slave_ext); + m_slave->set_addrmap(AS_DATA, &kawai_sx240_state::slave_ext); PIT8253(config, "pit0"); // MSM82C53-5 (I25) PIT8253(config, "pit1"); // MSM82C53-5 (I26) diff --git a/src/mame/leapfrog/iquest.cpp b/src/mame/leapfrog/iquest.cpp index 9a999a74ab4..d0d0960d78e 100644 --- a/src/mame/leapfrog/iquest.cpp +++ b/src/mame/leapfrog/iquest.cpp @@ -581,7 +581,7 @@ void leapfrog_iquest_state::leapfrog_base(machine_config &config) //I8052(config, m_maincpu, 96000000/10); // unknown clock I8032(config, m_maincpu, 96000000/10); // unknown clock m_maincpu->set_addrmap(AS_PROGRAM, &leapfrog_iquest_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &leapfrog_iquest_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, &leapfrog_iquest_state::ext_map); m_maincpu->port_in_cb<0>().set(FUNC(leapfrog_iquest_state::port0_r)); m_maincpu->port_out_cb<0>().set(FUNC(leapfrog_iquest_state::port0_w)); m_maincpu->port_in_cb<1>().set(FUNC(leapfrog_iquest_state::port1_r)); diff --git a/src/mame/leapfrog/leappad.cpp b/src/mame/leapfrog/leappad.cpp index b390b3dd320..f4d17bea6b1 100644 --- a/src/mame/leapfrog/leappad.cpp +++ b/src/mame/leapfrog/leappad.cpp @@ -176,7 +176,7 @@ void leapfrog_leappad_state::leapfrog_leappad(machine_config &config) { I8032(config, m_maincpu, 96000000/10); // LeapPad Leapfrog 05-9-01 FS80A363 (which exact type is it?) m_maincpu->set_addrmap(AS_PROGRAM, &leapfrog_leappad_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &leapfrog_leappad_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, &leapfrog_leappad_state::ext_map); // screenless @@ -191,7 +191,7 @@ void leapfrog_leappad_state::leapfrog_mfleappad(machine_config &config) { I8032(config, m_maincpu, 96000000/10); // LeapPad Leapfrog 05-9-01 FS80A363 (which exact type is it?) m_maincpu->set_addrmap(AS_PROGRAM, &leapfrog_leappad_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &leapfrog_leappad_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, &leapfrog_leappad_state::ext_map); // screenless @@ -206,7 +206,7 @@ void leapfrog_leappad_state::leapfrog_ltleappad(machine_config &config) { I8032(config, m_maincpu, 96000000/10); // (which exact type is it?) m_maincpu->set_addrmap(AS_PROGRAM, &leapfrog_leappad_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &leapfrog_leappad_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, &leapfrog_leappad_state::ext_map); // screenless diff --git a/src/mame/learsiegler/adm11.cpp b/src/mame/learsiegler/adm11.cpp index 21ed319b1cc..e7609155617 100644 --- a/src/mame/learsiegler/adm11.cpp +++ b/src/mame/learsiegler/adm11.cpp @@ -163,7 +163,7 @@ void adm11_state::adm12(machine_config &config) { I8031(config, m_maincpu, 11.0592_MHz_XTAL); // P8031AH m_maincpu->set_addrmap(AS_PROGRAM, &adm11_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &adm11_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, &adm11_state::ext_map); m_maincpu->port_in_cb<1>().set(FUNC(adm11_state::p1_r)); m_maincpu->port_out_cb<1>().set(FUNC(adm11_state::p1_w)); // TODO: RXD/TXD are serial communications; INT0 is serial keyboard data diff --git a/src/mame/mera/vdm7932x.cpp b/src/mame/mera/vdm7932x.cpp index ae39b682201..240059aeeed 100644 --- a/src/mame/mera/vdm7932x.cpp +++ b/src/mame/mera/vdm7932x.cpp @@ -117,7 +117,7 @@ void vdm7932x_state::vdm7932x(machine_config &config) // all clocks unverified I8031(config, m_subcpu, 24.0734_MHz_XTAL / 4); // Intel P8031AH (for keyboard?) m_subcpu->port_in_cb<3>().set(FUNC(vdm7932x_state::i8031_p3_r)); m_subcpu->set_addrmap(AS_PROGRAM, &vdm7932x_state::sub_map); - m_subcpu->set_addrmap(AS_IO, &vdm7932x_state::subx_map); + m_subcpu->set_addrmap(AS_DATA, &vdm7932x_state::subx_map); PIT8253(config, "pit", 0); // UM8253-5 diff --git a/src/mame/merit/merits.cpp b/src/mame/merit/merits.cpp index ba29e7ac553..d99f032a509 100644 --- a/src/mame/merit/merits.cpp +++ b/src/mame/merit/merits.cpp @@ -39,7 +39,7 @@ public: private: void mem_map(address_map &map) ATTR_COLD; - void io_map(address_map &map) ATTR_COLD; + void data_map(address_map &map) ATTR_COLD; required_device<cpu_device> m_maincpu; }; @@ -49,7 +49,7 @@ void merits_state::mem_map(address_map &map) map(0x0000, 0xffff).rom().region("maincpu", 0); } -void merits_state::io_map(address_map &map) +void merits_state::data_map(address_map &map) { map(0x8000, 0x87ff).ram().share("nvram"); //map(0x9000, 0x9000).r(); @@ -87,7 +87,7 @@ void merits_state::scrpiond(machine_config &config) { DS80C320(config, m_maincpu, 12_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &merits_state::mem_map); - m_maincpu->set_addrmap(AS_IO, &merits_state::io_map); + m_maincpu->set_addrmap(AS_DATA, &merits_state::data_map); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // DS1220Y } @@ -96,7 +96,7 @@ void merits_state::scrpiondold(machine_config &config) { I80C31(config, m_maincpu, 12_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &merits_state::mem_map); - m_maincpu->set_addrmap(AS_IO, &merits_state::io_map); + m_maincpu->set_addrmap(AS_DATA, &merits_state::data_map); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // DS1220Y } diff --git a/src/mame/misc/artmagic.cpp b/src/mame/misc/artmagic.cpp index ad61c578016..4cd7186d410 100644 --- a/src/mame/misc/artmagic.cpp +++ b/src/mame/misc/artmagic.cpp @@ -508,7 +508,7 @@ void artmagic_state::shtstar_guncpu_map(address_map &map) map(0x0000, 0x7fff).rom(); } -void artmagic_state::shtstar_guncpu_io_map(address_map &map) +void artmagic_state::shtstar_guncpu_data_map(address_map &map) { map(0xc000, 0xcfff).ram(); } @@ -884,7 +884,7 @@ void artmagic_state::shtstar(machine_config &config) /*gun board cpu*/ i80c31_device &guncpu(I80C31(config, "guncpu", 6000000)); guncpu.set_addrmap(AS_PROGRAM, &artmagic_state::shtstar_guncpu_map); - guncpu.set_addrmap(AS_IO, &artmagic_state::shtstar_guncpu_io_map); + guncpu.set_addrmap(AS_DATA, &artmagic_state::shtstar_guncpu_data_map); guncpu.port_in_cb<1>().set_constant(0); // ? } diff --git a/src/mame/misc/artmagic.h b/src/mame/misc/artmagic.h index 57418e3c034..e12ddc302e0 100644 --- a/src/mame/misc/artmagic.h +++ b/src/mame/misc/artmagic.h @@ -83,7 +83,7 @@ private: inline uint16_t *address_to_vram(offs_t *address); void main_map(address_map &map) ATTR_COLD; - void shtstar_guncpu_io_map(address_map &map) ATTR_COLD; + void shtstar_guncpu_data_map(address_map &map) ATTR_COLD; void shtstar_guncpu_map(address_map &map) ATTR_COLD; void shtstar_map(address_map &map) ATTR_COLD; void shtstar_subcpu_map(address_map &map) ATTR_COLD; diff --git a/src/mame/misc/bingor.cpp b/src/mame/misc/bingor.cpp index b6e0f74e92c..74f84e76c8c 100644 --- a/src/mame/misc/bingor.cpp +++ b/src/mame/misc/bingor.cpp @@ -554,7 +554,7 @@ private: void bingor2_map(address_map &map) ATTR_COLD; void bingor_io(address_map &map) ATTR_COLD; void bingor_map(address_map &map) ATTR_COLD; - void slave_io(address_map &map) ATTR_COLD; + void slave_data(address_map &map) ATTR_COLD; void slave_map(address_map &map) ATTR_COLD; void vip2000_io(address_map &map) ATTR_COLD; void vip2000_map(address_map &map) ATTR_COLD; @@ -655,7 +655,7 @@ void bingor_state::slave_map(address_map &map) map(0x0000, 0x7fff).rom(); } -void bingor_state::slave_io(address_map &map) +void bingor_state::slave_data(address_map &map) { map(0x0000, 0x0000).r("toslave", FUNC(generic_latch_8_device::read)).w("fromslave", FUNC(generic_latch_8_device::write)); map(0xc000, 0xcfff).ram(); @@ -799,7 +799,7 @@ void bingor_state::vip2000(machine_config &config) I80C31(config, m_slavecpu, XTAL(11'059'200)); m_slavecpu->set_addrmap(AS_PROGRAM, &bingor_state::slave_map); - m_slavecpu->set_addrmap(AS_IO, &bingor_state::slave_io); + m_slavecpu->set_addrmap(AS_DATA, &bingor_state::slave_data); MSM6242(config, "rtc", XTAL(32'768)); diff --git a/src/mame/misc/cardline.cpp b/src/mame/misc/cardline.cpp index 5dbeb8abc0a..3de11bac29d 100644 --- a/src/mame/misc/cardline.cpp +++ b/src/mame/misc/cardline.cpp @@ -73,7 +73,7 @@ private: MC6845_BEGIN_UPDATE(crtc_begin_update); MC6845_UPDATE_ROW(crtc_update_row); - void mem_io(address_map &map) ATTR_COLD; + void mem_data(address_map &map) ATTR_COLD; void mem_prg(address_map &map) ATTR_COLD; required_shared_ptr<uint8_t> m_videoram; @@ -97,7 +97,7 @@ void cardline_state::machine_start() m_hsync_q = 1; for (int i = 0; i < 0x2000; i++) - m_maincpu.target()->space(AS_IO).write_byte(i, 0x73); + m_maincpu.target()->space(AS_DATA).write_byte(i, 0x73); save_item(NAME(m_video)); save_item(NAME(m_hsync_q)); @@ -220,7 +220,7 @@ void cardline_state::mem_prg(address_map &map) map(0x0000, 0xffff).rom(); } -void cardline_state::mem_io(address_map &map) +void cardline_state::mem_data(address_map &map) { map(0x0000, 0x1fff).ram(); map(0x2003, 0x2003).portr("IN0"); @@ -320,7 +320,7 @@ void cardline_state::cardline(machine_config &config) I80C32(config, m_maincpu, MASTER_CLOCK); m_maincpu->set_port_forced_input(1, 0x10); m_maincpu->set_addrmap(AS_PROGRAM, &cardline_state::mem_prg); - m_maincpu->set_addrmap(AS_IO, &cardline_state::mem_io); + m_maincpu->set_addrmap(AS_DATA, &cardline_state::mem_data); m_maincpu->port_in_cb<1>().set(FUNC(cardline_state::hsync_r)); m_maincpu->port_out_cb<1>().set(FUNC(cardline_state::video_w)); //m_maincpu->set_vblank_int("screen", FUNC(cardline_state::irq1_line_hold)); diff --git a/src/mame/misc/changyu.cpp b/src/mame/misc/changyu.cpp index 56882f64524..cb8217a622e 100644 --- a/src/mame/misc/changyu.cpp +++ b/src/mame/misc/changyu.cpp @@ -483,7 +483,7 @@ void changyu2_state::changyu2(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &changyu2_state::main2_map); auto &mcu(I87C51(config.replace(), m_mcu, XTAL(8'000'000))); - mcu.set_addrmap(AS_IO, &changyu2_state::ext2_map); + mcu.set_addrmap(AS_DATA, &changyu2_state::ext2_map); mcu.port_in_cb<0>().set(FUNC(changyu2_state::mcu_p1_r)); mcu.port_out_cb<0>().set([] (u8 data) { osd_printf_error("MCU P1 %02x\n", data); }); diff --git a/src/mame/misc/cromptons.cpp b/src/mame/misc/cromptons.cpp index c988fee3edc..b72cc0a9826 100644 --- a/src/mame/misc/cromptons.cpp +++ b/src/mame/misc/cromptons.cpp @@ -58,7 +58,7 @@ private: required_ioport_array<4> m_inputs; void prg_map(address_map &map) ATTR_COLD; - void io_map(address_map &map) ATTR_COLD; + void data_map(address_map &map) ATTR_COLD; u8 m_port_select = 0; }; @@ -86,7 +86,7 @@ void cromptons_state::prg_map(address_map &map) map(0x0000, 0xffff).rom().region("maincpu", 0); } -void cromptons_state::io_map(address_map &map) +void cromptons_state::data_map(address_map &map) { map(0xe000, 0xffff).rw("timekpr", FUNC(timekeeper_device::read), FUNC(timekeeper_device::write)); } @@ -136,7 +136,7 @@ void cromptons_state::cromptons(machine_config &config) /* basic machine hardware */ I80C32(config, m_maincpu, 11.0592_MHz_XTAL); // TS80C32X2-MCA m_maincpu->set_addrmap(AS_PROGRAM, &cromptons_state::prg_map); - m_maincpu->set_addrmap(AS_IO, &cromptons_state::io_map); + m_maincpu->set_addrmap(AS_DATA, &cromptons_state::data_map); m_maincpu->port_in_cb<1>().set(FUNC(cromptons_state::port_r)); m_maincpu->port_out_cb<1>().set(FUNC(cromptons_state::port_w)); diff --git a/src/mame/misc/dynamoah.cpp b/src/mame/misc/dynamoah.cpp index 55b9f2e8ece..dc0872b97ba 100644 --- a/src/mame/misc/dynamoah.cpp +++ b/src/mame/misc/dynamoah.cpp @@ -81,7 +81,7 @@ void dynamoah_state::dynamoah(machine_config &config) i80c31_device &maincpu(I80C31(config, "maincpu", 6'144'000)); // SC80C31BCCN40 // clock needs verification, being the XTAL value from a different board maincpu.set_addrmap(AS_PROGRAM, &dynamoah_state::i8031_mem); - maincpu.set_addrmap(AS_IO, &dynamoah_state::i8031_ext_mem); + maincpu.set_addrmap(AS_DATA, &dynamoah_state::i8031_ext_mem); maincpu.port_in_cb<1>().set("eeprom", FUNC(eeprom_serial_93cxx_device::do_read)).lshift(7); maincpu.port_in_cb<1>().append_constant(0x7f).mask(0x7f); maincpu.port_out_cb<1>().set("eeprom", FUNC(eeprom_serial_93cxx_device::di_write)).bit(7); diff --git a/src/mame/misc/fireball.cpp b/src/mame/misc/fireball.cpp index 31c6a963965..d253c8aa7c9 100644 --- a/src/mame/misc/fireball.cpp +++ b/src/mame/misc/fireball.cpp @@ -70,7 +70,7 @@ protected: private: void fireball_map(address_map &map) ATTR_COLD; - void fireball_io_map(address_map &map) ATTR_COLD; + void fireball_data_map(address_map &map) ATTR_COLD; void io_00_w(uint8_t data); uint8_t io_00_r(); @@ -296,7 +296,7 @@ void fireball_state::fireball_map(address_map &map) map(0x0000, 0x1fff).rom(); } -void fireball_state::fireball_io_map(address_map &map) +void fireball_state::fireball_data_map(address_map &map) { map(0x00, 0x01).rw(FUNC(fireball_state::io_00_r), FUNC(fireball_state::io_00_w)); map(0x02, 0x03).rw(FUNC(fireball_state::io_02_r), FUNC(fireball_state::io_02_w)); @@ -510,7 +510,7 @@ void fireball_state::fireball(machine_config &config) // basic machine hardware I8031(config, m_maincpu, CPU_CLK); m_maincpu->set_addrmap(AS_PROGRAM, &fireball_state::fireball_map); - m_maincpu->set_addrmap(AS_IO, &fireball_state::fireball_io_map); + m_maincpu->set_addrmap(AS_DATA, &fireball_state::fireball_data_map); m_maincpu->port_in_cb<1>().set(FUNC(fireball_state::p1_r)); m_maincpu->port_out_cb<1>().set(FUNC(fireball_state::p1_w)); m_maincpu->port_in_cb<3>().set(FUNC(fireball_state::p3_r)); diff --git a/src/mame/misc/gms.cpp b/src/mame/misc/gms.cpp index 29b2a81ecff..4f7007ec3e0 100644 --- a/src/mame/misc/gms.cpp +++ b/src/mame/misc/gms.cpp @@ -228,7 +228,7 @@ private: uint16_t m_input_matrix = 0; //uint16_t m_prot_data = 0; - void mcu_io(address_map &map) ATTR_COLD; + void mcu_data(address_map &map) ATTR_COLD; void rbmk_mem(address_map &map) ATTR_COLD; void rbspm_mem(address_map &map) ATTR_COLD; void ssanguoj_mem(address_map &map) ATTR_COLD; @@ -240,9 +240,9 @@ private: void input_matrix_w(uint16_t data); void tilebank_w(uint16_t data); void reels_toggle_w(uint16_t data); - uint8_t mcu_io_r(offs_t offset); - void mcu_io_w(offs_t offset, uint8_t data); - void mcu_io_mux_w(uint8_t data); + uint8_t mcu_data_r(offs_t offset); + void mcu_data_w(offs_t offset, uint8_t data); + void mcu_data_mux_w(uint8_t data); uint16_t eeprom_r(); void eeprom_w(uint16_t data); void hgly_eeprom_w(uint16_t data); @@ -638,7 +638,7 @@ void gms_2layers_state::smatch03_mem(address_map &map) } -uint8_t gms_2layers_state::mcu_io_r(offs_t offset) +uint8_t gms_2layers_state::mcu_data_r(offs_t offset) { if (m_mux_data & 8) { @@ -656,7 +656,7 @@ uint8_t gms_2layers_state::mcu_io_r(offs_t offset) return 0xff; } -void gms_2layers_state::mcu_io_w(offs_t offset, uint8_t data) +void gms_2layers_state::mcu_data_w(offs_t offset, uint8_t data) { if (m_mux_data & 8) { m_ymsnd->write(offset & 1, data); } else if (m_mux_data & 4) @@ -668,14 +668,14 @@ void gms_2layers_state::mcu_io_w(offs_t offset, uint8_t data) printf("Warning: mux data W = %02x", m_mux_data); } -void gms_2layers_state::mcu_io_mux_w(uint8_t data) +void gms_2layers_state::mcu_data_mux_w(uint8_t data) { m_mux_data = ~data; } -void gms_2layers_state::mcu_io(address_map &map) +void gms_2layers_state::mcu_data(address_map &map) { - map(0x0ff00, 0x0ffff).rw(FUNC(gms_2layers_state::mcu_io_r), FUNC(gms_2layers_state::mcu_io_w)); + map(0x0ff00, 0x0ffff).rw(FUNC(gms_2layers_state::mcu_data_r), FUNC(gms_2layers_state::mcu_data_w)); } @@ -2735,8 +2735,8 @@ void gms_2layers_state::rbmk(machine_config &config) m_maincpu->set_vblank_int("screen", FUNC(gms_2layers_state::irq1_line_hold)); AT89C4051(config, m_mcu, 22_MHz_XTAL / 4); // frequency isn't right - m_mcu->set_addrmap(AS_IO, &gms_2layers_state::mcu_io); - m_mcu->port_out_cb<3>().set(FUNC(gms_2layers_state::mcu_io_mux_w)); + m_mcu->set_addrmap(AS_DATA, &gms_2layers_state::mcu_data); + m_mcu->port_out_cb<3>().set(FUNC(gms_2layers_state::mcu_data_mux_w)); GFXDECODE(config, m_gfxdecode, m_palette, gfx_rbmk); diff --git a/src/mame/misc/gsspade.cpp b/src/mame/misc/gsspade.cpp index dad06e9a227..70a251f4fbe 100644 --- a/src/mame/misc/gsspade.cpp +++ b/src/mame/misc/gsspade.cpp @@ -70,7 +70,7 @@ void gsspade_state::gsspade(machine_config &config) { I8051(config, m_soundcpu, 10.738635_MHz_XTAL); // Intel/Fujitsu P8051AH m_soundcpu->set_addrmap(AS_PROGRAM, &gsspade_state::prog_map); - m_soundcpu->set_addrmap(AS_IO, &gsspade_state::ext_map); + m_soundcpu->set_addrmap(AS_DATA, &gsspade_state::ext_map); m_soundcpu->port_in_cb<1>().set_ioport("P1"); I8279(config, "kdc", 1'789'772); // ? diff --git a/src/mame/misc/island.cpp b/src/mame/misc/island.cpp index d4dcbf9eca1..e72d3efb19e 100644 --- a/src/mame/misc/island.cpp +++ b/src/mame/misc/island.cpp @@ -58,7 +58,7 @@ void island_state::vortex(machine_config &config) { DS80C320(config, m_maincpu, 20_MHz_XTAL); // FIXME: has more registers, faster machine cycles m_maincpu->set_addrmap(AS_PROGRAM, &island_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &island_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, &island_state::ext_map); SPEAKER(config, "mono").front_center(); diff --git a/src/mame/misc/laz_aftrshok.cpp b/src/mame/misc/laz_aftrshok.cpp index 88fba4829fb..4ef7d2e6183 100644 --- a/src/mame/misc/laz_aftrshok.cpp +++ b/src/mame/misc/laz_aftrshok.cpp @@ -220,7 +220,7 @@ void aftrshok_state::aftrshok(machine_config &config) /* basic machine hardware */ I8031(config, m_maincpu, 12_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &aftrshok_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &aftrshok_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, &aftrshok_state::ext_map); m_maincpu->port_out_cb<3>().set(FUNC(aftrshok_state::mcu_p3_w)); /* sound hardware */ diff --git a/src/mame/misc/laz_ribrac.cpp b/src/mame/misc/laz_ribrac.cpp index 0e78e8b37bc..962e92c7fdf 100644 --- a/src/mame/misc/laz_ribrac.cpp +++ b/src/mame/misc/laz_ribrac.cpp @@ -301,7 +301,7 @@ void ribrac_state::ribrac(machine_config &config) { I80C31(config, m_maincpu, 12_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &ribrac_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &ribrac_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, &ribrac_state::ext_map); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // 6264 + MAX694 + battery diff --git a/src/mame/misc/marywu.cpp b/src/mame/misc/marywu.cpp index 26d26ce275e..47b280cec26 100644 --- a/src/mame/misc/marywu.cpp +++ b/src/mame/misc/marywu.cpp @@ -53,7 +53,7 @@ private: void ay2_port_a_w(uint8_t data); void ay2_port_b_w(uint8_t data); uint8_t keyboard_r(); - void io_map(address_map &map) ATTR_COLD; + void data_map(address_map &map) ATTR_COLD; void program_map(address_map &map) ATTR_COLD; uint8_t m_selected_7seg_module = 0; @@ -163,7 +163,7 @@ void marywu_state::program_map(address_map &map) map(0x0000, 0x7fff).rom(); } -void marywu_state::io_map(address_map &map) +void marywu_state::data_map(address_map &map) { map(0x8000, 0x87ff).mirror(0x0800).ram().share("nvram"); /* HM6116: 2kbytes of Static RAM */ map(0x9000, 0x9001).mirror(0x0ffc).rw("ay1", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w)); @@ -187,7 +187,7 @@ void marywu_state::marywu(machine_config &config) /* basic machine hardware */ i80c31_device &maincpu(I80C31(config, "maincpu", XTAL(10'738'635))); //actual CPU is a Winbond w78c31b-24 maincpu.set_addrmap(AS_PROGRAM, &marywu_state::program_map); - maincpu.set_addrmap(AS_IO, &marywu_state::io_map); + maincpu.set_addrmap(AS_DATA, &marywu_state::data_map); //TODO: figure out what each bit is mapped to in the 80c31 ports P1 and P3 maincpu.port_in_cb<1>().set_ioport("P1"); diff --git a/src/mame/misc/megaturbo.cpp b/src/mame/misc/megaturbo.cpp index 3ec5f4f4089..bba95d762e6 100644 --- a/src/mame/misc/megaturbo.cpp +++ b/src/mame/misc/megaturbo.cpp @@ -77,7 +77,7 @@ private: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_mcu; - void mem_io(address_map &map) ATTR_COLD; + void mem_data(address_map &map) ATTR_COLD; void mem_prg(address_map &map) ATTR_COLD; // i80188 @@ -161,7 +161,7 @@ void megaturbo2_state::mem_prg(address_map &map) map(0x0000, 0xffff).rom().region("mcu", 0); } -void megaturbo2_state::mem_io(address_map &map) +void megaturbo2_state::mem_data(address_map &map) { map(0x0000, 0x1fff).ram(); map(0xa000, 0xa007).rw("uart", FUNC(ns16450_device::ins8250_r), FUNC(ns16450_device::ins8250_w)); @@ -249,7 +249,7 @@ void megaturbo2_state::megaturbo2(machine_config &config) I8031(config, m_mcu, MCU_CLOCK); m_mcu->set_addrmap(AS_PROGRAM, &megaturbo2_state::mem_prg); - m_mcu->set_addrmap(AS_IO, &megaturbo2_state::mem_io); + m_mcu->set_addrmap(AS_DATA, &megaturbo2_state::mem_data); ns16450_device &uart(NS16450(config, "uart", 10_MHz_XTAL / 8)); uart.out_tx_callback().set("rs232", FUNC(rs232_port_device::write_txd)); diff --git a/src/mame/misc/micro3d.cpp b/src/mame/misc/micro3d.cpp index cf9c44a6732..1c2eed6e666 100644 --- a/src/mame/misc/micro3d.cpp +++ b/src/mame/misc/micro3d.cpp @@ -291,7 +291,7 @@ void micro3d_state::soundmem_prg(address_map &map) map(0x0000, 0x7fff).rom(); } -void micro3d_state::soundmem_io(address_map &map) +void micro3d_state::soundmem_data(address_map &map) { map(0x0000, 0x07ff).ram(); map(0xfd00, 0xfd01).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); @@ -332,7 +332,7 @@ void micro3d_state::micro3d(machine_config &config) I80C31(config, m_audiocpu, 11.0592_MHz_XTAL); m_audiocpu->set_addrmap(AS_PROGRAM, µ3d_state::soundmem_prg); - m_audiocpu->set_addrmap(AS_IO, µ3d_state::soundmem_io); + m_audiocpu->set_addrmap(AS_DATA, µ3d_state::soundmem_data); m_audiocpu->port_in_cb<1>().set(FUNC(micro3d_state::sound_p1_r)); m_audiocpu->port_out_cb<1>().set(FUNC(micro3d_state::sound_p1_w)); m_audiocpu->port_in_cb<3>().set(FUNC(micro3d_state::sound_p3_r)); diff --git a/src/mame/misc/micro3d.h b/src/mame/misc/micro3d.h index b4fdaf4cecd..0d98c7b971b 100644 --- a/src/mame/misc/micro3d.h +++ b/src/mame/misc/micro3d.h @@ -196,7 +196,7 @@ private: void drmath_data(address_map &map) ATTR_COLD; void drmath_prg(address_map &map) ATTR_COLD; void hostmem(address_map &map) ATTR_COLD; - void soundmem_io(address_map &map) ATTR_COLD; + void soundmem_data(address_map &map) ATTR_COLD; void soundmem_prg(address_map &map) ATTR_COLD; void vgbmem(address_map &map) ATTR_COLD; }; diff --git a/src/mame/misc/microdar.cpp b/src/mame/misc/microdar.cpp index bde960dfdae..67ae486c85f 100644 --- a/src/mame/misc/microdar.cpp +++ b/src/mame/misc/microdar.cpp @@ -132,7 +132,7 @@ void microdar_state::microdar(machine_config &config) { I80C51(config, m_maincpu, 20_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, µdar_state::prog_map); - m_maincpu->set_addrmap(AS_IO, µdar_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, µdar_state::ext_map); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // GM76C88ALK-15 + battery I2C_24C16(config, m_eeprom); diff --git a/src/mame/misc/piggypas.cpp b/src/mame/misc/piggypas.cpp index fc0e0989c58..4af81ad48f7 100644 --- a/src/mame/misc/piggypas.cpp +++ b/src/mame/misc/piggypas.cpp @@ -58,9 +58,9 @@ private: uint8_t m_ctrl = 0; uint8_t m_lcd_latch = 0; uint32_t m_digit_latch = 0; - void piggypas_io(address_map &map) ATTR_COLD; + void piggypas_data(address_map &map) ATTR_COLD; void piggypas_map(address_map &map) ATTR_COLD; - void fidlstix_io(address_map &map) ATTR_COLD; + void fidlstix_data(address_map &map) ATTR_COLD; }; @@ -131,7 +131,7 @@ void piggypas_state::piggypas_map(address_map &map) map(0x0000, 0x7fff).rom(); } -void piggypas_state::piggypas_io(address_map &map) +void piggypas_state::piggypas_data(address_map &map) { map(0x0000, 0x07ff).ram().share("nvram"); map(0x0800, 0x0803).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); @@ -140,7 +140,7 @@ void piggypas_state::piggypas_io(address_map &map) map(0x1802, 0x1803).r(m_hd44780, FUNC(hd44780_device::read)); } -void piggypas_state::fidlstix_io(address_map &map) +void piggypas_state::fidlstix_data(address_map &map) { map(0x0000, 0x07ff).ram().share("nvram"); map(0x0800, 0x0803).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write)); @@ -202,7 +202,7 @@ void piggypas_state::piggypas(machine_config &config) /* basic machine hardware */ I80C31(config, m_maincpu, 8.448_MHz_XTAL); // OKI M80C31F or M80C154S m_maincpu->set_addrmap(AS_PROGRAM, &piggypas_state::piggypas_map); - m_maincpu->set_addrmap(AS_IO, &piggypas_state::piggypas_io); + m_maincpu->set_addrmap(AS_DATA, &piggypas_state::piggypas_data); m_maincpu->port_out_cb<1>().set(FUNC(piggypas_state::led_strobe_w)); m_maincpu->port_in_cb<3>().set_ioport("IN2"); m_maincpu->port_out_cb<3>().set(FUNC(piggypas_state::port3_w)); @@ -242,7 +242,7 @@ void piggypas_state::fidlstix(machine_config &config) { piggypas(config); - m_maincpu->set_addrmap(AS_IO, &piggypas_state::fidlstix_io); + m_maincpu->set_addrmap(AS_DATA, &piggypas_state::fidlstix_data); m_maincpu->port_in_cb<1>().set(m_hd44780, FUNC(hd44780_device::db_r)); m_maincpu->port_out_cb<1>().set(FUNC(piggypas_state::lcd_latch_w)); m_maincpu->port_out_cb<3>().set(FUNC(piggypas_state::lcd_control_w)); diff --git a/src/mame/misc/re900.cpp b/src/mame/misc/re900.cpp index 0cc11c8712d..cb92c54c4c3 100644 --- a/src/mame/misc/re900.cpp +++ b/src/mame/misc/re900.cpp @@ -119,7 +119,7 @@ private: void re_mux_port_A_w(uint8_t data); void re_mux_port_B_w(uint8_t data); - void mem_io(address_map &map) ATTR_COLD; + void mem_data(address_map &map) ATTR_COLD; void mem_prg(address_map &map) ATTR_COLD; required_device<cpu_device> m_maincpu; @@ -254,7 +254,7 @@ void re900_state::mem_prg(address_map &map) map(0x0000, 0xffff).rom().region("maincpu", 0); } -void re900_state::mem_io(address_map &map) +void re900_state::mem_data(address_map &map) { map(0x0000, 0xbfff).rom().region("maincpu", 0); map(0xc000, 0xdfff).ram().share("nvram"); @@ -387,7 +387,7 @@ void re900_state::re900(machine_config &config) /* basic machine hardware */ i8051_device &maincpu(I8051(config, m_maincpu, MAIN_CLOCK)); maincpu.set_addrmap(AS_PROGRAM, &re900_state::mem_prg); - maincpu.set_addrmap(AS_IO, &re900_state::mem_io); + maincpu.set_addrmap(AS_DATA, &re900_state::mem_data); maincpu.port_out_cb<0>().set(FUNC(re900_state::cpu_port_0_w)); /* video hardware */ diff --git a/src/mame/misc/sliver.cpp b/src/mame/misc/sliver.cpp index fc40e885cea..661f4010b3e 100644 --- a/src/mame/misc/sliver.cpp +++ b/src/mame/misc/sliver.cpp @@ -148,7 +148,7 @@ private: void oki_map(address_map &map) ATTR_COLD; void ramdac_map(address_map &map) ATTR_COLD; void sliver_map(address_map &map) ATTR_COLD; - void soundmem_io(address_map &map) ATTR_COLD; + void soundmem_data(address_map &map) ATTR_COLD; void soundmem_prg(address_map &map) ATTR_COLD; }; @@ -321,26 +321,19 @@ void sliver_state::io_offset_w(offs_t offset, uint8_t data) void sliver_state::io_data_w(offs_t offset, uint8_t data) { - if (m_io_offset < IO_SIZE) - { - int tmpx, tmpy; - m_io_reg[m_io_offset] = data; + int tmpx, tmpy; + m_io_reg[m_io_offset] = data; - // TODO: this doesn't match ZR36050 control registers - // is it really accessing FPGA instead, simplifying Zoran access? - tmpy = m_io_reg[0x1a] + (m_io_reg[0x1b] << 8) - m_io_reg[0x20]; //0x20 ??? - tmpx = m_io_reg[0x1e] + (m_io_reg[0x1f] << 8); + // TODO: this doesn't match ZR36050 control registers + // is it really accessing FPGA instead, simplifying Zoran access? + tmpy = m_io_reg[0x1a] + (m_io_reg[0x1b] << 8) - m_io_reg[0x20]; //0x20 ??? + tmpx = m_io_reg[0x1e] + (m_io_reg[0x1f] << 8); - if (tmpy != m_jpeg_y || tmpx != m_jpeg_x) - { - m_jpeg_x = tmpx; - m_jpeg_y = tmpy; - render_jpeg(); - } - } - else + if (tmpy != m_jpeg_y || tmpx != m_jpeg_x) { - logerror("I/O access out of range: %x\n", m_io_offset); + m_jpeg_x = tmpx; + m_jpeg_y = tmpy; + render_jpeg(); } } @@ -393,7 +386,7 @@ void sliver_state::soundmem_prg(address_map &map) map(0x0000, 0xffff).rom(); } -void sliver_state::soundmem_io(address_map &map) +void sliver_state::soundmem_data(address_map &map) { map(0x0100, 0x0100).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x0101, 0x0101).r(m_soundlatch, FUNC(generic_latch_8_device::read)); @@ -526,7 +519,7 @@ void sliver_state::sliver(machine_config &config) I8051(config, m_audiocpu, 8000000); m_audiocpu->set_addrmap(AS_PROGRAM, &sliver_state::soundmem_prg); - m_audiocpu->set_addrmap(AS_IO, &sliver_state::soundmem_io); + m_audiocpu->set_addrmap(AS_DATA, &sliver_state::soundmem_data); m_audiocpu->port_out_cb<1>().set(FUNC(sliver_state::oki_setbank)); SCREEN(config, m_screen, SCREEN_TYPE_RASTER); diff --git a/src/mame/misc/whtm68k.cpp b/src/mame/misc/whtm68k.cpp index bc43980e90b..5bb736bb04c 100644 --- a/src/mame/misc/whtm68k.cpp +++ b/src/mame/misc/whtm68k.cpp @@ -126,7 +126,7 @@ private: void main_program_map(address_map &map) ATTR_COLD; void audio_program_map(address_map &map) ATTR_COLD; - void audio_io_map(address_map &map) ATTR_COLD; + void audio_data_map(address_map &map) ATTR_COLD; template <uint8_t Which> void ramdac_map(address_map &map) ATTR_COLD; }; @@ -252,7 +252,7 @@ void whtm68k_state::audio_program_map(address_map &map) map(0x8000, 0xffff).bankr(m_audiobank); } -void whtm68k_state::audio_io_map(address_map &map) +void whtm68k_state::audio_data_map(address_map &map) { map(0x8000, 0x803f).ram(); // ?? map(0xa000, 0xa000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); @@ -379,7 +379,7 @@ void whtm68k_state::yizhix(machine_config &config) i80c32_device &audiocpu(I80C32(config, "audiocpu", 12_MHz_XTAL)); audiocpu.set_addrmap(AS_PROGRAM, &whtm68k_state::audio_program_map); - audiocpu.set_addrmap(AS_IO, &whtm68k_state::audio_io_map); + audiocpu.set_addrmap(AS_DATA, &whtm68k_state::audio_data_map); audiocpu.port_in_cb<0>().set([this] () { LOGPORTS("%s: 80C32 port 0 read\n", machine().describe_context()); return 0; }); audiocpu.port_in_cb<1>().set([this] () { // TODO: read all the time diff --git a/src/mame/nichibutsu/armedf.cpp b/src/mame/nichibutsu/armedf.cpp index fb703fd7ae1..06541ab14cf 100644 --- a/src/mame/nichibutsu/armedf.cpp +++ b/src/mame/nichibutsu/armedf.cpp @@ -634,7 +634,7 @@ void bigfghtr_state::bigfghtr_mcu_map(address_map &map) map(0x0000, 0x0fff).rom(); } -void bigfghtr_state::bigfghtr_mcu_io_map(address_map &map) +void bigfghtr_state::bigfghtr_mcu_data_map(address_map &map) { map(0x00000, 0x005ff).w(FUNC(bigfghtr_state::mcu_spritelist_w)); //Sprite RAM, guess shared as well map(0x00600, 0x03fff).ram().share("sharedram"); @@ -1327,7 +1327,7 @@ void bigfghtr_state::bigfghtr(machine_config &config) i8751_device &mcu(I8751(config, "mcu", XTAL(16'000'000)/2)); // verified mcu.set_addrmap(AS_PROGRAM, &bigfghtr_state::bigfghtr_mcu_map); - mcu.set_addrmap(AS_IO, &bigfghtr_state::bigfghtr_mcu_io_map); + mcu.set_addrmap(AS_DATA, &bigfghtr_state::bigfghtr_mcu_data_map); mcu.port_in_cb<1>().set_constant(0xdf); // bit 5: bus contention related? video_config(config, 12, 8, 248); diff --git a/src/mame/nichibutsu/armedf.h b/src/mame/nichibutsu/armedf.h index af58ed18c35..eed4f2c83a9 100644 --- a/src/mame/nichibutsu/armedf.h +++ b/src/mame/nichibutsu/armedf.h @@ -191,7 +191,7 @@ private: void mcu_spritelist_w(offs_t offset, u8 data); void bigfghtr_map(address_map &map) ATTR_COLD; - void bigfghtr_mcu_io_map(address_map &map) ATTR_COLD; + void bigfghtr_mcu_data_map(address_map &map) ATTR_COLD; void bigfghtr_mcu_map(address_map &map) ATTR_COLD; }; diff --git a/src/mame/nintendo/snesb51.cpp b/src/mame/nintendo/snesb51.cpp index 07f94623866..5822ba82cbd 100644 --- a/src/mame/nintendo/snesb51.cpp +++ b/src/mame/nintendo/snesb51.cpp @@ -284,7 +284,7 @@ void snesb51_state::mk3snes(machine_config &config) base(config); I8751(config, m_mcu, 12_MHz_XTAL); - m_mcu->set_addrmap(AS_IO, &snesb51_state::io_map); + m_mcu->set_addrmap(AS_DATA, &snesb51_state::io_map); m_mcu->port_out_cb<1>().set(FUNC(snesb51_state::mcu_p1_w)); m_mcu->port_in_cb<3>().set(FUNC(snesb51_state::mcu_p3_r)); m_mcu->port_out_cb<3>().set(FUNC(snesb51_state::mcu_p3_w)); @@ -297,7 +297,7 @@ void snesb51_state::snes4sl(machine_config &config) // exact type unknown I8031(config, m_mcu, 12_MHz_XTAL); m_mcu->set_addrmap(AS_PROGRAM, &snesb51_state::mem_map); - m_mcu->set_addrmap(AS_IO, &snesb51_state::io_map); + m_mcu->set_addrmap(AS_DATA, &snesb51_state::io_map); m_mcu->port_out_cb<1>().set(FUNC(snesb51_state::mcu_p1_w)); m_mcu->port_in_cb<3>().set(FUNC(snesb51_state::mcu_p3_r)); m_mcu->port_out_cb<3>().set(FUNC(snesb51_state::mcu_p3_w)); @@ -313,7 +313,7 @@ void snesb51_state::snes4sln(machine_config &config) I8051(config, m_mcu, 12_MHz_XTAL); // SAB 8051A-P m_mcu->set_addrmap(AS_PROGRAM, &snesb51_state::mem_map); - m_mcu->set_addrmap(AS_IO, &snesb51_state::io_map); + m_mcu->set_addrmap(AS_DATA, &snesb51_state::io_map); m_mcu->port_out_cb<1>().set(FUNC(snesb51_state::mcu_p1_w)); m_mcu->port_in_cb<3>().set(FUNC(snesb51_state::mcu_p3_r)); m_mcu->port_out_cb<3>().set(FUNC(snesb51_state::mcu_p3_w)); diff --git a/src/mame/paia/fatman.cpp b/src/mame/paia/fatman.cpp index 88ad133bb6f..8660253988b 100644 --- a/src/mame/paia/fatman.cpp +++ b/src/mame/paia/fatman.cpp @@ -638,7 +638,7 @@ void fatman_state::fatman(machine_config &config) { I8031(config, m_maincpu, 12_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &fatman_state::program_map); - m_maincpu->set_addrmap(AS_IO, &fatman_state::external_memory_map); + m_maincpu->set_addrmap(AS_DATA, &fatman_state::external_memory_map); // The `set_constant()`s on inputs 1 and 3 ensure that those inputs, when // read, will return whatever was written to them (the input is diff --git a/src/mame/paia/midi2cv8.cpp b/src/mame/paia/midi2cv8.cpp index a016f932dec..69e1bb27cbb 100644 --- a/src/mame/paia/midi2cv8.cpp +++ b/src/mame/paia/midi2cv8.cpp @@ -427,7 +427,7 @@ void midi2cv8_state::midi2cv8(machine_config &config) { I80C31(config, m_maincpu, 12_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &midi2cv8_state::program_map); - m_maincpu->set_addrmap(AS_IO, &midi2cv8_state::external_memory_map); + m_maincpu->set_addrmap(AS_DATA, &midi2cv8_state::external_memory_map); m_maincpu->port_in_cb<1>().set_ioport("dsw").mask(0x1f); // P1.0-P1.4 m_maincpu->port_in_cb<1>().append(FUNC(midi2cv8_state::is_volts_per_hz_r)).lshift(7).mask(0x80); // P1.7 diff --git a/src/mame/philips/minitel_2_rpic.cpp b/src/mame/philips/minitel_2_rpic.cpp index a0f91b0c161..6496872dc4a 100644 --- a/src/mame/philips/minitel_2_rpic.cpp +++ b/src/mame/philips/minitel_2_rpic.cpp @@ -165,7 +165,7 @@ private: void ts9347_io_w(offs_t offset, uint8_t data); void mem_prg(address_map &map) ATTR_COLD; - void mem_io(address_map &map) ATTR_COLD; + void mem_data(address_map &map) ATTR_COLD; }; void minitel_state::machine_start() @@ -387,7 +387,7 @@ void minitel_state::mem_prg(address_map &map) map(0x0000, 0x7fff).rom(); } -void minitel_state::mem_io(address_map &map) +void minitel_state::mem_data(address_map &map) { map(0x2000, 0x3fff).rw(FUNC(minitel_state::dev_keyb_ser_r), FUNC(minitel_state::dev_ctrl_reg_w)); /* ts9347 */ @@ -523,7 +523,7 @@ void minitel_state::minitel2(machine_config &config) /* basic machine hardware */ I80C32(config, m_maincpu, XTAL(14'318'181)); //verified on pcb m_maincpu->set_addrmap(AS_PROGRAM, &minitel_state::mem_prg); - m_maincpu->set_addrmap(AS_IO, &minitel_state::mem_io); + m_maincpu->set_addrmap(AS_DATA, &minitel_state::mem_data); m_maincpu->port_in_cb<1>().set(FUNC(minitel_state::port1_r)); m_maincpu->port_out_cb<1>().set(FUNC(minitel_state::port1_w)); m_maincpu->port_in_cb<3>().set(FUNC(minitel_state::port3_r)); diff --git a/src/mame/philips/patgen.cpp b/src/mame/philips/patgen.cpp index 7b8f97beca9..dc2086c1777 100644 --- a/src/mame/philips/patgen.cpp +++ b/src/mame/philips/patgen.cpp @@ -50,7 +50,6 @@ protected: private: void i80c31_data(address_map &map) ATTR_COLD; - void i80c31_io(address_map &map) ATTR_COLD; void i80c31_prg(address_map &map) ATTR_COLD; u8 i80c31_p1_r(); @@ -74,7 +73,7 @@ void patgen_state::i80c31_prg(address_map &map) map(0x0000, 0xffff).rom(); } -void patgen_state::i80c31_io(address_map &map) +void patgen_state::i80c31_data(address_map &map) { map(0x0000, 0x1fff).ram(); map(0x8000, 0x8000).r(FUNC(patgen_state::keyboard_r)); @@ -84,11 +83,6 @@ void patgen_state::i80c31_io(address_map &map) map(0x8006, 0x8006).w(FUNC(patgen_state::ch23_w)); } -void patgen_state::i80c31_data(address_map &map) -{ - map(0x000, 0x1ff).ram(); -} - u8 patgen_state::i80c31_p1_r() { m_port1 = m_io_dsw->read(); @@ -210,7 +204,6 @@ void patgen_state::patgen(machine_config &config) I80C31(config, m_maincpu, 16_MHz_XTAL); // Philips PCB80C31BH m_maincpu->set_addrmap(AS_PROGRAM, &patgen_state::i80c31_prg); m_maincpu->set_addrmap(AS_DATA, &patgen_state::i80c31_data); - m_maincpu->set_addrmap(AS_IO, &patgen_state::i80c31_io); m_maincpu->port_in_cb<1>().set(FUNC(patgen_state::i80c31_p1_r)); saa1043_device &saa1043(SAA1043(config, "saa1043", XTAL(5'000'000))); diff --git a/src/mame/pinball/alvg.cpp b/src/mame/pinball/alvg.cpp index 409ff508ea5..7538b4aa102 100644 --- a/src/mame/pinball/alvg.cpp +++ b/src/mame/pinball/alvg.cpp @@ -120,7 +120,7 @@ private: void pca002_map(address_map &map) ATTR_COLD; void pca003_map(address_map &map) ATTR_COLD; void pca008_map(address_map &map) ATTR_COLD; - void pca020_io_map(address_map &map) ATTR_COLD; + void pca020_data_map(address_map &map) ATTR_COLD; void pca020_mem_map(address_map &map) ATTR_COLD; void machine_start() override ATTR_COLD; void machine_reset() override ATTR_COLD; @@ -242,7 +242,7 @@ void alvg_state::pca020_mem_map(address_map &map) map(0x8000, 0xffff).bankr("dmd"); } -void alvg_state::pca020_io_map(address_map &map) +void alvg_state::pca020_data_map(address_map &map) { map.unmap_value_high(); map(0x0000, 0x7fff).ram().share("vram"); @@ -574,7 +574,7 @@ void alvg_state::pca020(machine_config &config) /* basic machine hardware */ I8031(config, m_dmdcpu, XTAL(12'000'000)); m_dmdcpu->set_addrmap(AS_PROGRAM, &alvg_state::pca020_mem_map); - m_dmdcpu->set_addrmap(AS_IO, &alvg_state::pca020_io_map); + m_dmdcpu->set_addrmap(AS_DATA, &alvg_state::pca020_data_map); m_dmdcpu->port_out_cb<1>().set(FUNC(alvg_state::dmd_port1_w)); m_dmdcpu->port_in_cb<1>().set(FUNC(alvg_state::dmd_port1_r)); m_dmdcpu->port_out_cb<3>().set(FUNC(alvg_state::dmd_port3_w)); diff --git a/src/mame/pinball/mephistp.cpp b/src/mame/pinball/mephistp.cpp index e3419f82ce3..4ec18da50e0 100644 --- a/src/mame/pinball/mephistp.cpp +++ b/src/mame/pinball/mephistp.cpp @@ -64,11 +64,11 @@ private: u8 ay8910_inputs_r(); void sound_rombank_w(u8 data); - void mephisto_8051_io(address_map &map) ATTR_COLD; + void mephisto_8051_data(address_map &map) ATTR_COLD; void mephisto_8051_map(address_map &map) ATTR_COLD; void mephisto_map(address_map &map) ATTR_COLD; void sport2k_map(address_map &map) ATTR_COLD; - void sport2k_8051_io(address_map &map) ATTR_COLD; + void sport2k_8051_data(address_map &map) ATTR_COLD; u8 m_ay8910_data = 0U; bool m_ay8910_bdir = false; @@ -164,16 +164,16 @@ void mephisto_state::mephisto_8051_map(address_map &map) map(0x8000, 0xffff).bankr("soundbank"); } -void mephisto_state::mephisto_8051_io(address_map &map) +void mephisto_state::mephisto_8051_data(address_map &map) { map(0x0000, 0x07ff).ram(); map(0x0800, 0x0800).w(FUNC(mephisto_state::sound_rombank_w)); map(0x1000, 0x1000).w("dac", FUNC(dac08_device::data_w)); } -void mephisto_state::sport2k_8051_io(address_map &map) +void mephisto_state::sport2k_8051_data(address_map &map) { - mephisto_8051_io(map); + mephisto_8051_data(map); map(0x1800, 0x1801).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); } @@ -233,7 +233,7 @@ void mephisto_state::mephisto(machine_config &config) i8051_device &soundcpu(I8051(config, "soundcpu", XTAL(12'000'000))); soundcpu.set_addrmap(AS_PROGRAM, &mephisto_state::mephisto_8051_map); // EA tied high for external program ROM - soundcpu.set_addrmap(AS_IO, &mephisto_state::mephisto_8051_io); + soundcpu.set_addrmap(AS_DATA, &mephisto_state::mephisto_8051_data); soundcpu.port_in_cb<1>().set(FUNC(mephisto_state::ay8910_read)); soundcpu.port_out_cb<1>().set(FUNC(mephisto_state::ay8910_write)); soundcpu.port_out_cb<3>().set(FUNC(mephisto_state::t0_t1_w)); @@ -256,7 +256,7 @@ void mephisto_state::sport2k(machine_config &config) { mephisto(config); m_maincpu->set_addrmap(AS_PROGRAM, &mephisto_state::sport2k_map); - subdevice<i8051_device>("soundcpu")->set_addrmap(AS_IO, &mephisto_state::sport2k_8051_io); + subdevice<i8051_device>("soundcpu")->set_addrmap(AS_DATA, &mephisto_state::sport2k_8051_data); YM3812(config, "ymsnd", XTAL(14'318'181)/4).add_route(ALL_OUTPUTS, "mono", 0.5); } diff --git a/src/mame/pinball/spinb.cpp b/src/mame/pinball/spinb.cpp index 9ba1330ef5f..33ba0f50083 100644 --- a/src/mame/pinball/spinb.cpp +++ b/src/mame/pinball/spinb.cpp @@ -157,7 +157,7 @@ private: u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void dmd_io(address_map &map) ATTR_COLD; + void dmd_data(address_map &map) ATTR_COLD; void dmd_mem(address_map &map) ATTR_COLD; void audio_map(address_map &map) ATTR_COLD; void spinb_map(address_map &map) ATTR_COLD; @@ -256,7 +256,7 @@ void spinb_state::dmd_mem(address_map &map) map(0x0000, 0xffff).rom(); } -void spinb_state::dmd_io(address_map &map) +void spinb_state::dmd_data(address_map &map) { map(0x0000, 0x1fff).w(FUNC(spinb_state::dmdram_w)); map(0x0000, 0xffff).r(FUNC(spinb_state::dmdram_r)); @@ -1003,7 +1003,7 @@ void spinb_state::dmd(machine_config &config) { I8031(config, m_dmdcpu, XTAL(16'000'000)); m_dmdcpu->set_addrmap(AS_PROGRAM, &spinb_state::dmd_mem); - m_dmdcpu->set_addrmap(AS_IO, &spinb_state::dmd_io); + m_dmdcpu->set_addrmap(AS_DATA, &spinb_state::dmd_data); m_dmdcpu->port_out_cb<1>().set(FUNC(spinb_state::p1_w)); m_dmdcpu->port_in_cb<3>().set(FUNC(spinb_state::p3_r)); m_dmdcpu->port_out_cb<3>().set(FUNC(spinb_state::p3_w)); diff --git a/src/mame/rm/rmnimbus.cpp b/src/mame/rm/rmnimbus.cpp index 1adfc085399..1b2e3bd9524 100644 --- a/src/mame/rm/rmnimbus.cpp +++ b/src/mame/rm/rmnimbus.cpp @@ -105,7 +105,7 @@ void rmnimbus_state::nimbus_iocpu_mem(address_map &map) map(0x0000, 0x1fff).rom(); } -void rmnimbus_state::nimbus_iocpu_io(address_map &map) +void rmnimbus_state::nimbus_iocpu_data(address_map &map) { map.unmap_value_high(); map(0x00000, 0x000FF).rw(FUNC(rmnimbus_state::nimbus_pc8031_iou_r), FUNC(rmnimbus_state::nimbus_pc8031_iou_w)); @@ -123,7 +123,7 @@ void rmnimbus_state::nimbus(machine_config &config) I8031(config, m_iocpu, 11059200); m_iocpu->set_addrmap(AS_PROGRAM, &rmnimbus_state::nimbus_iocpu_mem); - m_iocpu->set_addrmap(AS_IO, &rmnimbus_state::nimbus_iocpu_io); + m_iocpu->set_addrmap(AS_DATA, &rmnimbus_state::nimbus_iocpu_data); m_iocpu->port_in_cb<1>().set(FUNC(rmnimbus_state::nimbus_pc8031_port1_r)); m_iocpu->port_out_cb<1>().set(FUNC(rmnimbus_state::nimbus_pc8031_port1_w)); m_iocpu->port_in_cb<3>().set(FUNC(rmnimbus_state::nimbus_pc8031_port3_r)); diff --git a/src/mame/rm/rmnimbus.h b/src/mame/rm/rmnimbus.h index df7477797de..39c779258c8 100644 --- a/src/mame/rm/rmnimbus.h +++ b/src/mame/rm/rmnimbus.h @@ -255,7 +255,7 @@ private: bool m_voice_enabled = false; void nimbus_io(address_map &map) ATTR_COLD; - void nimbus_iocpu_io(address_map &map) ATTR_COLD; + void nimbus_iocpu_data(address_map &map) ATTR_COLD; void nimbus_iocpu_mem(address_map &map) ATTR_COLD; void nimbus_mem(address_map &map) ATTR_COLD; diff --git a/src/mame/roland/alphajuno.cpp b/src/mame/roland/alphajuno.cpp index 73b9fdbeaad..b369a4d5b28 100644 --- a/src/mame/roland/alphajuno.cpp +++ b/src/mame/roland/alphajuno.cpp @@ -116,7 +116,7 @@ void alphajuno_state::ajuno1(machine_config &config) { I8032(config, m_maincpu, 12_MHz_XTAL); // P8032AH m_maincpu->set_addrmap(AS_PROGRAM, &alphajuno_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &alphajuno_state::ajuno1_ext_map); + m_maincpu->set_addrmap(AS_DATA, &alphajuno_state::ajuno1_ext_map); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // TC5517APL + battery @@ -151,7 +151,7 @@ void alphajuno_state::ajuno1(machine_config &config) void alphajuno_state::ajuno2(machine_config &config) { ajuno1(config); - m_maincpu->set_addrmap(AS_IO, &alphajuno_state::ajuno2_ext_map); + m_maincpu->set_addrmap(AS_DATA, &alphajuno_state::ajuno2_ext_map); mb63h149_device &keyscan(MB63H149(config, "keyscan", 12_MHz_XTAL)); keyscan.int_callback().set_inputline(m_maincpu, MCS51_INT0_LINE); @@ -161,7 +161,7 @@ void alphajuno_state::mks50(machine_config &config) { I80C31(config, m_maincpu, 12_MHz_XTAL); // MSM80C31P m_maincpu->set_addrmap(AS_PROGRAM, &alphajuno_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &alphajuno_state::mks50_ext_map); + m_maincpu->set_addrmap(AS_DATA, &alphajuno_state::mks50_ext_map); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // TC5564PL-20 + battery diff --git a/src/mame/roland/jx8p_synth.cpp b/src/mame/roland/jx8p_synth.cpp index 3a2513715f6..aa0e99c2c5a 100644 --- a/src/mame/roland/jx8p_synth.cpp +++ b/src/mame/roland/jx8p_synth.cpp @@ -75,7 +75,7 @@ void jx8p_synth_device::device_add_mconfig(machine_config &config) { I8031(config, m_synthcpu, 12_MHz_XTAL); // 8051-319 (EA tied to GND) m_synthcpu->set_addrmap(AS_PROGRAM, &jx8p_synth_device::prog_map); - m_synthcpu->set_addrmap(AS_IO, &jx8p_synth_device::ext_map); + m_synthcpu->set_addrmap(AS_DATA, &jx8p_synth_device::ext_map); I8155(config, m_ramio, 0); // µPD8155HC m_ramio->out_pa_callback().set(FUNC(jx8p_synth_device::prescale_w)); @@ -88,7 +88,7 @@ void superjx_synth_device::device_add_mconfig(machine_config &config) { I8031(config, m_synthcpu, 12_MHz_XTAL); // MBL8031AH-P-G m_synthcpu->set_addrmap(AS_PROGRAM, &superjx_synth_device::prog_map); - m_synthcpu->set_addrmap(AS_IO, &superjx_synth_device::ext_map); + m_synthcpu->set_addrmap(AS_DATA, &superjx_synth_device::ext_map); I8155(config, m_ramio, 0); // µPD8155HC-2 m_ramio->out_pa_callback().set(FUNC(superjx_synth_device::prescale_w)); diff --git a/src/mame/roland/roland_jx3p.cpp b/src/mame/roland/roland_jx3p.cpp index d97b867a517..5c48d35024e 100644 --- a/src/mame/roland/roland_jx3p.cpp +++ b/src/mame/roland/roland_jx3p.cpp @@ -208,7 +208,7 @@ void roland_jx3p_state::jx3p(machine_config &config) { I8031(config, m_maincpu, 12_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &roland_jx3p_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &roland_jx3p_state::jk3p_ext_map); + m_maincpu->set_addrmap(AS_DATA, &roland_jx3p_state::jk3p_ext_map); m_maincpu->port_out_cb<1>().set(FUNC(roland_jx3p_state::analog_select_w)); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // TC5517APL + battery @@ -224,7 +224,7 @@ void roland_jx3p_state::jx3p(machine_config &config) void roland_jx3p_state::mks30(machine_config &config) { jx3p(config); - m_maincpu->set_addrmap(AS_IO, &roland_jx3p_state::mks30_ext_map); + m_maincpu->set_addrmap(AS_DATA, &roland_jx3p_state::mks30_ext_map); GENERIC_CARTSLOT(config, m_cartslot, generic_plain_slot, nullptr, "mks30_cart"); } @@ -235,7 +235,7 @@ void roland_jx3p_state::gr700(machine_config &config) I8031(config, m_ifcpu, 12_MHz_XTAL); m_ifcpu->set_addrmap(AS_PROGRAM, &roland_jx3p_state::if_prog_map); - m_ifcpu->set_addrmap(AS_IO, &roland_jx3p_state::if_ext_map); + m_ifcpu->set_addrmap(AS_DATA, &roland_jx3p_state::if_ext_map); m_ifcpu->port_out_cb<1>().set(FUNC(roland_jx3p_state::if_anlg_mux_w)); m_ifcpu->port_in_cb<3>().set("adc", FUNC(adc0803_device::intr_r)).lshift(4); diff --git a/src/mame/roland/roland_s10.cpp b/src/mame/roland/roland_s10.cpp index 642c7512de6..9926e4216b5 100644 --- a/src/mame/roland/roland_s10.cpp +++ b/src/mame/roland/roland_s10.cpp @@ -200,7 +200,7 @@ void roland_s10_state::s10(machine_config &config) { I8032(config, m_maincpu, 12_MHz_XTAL); // SAB8032A m_maincpu->set_addrmap(AS_PROGRAM, &roland_s10_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &roland_s10_state::s10_ext_map); + m_maincpu->set_addrmap(AS_DATA, &roland_s10_state::s10_ext_map); MB62H195(config, m_io); m_io->lc_callback().set(m_lcdc, FUNC(hd44780_device::write)); @@ -252,7 +252,7 @@ void roland_s10_state::s10(machine_config &config) void roland_s10_state::mks100(machine_config &config) { s10(config); - m_maincpu->set_addrmap(AS_IO, &roland_s10_state::mks100_ext_map); + m_maincpu->set_addrmap(AS_DATA, &roland_s10_state::mks100_ext_map); m_io->sout_callback().set_nop(); m_io->sck_callback().set_nop(); @@ -266,7 +266,7 @@ void roland_s10_state::mks100(machine_config &config) void roland_s220_state::s220(machine_config &config) { s10(config); - m_maincpu->set_addrmap(AS_IO, &roland_s220_state::s220_ext_map); + m_maincpu->set_addrmap(AS_DATA, &roland_s220_state::s220_ext_map); m_io->sout_callback().set_nop(); m_io->sck_callback().set_nop(); diff --git a/src/mame/sealy/sealy_8031.cpp b/src/mame/sealy/sealy_8031.cpp index 1f2c0aa2c26..571f701bd18 100644 --- a/src/mame/sealy/sealy_8031.cpp +++ b/src/mame/sealy/sealy_8031.cpp @@ -200,7 +200,7 @@ void sealy_8031_state::jinsanse(machine_config &config) { I8031(config, m_maincpu, 10.240_MHz_XTAL); // P8031AH. Is this the correct XTAL or the other one? Divider? m_maincpu->set_addrmap(AS_PROGRAM, &sealy_8031_state::program_map); - m_maincpu->set_addrmap(AS_IO, &sealy_8031_state::io_map); + m_maincpu->set_addrmap(AS_DATA, &sealy_8031_state::io_map); m_maincpu->port_in_cb<0>().set([this] () { LOGPORTS("%s: 8031 port 0 in\n", machine().describe_context()); return uint8_t(0); }); m_maincpu->port_in_cb<1>().set([this] () { LOGPORTS("%s: 8031 port 1 in\n", machine().describe_context()); return uint8_t(0); }); m_maincpu->port_in_cb<2>().set([this] () { LOGPORTS("%s: 8031 port 2 in\n", machine().describe_context()); return uint8_t(0); }); diff --git a/src/mame/sega/segahang.cpp b/src/mame/sega/segahang.cpp index 58646b66ff4..4cdbe9a95a5 100644 --- a/src/mame/sega/segahang.cpp +++ b/src/mame/sega/segahang.cpp @@ -464,7 +464,7 @@ void segahang_state::sound_portmap_2203x2(address_map &map) // I8751 MCU ADDRESS MAPS //************************************************************************** -void segahang_state::mcu_io_map(address_map &map) +void segahang_state::mcu_data_map(address_map &map) { map(0x0000, 0xffff).rw(FUNC(segahang_state::i8751_r), FUNC(segahang_state::i8751_w)); } @@ -935,7 +935,7 @@ void segahang_state::sharrier(machine_config &config) m_maincpu->remove_vblank_int(); I8751(config, m_mcu, 8000000); - m_mcu->set_addrmap(AS_IO, &segahang_state::mcu_io_map); + m_mcu->set_addrmap(AS_DATA, &segahang_state::mcu_data_map); m_mcu->port_out_cb<1>().set(FUNC(segahang_state::i8751_p1_w)); m_screen->screen_vblank().set_inputline("mcu", INPUT_LINE_IRQ0); diff --git a/src/mame/sega/segahang.h b/src/mame/sega/segahang.h index e1159de1f1e..da7fffa07ce 100644 --- a/src/mame/sega/segahang.h +++ b/src/mame/sega/segahang.h @@ -108,7 +108,7 @@ private: void decrypted_opcodes_map(address_map &map) ATTR_COLD; void fd1094_decrypted_opcodes_map(address_map &map) ATTR_COLD; void hangon_map(address_map &map) ATTR_COLD; - void mcu_io_map(address_map &map) ATTR_COLD; + void mcu_data_map(address_map &map) ATTR_COLD; void sharrier_map(address_map &map) ATTR_COLD; void sound_map_2151(address_map &map) ATTR_COLD; void sound_map_2203(address_map &map) ATTR_COLD; diff --git a/src/mame/sega/segas16a.cpp b/src/mame/sega/segas16a.cpp index d543f362f3d..bc2e420b4f2 100644 --- a/src/mame/sega/segas16a.cpp +++ b/src/mame/sega/segas16a.cpp @@ -462,11 +462,11 @@ void segas16a_state::mcu_control_w(uint8_t data) //------------------------------------------------- -// mcu_io_w - handle I/O space writes, which map +// mcu_data_w - handle I/O space writes, which map // to the 68000's address space //------------------------------------------------- -void segas16a_state::mcu_io_w(offs_t offset, uint8_t data) +void segas16a_state::mcu_data_w(offs_t offset, uint8_t data) { // // 1.00 0... = work RAM (accessed @ $4000+x) or I/O (accessed @ $8000+x) @@ -519,11 +519,11 @@ void segas16a_state::mcu_io_w(offs_t offset, uint8_t data) //------------------------------------------------- -// mcu_io_r - handle I/O space reads, which map +// mcu_data_r - handle I/O space reads, which map // to the 68000's address space //------------------------------------------------- -uint8_t segas16a_state::mcu_io_r(address_space &space, offs_t offset) +uint8_t segas16a_state::mcu_data_r(address_space &space, offs_t offset) { switch ((m_mcu_control >> 3) & 7) { @@ -1014,9 +1014,9 @@ void segas16a_state::sound_no7751_portmap(address_map &map) // I8751 MCU ADDRESS MAPS //************************************************************************** -void segas16a_state::mcu_io_map(address_map &map) +void segas16a_state::mcu_data_map(address_map &map) { - map(0x0000, 0xffff).rw(FUNC(segas16a_state::mcu_io_r), FUNC(segas16a_state::mcu_io_w)); + map(0x0000, 0xffff).rw(FUNC(segas16a_state::mcu_data_r), FUNC(segas16a_state::mcu_data_w)); } @@ -2065,7 +2065,7 @@ void segas16a_state::system16a_i8751(machine_config &config) m_maincpu->remove_vblank_int(); I8751(config, m_mcu, 8000000); - m_mcu->set_addrmap(AS_IO, &segas16a_state::mcu_io_map); + m_mcu->set_addrmap(AS_DATA, &segas16a_state::mcu_data_map); m_mcu->port_out_cb<1>().set(FUNC(segas16a_state::mcu_control_w)); m_screen->screen_vblank().set(FUNC(segas16a_state::i8751_main_cpu_vblank_w)); diff --git a/src/mame/sega/segas16a.h b/src/mame/sega/segas16a.h index b3976f3cdc1..375c7081e53 100644 --- a/src/mame/sega/segas16a.h +++ b/src/mame/sega/segas16a.h @@ -106,8 +106,8 @@ private: // I8751 MCU read/write handlers void mcu_control_w(uint8_t data); - void mcu_io_w(offs_t offset, uint8_t data); - uint8_t mcu_io_r(address_space &space, offs_t offset); + void mcu_data_w(offs_t offset, uint8_t data); + uint8_t mcu_data_r(address_space &space, offs_t offset); // I8751-related VBLANK interrupt handlers void i8751_main_cpu_vblank_w(int state); @@ -116,7 +116,7 @@ private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void decrypted_opcodes_map(address_map &map) ATTR_COLD; - void mcu_io_map(address_map &map) ATTR_COLD; + void mcu_data_map(address_map &map) ATTR_COLD; void sound_decrypted_opcodes_map(address_map &map) ATTR_COLD; void sound_map(address_map &map) ATTR_COLD; void sound_no7751_portmap(address_map &map) ATTR_COLD; diff --git a/src/mame/sega/segas16b.cpp b/src/mame/sega/segas16b.cpp index 82f47be5053..30ee113230d 100644 --- a/src/mame/sega/segas16b.cpp +++ b/src/mame/sega/segas16b.cpp @@ -1937,7 +1937,7 @@ void segas16b_state::spin_68k_w(uint8_t data) m_maincpu->spin_until_time(m_maincpu->cycles_to_attotime(20000)); } -void segas16b_state::mcu_io_map(address_map &map) +void segas16b_state::mcu_data_map(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); @@ -4162,7 +4162,7 @@ void segas16b_state::system16b_i8751(machine_config &config) m_maincpu->set_vblank_int("screen", FUNC(segas16b_state::i8751_main_cpu_vblank)); I8751(config, m_mcu, MASTER_CLOCK_8MHz); - m_mcu->set_addrmap(AS_IO, &segas16b_state::mcu_io_map); + m_mcu->set_addrmap(AS_DATA, &segas16b_state::mcu_data_map); m_mcu->port_in_cb<1>().set_ioport("SERVICE"); m_mcu->port_out_cb<1>().set(FUNC(segas16b_state::spin_68k_w)); diff --git a/src/mame/sega/segas16b.h b/src/mame/sega/segas16b.h index 81c596de1e0..58250bf11b2 100644 --- a/src/mame/sega/segas16b.h +++ b/src/mame/sega/segas16b.h @@ -181,7 +181,7 @@ protected: void lockonph_sound_iomap(address_map &map) ATTR_COLD; void lockonph_sound_map(address_map &map) ATTR_COLD; void map_fpointbla(address_map &map) ATTR_COLD; - void mcu_io_map(address_map &map) ATTR_COLD; + void mcu_data_map(address_map &map) ATTR_COLD; void sound_decrypted_opcodes_map(address_map &map) ATTR_COLD; void sound_map(address_map &map) ATTR_COLD; void sound_portmap(address_map &map) ATTR_COLD; diff --git a/src/mame/sega/segas18.cpp b/src/mame/sega/segas18.cpp index 301b3ef62fd..035dad0ed6e 100644 --- a/src/mame/sega/segas18.cpp +++ b/src/mame/sega/segas18.cpp @@ -679,7 +679,7 @@ void segas18_state::pcm_map(address_map &map) * *************************************/ -void segas18_state::mcu_io_map(address_map &map) +void segas18_state::mcu_data_map(address_map &map) { map.unmap_value_high(); map.global_mask(0xff); // port 2 not used for high order address byte @@ -1512,7 +1512,7 @@ void segas18_state::system18_i8751(machine_config &config) m_mapper->mcu_int().set_inputline(m_mcu, INPUT_LINE_IRQ1); I8751(config, m_mcu, 8000000); - m_mcu->set_addrmap(AS_IO, &segas18_state::mcu_io_map); + m_mcu->set_addrmap(AS_DATA, &segas18_state::mcu_data_map); m_mcu->set_vblank_int("screen", FUNC(segas18_state::irq0_line_hold)); } @@ -1526,7 +1526,7 @@ void segas18_state::system18_fd1094_i8751(machine_config &config) m_mapper->mcu_int().set_inputline(m_mcu, INPUT_LINE_IRQ1); I8751(config, m_mcu, 8000000); - m_mcu->set_addrmap(AS_IO, &segas18_state::mcu_io_map); + m_mcu->set_addrmap(AS_DATA, &segas18_state::mcu_data_map); m_mcu->set_vblank_int("screen", FUNC(segas18_state::irq0_line_hold)); } diff --git a/src/mame/sega/segas18.h b/src/mame/sega/segas18.h index fc5683d47d1..f40933786a8 100644 --- a/src/mame/sega/segas18.h +++ b/src/mame/sega/segas18.h @@ -129,7 +129,7 @@ private: void set_vdp_enable(int state); void decrypted_opcodes_map(address_map &map) ATTR_COLD; - void mcu_io_map(address_map &map) ATTR_COLD; + void mcu_data_map(address_map &map) ATTR_COLD; void pcm_map(address_map &map) ATTR_COLD; void sound_map(address_map &map) ATTR_COLD; void sound_portmap(address_map &map) ATTR_COLD; diff --git a/src/mame/sega/system1.cpp b/src/mame/sega/system1.cpp index f2ce41fd059..c73164237a5 100644 --- a/src/mame/sega/system1.cpp +++ b/src/mame/sega/system1.cpp @@ -589,7 +589,7 @@ void system1_state::mcu_control_w(u8 data) } -void system1_state::mcu_io_w(offs_t offset, u8 data) +void system1_state::mcu_data_w(offs_t offset, u8 data) { switch ((m_mcu_control >> 3) & 3) { @@ -609,7 +609,7 @@ void system1_state::mcu_io_w(offs_t offset, u8 data) } -u8 system1_state::mcu_io_r(offs_t offset) +u8 system1_state::mcu_data_r(offs_t offset) { switch ((m_mcu_control >> 3) & 3) { @@ -858,9 +858,9 @@ void system1_state::sound_map(address_map &map) * *************************************/ -void system1_state::mcu_io_map(address_map &map) +void system1_state::mcu_data_map(address_map &map) { - map(0x0000, 0xffff).rw(FUNC(system1_state::mcu_io_r), FUNC(system1_state::mcu_io_w)); + map(0x0000, 0xffff).rw(FUNC(system1_state::mcu_data_r), FUNC(system1_state::mcu_data_w)); } @@ -2285,7 +2285,7 @@ void system1_state::mcu(machine_config &config) m_maincpu->remove_vblank_int(); I8751(config, m_mcu, SOUND_CLOCK); - m_mcu->set_addrmap(AS_IO, &system1_state::mcu_io_map); + m_mcu->set_addrmap(AS_DATA, &system1_state::mcu_data_map); m_mcu->port_out_cb<1>().set(FUNC(system1_state::mcu_control_w)); config.set_maximum_quantum(attotime::from_hz(m_maincpu->clock() / 16)); diff --git a/src/mame/sega/system1.h b/src/mame/sega/system1.h index ac39d11317a..fb2d77c3335 100644 --- a/src/mame/sega/system1.h +++ b/src/mame/sega/system1.h @@ -161,8 +161,8 @@ protected: // misc handlers void adjust_cycles(u8 data); void mcu_control_w(u8 data); - u8 mcu_io_r(offs_t offset); - void mcu_io_w(offs_t offset, u8 data); + u8 mcu_data_r(offs_t offset); + void mcu_data_w(offs_t offset, u8 data); u8 nob_mcu_latch_r(); void nob_mcu_latch_w(u8 data); void nob_mcu_status_w(u8 data); @@ -230,7 +230,7 @@ protected: void encrypted_sys1ppi_maps(machine_config &config); void encrypted_sys1pio_maps(machine_config &config); void encrypted_sys2_mc8123_maps(machine_config &config); - void mcu_io_map(address_map &map) ATTR_COLD; + void mcu_data_map(address_map &map) ATTR_COLD; void nobo_map(address_map &map) ATTR_COLD; void sound_map(address_map &map) ATTR_COLD; void system1_map(address_map &map) ATTR_COLD; diff --git a/src/mame/sgi/kbd.cpp b/src/mame/sgi/kbd.cpp index d78c7c242e8..f6a54e0f900 100644 --- a/src/mame/sgi/kbd.cpp +++ b/src/mame/sgi/kbd.cpp @@ -131,7 +131,7 @@ void sgi_kbd_device::device_add_mconfig(machine_config &config) I8031(config, m_mcu, 11.0592_MHz_XTAL); m_mcu->set_addrmap(AS_PROGRAM, &sgi_kbd_device::map_mem); - m_mcu->set_addrmap(AS_IO, &sgi_kbd_device::map_pio); + m_mcu->set_addrmap(AS_DATA, &sgi_kbd_device::map_pio); m_mcu->port_out_cb<1>().append(FUNC(sgi_kbd_device::scan_matrix)).bit(0); m_mcu->port_out_cb<1>().append(beeper, FUNC(beep_device::set_state)).bit(3); m_mcu->port_out_cb<3>().append(FUNC(sgi_kbd_device::write_rxd)).bit(1); diff --git a/src/mame/siemens/pcd.h b/src/mame/siemens/pcd.h index 01f86b986f7..fa309508624 100644 --- a/src/mame/siemens/pcd.h +++ b/src/mame/siemens/pcd.h @@ -91,7 +91,7 @@ public: uint8_t unk_r(); void p1_w(uint8_t data); - void pcx_vid_io(address_map &map) ATTR_COLD; + void pcx_vid_data(address_map &map) ATTR_COLD; void pcx_vid_map(address_map &map) ATTR_COLD; void pcx_char_ram(address_map &map) ATTR_COLD; void pcx_attr_ram(address_map &map) ATTR_COLD; diff --git a/src/mame/siemens/pcd_v.cpp b/src/mame/siemens/pcd_v.cpp index 48198bbdd39..7fe1eaec72d 100644 --- a/src/mame/siemens/pcd_v.cpp +++ b/src/mame/siemens/pcd_v.cpp @@ -125,7 +125,7 @@ void pcx_video_device::pcx_vid_map(address_map &map) map(0x0000, 0x5fff).rom().region("graphics", 0); } -void pcx_video_device::pcx_vid_io(address_map &map) +void pcx_video_device::pcx_vid_data(address_map &map) { map(0x8000, 0x8007).rw(m_crtc, FUNC(scn2672_device::read), FUNC(scn2672_device::write)); map(0x8008, 0x8008).r(FUNC(pcx_video_device::unk_r)); @@ -149,7 +149,7 @@ void pcx_video_device::device_add_mconfig(machine_config &config) { i8031_device &gfx(I8031(config, "graphics", 24_MHz_XTAL / 2)); gfx.set_addrmap(AS_PROGRAM, &pcx_video_device::pcx_vid_map); - gfx.set_addrmap(AS_IO, &pcx_video_device::pcx_vid_io); + gfx.set_addrmap(AS_DATA, &pcx_video_device::pcx_vid_data); gfx.port_out_cb<1>().set(FUNC(pcx_video_device::p1_w)); gfx.port_in_cb<3>().set(FUNC(pcx_video_device::p3_r)); gfx.port_out_cb<3>().set(FUNC(pcx_video_device::p3_w)); diff --git a/src/mame/skeleton/c2color.cpp b/src/mame/skeleton/c2color.cpp index e4f334b7e31..7c8f8f9ecd0 100644 --- a/src/mame/skeleton/c2color.cpp +++ b/src/mame/skeleton/c2color.cpp @@ -131,7 +131,7 @@ void c2_color_state::c2_color(machine_config &config) { I8032(config, m_maincpu, 12'000'000); // exact type and clock unknown m_maincpu->set_addrmap(AS_PROGRAM, &c2_color_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &c2_color_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, &c2_color_state::ext_map); SCREEN(config, m_screen, SCREEN_TYPE_RASTER); m_screen->set_refresh_hz(60); diff --git a/src/mame/skeleton/cardinal.cpp b/src/mame/skeleton/cardinal.cpp index 9d3bf96e5a8..ec8322b365c 100644 --- a/src/mame/skeleton/cardinal.cpp +++ b/src/mame/skeleton/cardinal.cpp @@ -129,7 +129,7 @@ void cardinal_state::cardinal(machine_config &config) { i8031_device &maincpu(I8031(config, "maincpu", 7.3728_MHz_XTAL)); maincpu.set_addrmap(AS_PROGRAM, &cardinal_state::prog_map); - maincpu.set_addrmap(AS_IO, &cardinal_state::ext_map); + maincpu.set_addrmap(AS_DATA, &cardinal_state::ext_map); maincpu.port_in_cb<1>().set(FUNC(cardinal_state::p1_r)); maincpu.port_out_cb<1>().set(FUNC(cardinal_state::p1_w)); maincpu.port_in_cb<3>().set_ioport("P3"); diff --git a/src/mame/skeleton/controlid.cpp b/src/mame/skeleton/controlid.cpp index 7f9f4ff983b..baeae5a0756 100644 --- a/src/mame/skeleton/controlid.cpp +++ b/src/mame/skeleton/controlid.cpp @@ -59,7 +59,7 @@ private: void p3_w(uint8_t data); void controlidx628_palette(palette_device &palette) const; - void io_map(address_map &map) ATTR_COLD; + void data_map(address_map &map) ATTR_COLD; required_device<nt7534_device> m_lcdc; @@ -84,7 +84,7 @@ void controlidx628_state::machine_start() * Memory map information * *************************/ -void controlidx628_state::io_map(address_map &map) +void controlidx628_state::data_map(address_map &map) { map(0x8000, 0xffff).ram(); } @@ -151,7 +151,7 @@ void controlidx628_state::controlidx628(machine_config &config) { // basic machine hardware at89s52_device &maincpu(AT89S52(config, "maincpu", XTAL(11'059'200))); - maincpu.set_addrmap(AS_IO, &controlidx628_state::io_map); + maincpu.set_addrmap(AS_DATA, &controlidx628_state::data_map); maincpu.port_out_cb<0>().set(FUNC(controlidx628_state::p0_w)); maincpu.port_in_cb<1>().set(FUNC(controlidx628_state::p1_r)); maincpu.port_out_cb<1>().set(FUNC(controlidx628_state::p1_w)); diff --git a/src/mame/skeleton/daruma.cpp b/src/mame/skeleton/daruma.cpp index 0a24a7bb1d0..8001bb77c7b 100644 --- a/src/mame/skeleton/daruma.cpp +++ b/src/mame/skeleton/daruma.cpp @@ -41,7 +41,7 @@ private: uint8_t dev4_r(); required_device<cpu_device> m_maincpu; required_device<speaker_sound_device> m_speaker; - void mem_io(address_map &map) ATTR_COLD; + void mem_data(address_map &map) ATTR_COLD; void mem_prg(address_map &map) ATTR_COLD; }; @@ -93,7 +93,7 @@ void daruma_state::mem_prg(address_map &map) map(0x0000, 0xffff).rom(); } -void daruma_state::mem_io(address_map &map) +void daruma_state::mem_data(address_map &map) { map(0x0000, 0x0000).r(FUNC(daruma_state::dev0_r)); map(0x1000, 0x1000).w(FUNC(daruma_state::dev1_w)); @@ -126,7 +126,7 @@ void daruma_state::daruma(machine_config &config) /* basic machine hardware */ I80C32(config, m_maincpu, 11059200); //verified on pcb m_maincpu->set_addrmap(AS_PROGRAM, &daruma_state::mem_prg); - m_maincpu->set_addrmap(AS_IO, &daruma_state::mem_io); + m_maincpu->set_addrmap(AS_DATA, &daruma_state::mem_data); // TODO: ports /* sound hardware */ diff --git a/src/mame/skeleton/design.cpp b/src/mame/skeleton/design.cpp index c11b6719912..732df7305b0 100644 --- a/src/mame/skeleton/design.cpp +++ b/src/mame/skeleton/design.cpp @@ -286,7 +286,7 @@ void design6_state::design6(machine_config &config) { I8051(config, m_maincpu, 6_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &design6_state::mem_map); - m_maincpu->set_addrmap(AS_IO, &design6_state::io_map); + m_maincpu->set_addrmap(AS_DATA, &design6_state::io_map); m_maincpu->port_out_cb<1>().set(FUNC(design6_state::port1_w)); ADDRESS_MAP_BANK(config, m_iobank, 0); diff --git a/src/mame/skeleton/hohnadam.cpp b/src/mame/skeleton/hohnadam.cpp index 47001ad6769..5688bc9f743 100644 --- a/src/mame/skeleton/hohnadam.cpp +++ b/src/mame/skeleton/hohnadam.cpp @@ -91,7 +91,7 @@ void hohnadam_state::hohnadam(machine_config &config) I8032(config, m_panelcpu, 12000000); // unknown type and clock m_panelcpu->set_addrmap(AS_PROGRAM, &hohnadam_state::panel_map); - m_panelcpu->set_addrmap(AS_IO, &hohnadam_state::panel_ext_map); + m_panelcpu->set_addrmap(AS_DATA, &hohnadam_state::panel_ext_map); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // 2x HY62256ALJ-70 + CR2032 battery diff --git a/src/mame/skeleton/hprot1.cpp b/src/mame/skeleton/hprot1.cpp index 81740b40e81..4193cfbe75e 100644 --- a/src/mame/skeleton/hprot1.cpp +++ b/src/mame/skeleton/hprot1.cpp @@ -95,7 +95,7 @@ private: void henry_p3_w(uint8_t data); void hprot1_palette(palette_device &palette) const; HD44780_PIXEL_UPDATE(hprot1_pixel_update); - void i80c31_io(address_map &map) ATTR_COLD; + void i80c31_data(address_map &map) ATTR_COLD; void i80c31_prg(address_map &map) ATTR_COLD; required_device<i80c31_device> m_maincpu; @@ -137,7 +137,7 @@ void hprot1_state::init_hprot1() //P1.4 => WhatchDog Input (after timeout resets CPU) -void hprot1_state::i80c31_io(address_map &map) +void hprot1_state::i80c31_data(address_map &map) { map(0x0000, 0x7fff).ram(); /*TODO: verify the mirror mask value for the HD44780 device */ @@ -255,7 +255,7 @@ void hprot1_state::hprot1(machine_config &config) /* basic machine hardware */ I80C31(config, m_maincpu, XTAL(10'000'000)); m_maincpu->set_addrmap(AS_PROGRAM, &hprot1_state::i80c31_prg); - m_maincpu->set_addrmap(AS_IO, &hprot1_state::i80c31_io); + m_maincpu->set_addrmap(AS_DATA, &hprot1_state::i80c31_data); m_maincpu->port_in_cb<1>().set_ioport("inputs"); m_maincpu->port_out_cb<1>().set(FUNC(hprot1_state::henry_p1_w)); m_maincpu->port_out_cb<3>().set(FUNC(hprot1_state::henry_p3_w)); @@ -287,7 +287,7 @@ void hprot1_state::hprotr8a(machine_config &config) I80C31(config.replace(), m_maincpu, 11059200); // value of X1 crystal on the PCB m_maincpu->set_addrmap(AS_PROGRAM, &hprot1_state::i80c31_prg); - m_maincpu->set_addrmap(AS_IO, &hprot1_state::i80c31_io); + m_maincpu->set_addrmap(AS_DATA, &hprot1_state::i80c31_data); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -305,7 +305,7 @@ void hprot1_state::hprot2r6(machine_config &config) I80C31(config.replace(), m_maincpu, 11059200); // value of X1 crystal on the PCB m_maincpu->set_addrmap(AS_PROGRAM, &hprot1_state::i80c31_prg); - m_maincpu->set_addrmap(AS_IO, &hprot1_state::i80c31_io); + m_maincpu->set_addrmap(AS_DATA, &hprot1_state::i80c31_data); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/skeleton/icatel.cpp b/src/mame/skeleton/icatel.cpp index 2fd297a8504..bb28c496a2c 100644 --- a/src/mame/skeleton/icatel.cpp +++ b/src/mame/skeleton/icatel.cpp @@ -71,7 +71,6 @@ private: HD44780_PIXEL_UPDATE(icatel_pixel_update); void i80c31_data(address_map &map) ATTR_COLD; - void i80c31_io(address_map &map) ATTR_COLD; void i80c31_prg(address_map &map) ATTR_COLD; required_device<i80c31_device> m_maincpu; @@ -83,7 +82,7 @@ void icatel_state::i80c31_prg(address_map &map) map(0x0000, 0x7FFF).mirror(0x8000).rom(); } -void icatel_state::i80c31_io(address_map &map) +void icatel_state::i80c31_data(address_map &map) { map(0x0000, 0x3FFF).ram(); map(0x8000, 0x8001).mirror(0x3F3C).w(m_lcdc, FUNC(hd44780_device::write)); @@ -96,11 +95,6 @@ void icatel_state::i80c31_io(address_map &map) map(0xE000, 0xE0FF).mirror(0xF00).rw(FUNC(icatel_state::modem_r), FUNC(icatel_state::modem_w)); } -void icatel_state::i80c31_data(address_map &map) -{ -// map(0x0056,0x005A).r(FUNC(icatel_state::magic_string)); /* This is a hack! */ -} - void icatel_state::init_icatel() { } @@ -245,7 +239,6 @@ void icatel_state::icatel(machine_config &config) I80C31(config, m_maincpu, XTAL(2'097'152)); m_maincpu->set_addrmap(AS_PROGRAM, &icatel_state::i80c31_prg); m_maincpu->set_addrmap(AS_DATA, &icatel_state::i80c31_data); - m_maincpu->set_addrmap(AS_IO, &icatel_state::i80c31_io); m_maincpu->port_in_cb<1>().set(FUNC(icatel_state::i80c31_p1_r)); m_maincpu->port_out_cb<1>().set(FUNC(icatel_state::i80c31_p1_w)); m_maincpu->port_in_cb<3>().set(FUNC(icatel_state::i80c31_p3_r)); diff --git a/src/mame/skeleton/ikt5a.cpp b/src/mame/skeleton/ikt5a.cpp index f67523b86c1..08f3a8164f9 100644 --- a/src/mame/skeleton/ikt5a.cpp +++ b/src/mame/skeleton/ikt5a.cpp @@ -163,7 +163,7 @@ void ikt5a_state::ikt5a(machine_config &config) { I80C51(config, m_maincpu, 15_MHz_XTAL / 2); // PCB 80C51BH-2 (clock uncertain) m_maincpu->set_addrmap(AS_PROGRAM, &ikt5a_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &ikt5a_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, &ikt5a_state::ext_map); m_maincpu->port_in_cb<1>().set(FUNC(ikt5a_state::p1_r)); m_maincpu->port_out_cb<1>().set(FUNC(ikt5a_state::p1_w)); m_maincpu->port_in_cb<3>().set(FUNC(ikt5a_state::p3_r)); diff --git a/src/mame/skeleton/pes.cpp b/src/mame/skeleton/pes.cpp index d285d0d9f5e..66603062f35 100644 --- a/src/mame/skeleton/pes.cpp +++ b/src/mame/skeleton/pes.cpp @@ -181,7 +181,7 @@ void pes_state::pes(machine_config &config) /* basic machine hardware */ I80C31(config, m_maincpu, XTAL(10'245'000)); m_maincpu->set_addrmap(AS_PROGRAM, &pes_state::prg_map); - m_maincpu->set_addrmap(AS_IO, &pes_state::io_map); + m_maincpu->set_addrmap(AS_DATA, &pes_state::io_map); m_maincpu->port_in_cb<1>().set(m_speech, FUNC(tms5220_device::status_r)); m_maincpu->port_out_cb<1>().set(m_speech, FUNC(tms5220_device::data_w)); m_maincpu->port_in_cb<3>().set(FUNC(pes_state::port3_r)); diff --git a/src/mame/skeleton/qmquasar.cpp b/src/mame/skeleton/qmquasar.cpp index 58dbc6f3d1e..0e046c729b5 100644 --- a/src/mame/skeleton/qmquasar.cpp +++ b/src/mame/skeleton/qmquasar.cpp @@ -81,7 +81,7 @@ void qmquasar_state::quasar(machine_config &config) { I8032(config, m_maincpu, 12'000'000); // exact type and clock unknown m_maincpu->set_addrmap(AS_PROGRAM, &qmquasar_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &qmquasar_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, &qmquasar_state::ext_map); acia6850_device &acia(ACIA6850(config, "acia")); acia.irq_handler().set_inputline(m_maincpu, MCS51_INT1_LINE); diff --git a/src/mame/skeleton/qmsirius.cpp b/src/mame/skeleton/qmsirius.cpp index 2da658df09a..5b71c08644b 100644 --- a/src/mame/skeleton/qmsirius.cpp +++ b/src/mame/skeleton/qmsirius.cpp @@ -58,7 +58,7 @@ void qmsirius_state::qmsirius(machine_config &config) { P80C552(config, m_maincpu, 12_MHz_XTAL); // PCB80C552-5 16WP m_maincpu->set_addrmap(AS_PROGRAM, &qmsirius_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &qmsirius_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, &qmsirius_state::ext_map); screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_LCD)); screen.set_refresh_hz(60); diff --git a/src/mame/skeleton/ramstar.cpp b/src/mame/skeleton/ramstar.cpp index 87ee19f5aaf..33c406792ca 100644 --- a/src/mame/skeleton/ramstar.cpp +++ b/src/mame/skeleton/ramstar.cpp @@ -77,7 +77,7 @@ private: void main_program_map(address_map &map) ATTR_COLD; void main_data_map(address_map &map) ATTR_COLD; void cart_program_map(address_map &map) ATTR_COLD; - void cart_io_map(address_map &map) ATTR_COLD; + void cart_data_map(address_map &map) ATTR_COLD; }; @@ -114,7 +114,7 @@ void ramstar_state::cart_program_map(address_map &map) map(0x0000, 0x1fff).rom(); } -void ramstar_state::cart_io_map(address_map &map) +void ramstar_state::cart_data_map(address_map &map) { //map(0x00, 0x00).r() } @@ -170,7 +170,7 @@ void ramstar_state::ramstar(machine_config &config) I80C31(config, m_cartcpu, 6_MHz_XTAL); // (absence of) divider not verified m_cartcpu->set_addrmap(AS_PROGRAM, &ramstar_state::cart_program_map); - m_cartcpu->set_addrmap(AS_IO, &ramstar_state::cart_io_map); + m_cartcpu->set_addrmap(AS_DATA, &ramstar_state::cart_data_map); SOFTWARE_LIST(config, "cart_list").set_original("ramstar"); diff --git a/src/mame/skeleton/sk101bl.cpp b/src/mame/skeleton/sk101bl.cpp index d07cf9aac68..a779d09b0bd 100644 --- a/src/mame/skeleton/sk101bl.cpp +++ b/src/mame/skeleton/sk101bl.cpp @@ -158,7 +158,7 @@ void sk101bl_state::sk101bl(machine_config &config) { I80C31(config, m_maincpu, 11.0592_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &sk101bl_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &sk101bl_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, &sk101bl_state::ext_map); m_maincpu->port_in_cb<1>().set(FUNC(sk101bl_state::p1_r)); m_maincpu->port_out_cb<1>().set(FUNC(sk101bl_state::p1_w)); m_maincpu->port_out_cb<3>().set("alarm", FUNC(speaker_sound_device::level_w)).bit(3); diff --git a/src/mame/skeleton/tecnbras.cpp b/src/mame/skeleton/tecnbras.cpp index 56bfd6c4dae..a63fc4d2f10 100644 --- a/src/mame/skeleton/tecnbras.cpp +++ b/src/mame/skeleton/tecnbras.cpp @@ -49,7 +49,7 @@ private: //void tecnbras_io_w(uint8_t data); //uint8_t tecnbras_io_r(); - void i80c31_io(address_map &map) ATTR_COLD; + void i80c31_data(address_map &map) ATTR_COLD; void i80c31_prg(address_map &map) ATTR_COLD; required_device<i80c31_device> m_maincpu; @@ -66,7 +66,7 @@ void tecnbras_state::i80c31_prg(address_map &map) } #define DMD_OFFSET 24 //This is a guess. We should verify the real hardware behaviour -void tecnbras_state::i80c31_io(address_map &map) +void tecnbras_state::i80c31_data(address_map &map) { map(0x0100+DMD_OFFSET, 0x0145+DMD_OFFSET).w(FUNC(tecnbras_state::set_x_position_w)); map(0x06B8, 0x06BC).w(FUNC(tecnbras_state::print_column_w)); @@ -118,7 +118,7 @@ void tecnbras_state::tecnbras(machine_config &config) /* basic machine hardware */ I80C31(config, m_maincpu, 12_MHz_XTAL); // verified on pcb m_maincpu->set_addrmap(AS_PROGRAM, &tecnbras_state::i80c31_prg); - m_maincpu->set_addrmap(AS_IO, &tecnbras_state::i80c31_io); + m_maincpu->set_addrmap(AS_DATA, &tecnbras_state::i80c31_data); m_maincpu->port_out_cb<1>().set_nop(); // buzzer ? /* TODO: Add an I2C RTC (Philips PCF8583P) diff --git a/src/mame/skeleton/ti630.cpp b/src/mame/skeleton/ti630.cpp index b6a44b68b59..891d48903d7 100644 --- a/src/mame/skeleton/ti630.cpp +++ b/src/mame/skeleton/ti630.cpp @@ -70,7 +70,7 @@ private: void i80c31_p3_w(uint8_t data); uint8_t i80c31_p1_r(); void ti630_palette(palette_device &palette) const; - void i80c31_io(address_map &map) ATTR_COLD; + void i80c31_data(address_map &map) ATTR_COLD; void i80c31_prg(address_map &map) ATTR_COLD; required_device<i80c31_device> m_maincpu; @@ -86,7 +86,7 @@ void ti630_state::init_ti630() { } -void ti630_state::i80c31_io(address_map &map) +void ti630_state::i80c31_data(address_map &map) { map(0x0000, 0x0000) /*.mirror(?)*/ .w(m_lcdc, FUNC(hd44780_device::control_w)); map(0x1000, 0x1000) /*.mirror(?)*/ .w(m_lcdc, FUNC(hd44780_device::data_w)); @@ -145,7 +145,7 @@ void ti630_state::ti630(machine_config &config) /* basic machine hardware */ I80C31(config, m_maincpu, XTAL(10'000'000)); m_maincpu->set_addrmap(AS_PROGRAM, &ti630_state::i80c31_prg); - m_maincpu->set_addrmap(AS_IO, &ti630_state::i80c31_io); + m_maincpu->set_addrmap(AS_DATA, &ti630_state::i80c31_data); m_maincpu->port_in_cb<1>().set(FUNC(ti630_state::i80c31_p1_r)); m_maincpu->port_out_cb<1>().set(FUNC(ti630_state::i80c31_p1_w)); m_maincpu->port_out_cb<3>().set(FUNC(ti630_state::i80c31_p3_w)); diff --git a/src/mame/skeleton/vp415.cpp b/src/mame/skeleton/vp415.cpp index 4c2d0058a90..d1bba3043a8 100644 --- a/src/mame/skeleton/vp415.cpp +++ b/src/mame/skeleton/vp415.cpp @@ -223,13 +223,13 @@ private: void update_cpu_int(); void ctrl_program_map(address_map &map) ATTR_COLD; - void ctrl_io_map(address_map &map) ATTR_COLD; + void ctrl_data_map(address_map &map) ATTR_COLD; void ctrlmcu_program_map(address_map &map) ATTR_COLD; void sd_w(uint8_t data); uint8_t sd_r(); void drive_program_map(address_map &map) ATTR_COLD; - void drive_io_map(address_map &map) ATTR_COLD; + void drive_data_map(address_map &map) ATTR_COLD; required_device<z80_device> m_datacpu; required_device<i8041a_device> m_datamcu; @@ -558,7 +558,7 @@ void vp415_state::ctrl_program_map(address_map &map) map(0x0000, 0xffff).rom().region(CONTROL_ROM_TAG, 0); } -void vp415_state::ctrl_io_map(address_map &map) +void vp415_state::ctrl_data_map(address_map &map) { map(0x0000, 0x1fff).ram().share(CTRLRAM_TAG); map(0xe000, 0xffff).rw(FUNC(vp415_state::ctrl_regs_r), FUNC(vp415_state::ctrl_regs_w)).mask(0x1e00); @@ -674,7 +674,7 @@ void vp415_state::drive_program_map(address_map &map) map(0x0000, 0x3fff).rom().region(DRIVE_ROM_TAG, 0); } -void vp415_state::drive_io_map(address_map &map) +void vp415_state::drive_data_map(address_map &map) { map(0x0000, 0x0003).mirror(0xfbfc).rw(I8255_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0x0400, 0x04ff).mirror(0xf800).rw(I8155_TAG, FUNC(i8155_device::memory_r), FUNC(i8155_device::memory_w)); @@ -738,7 +738,7 @@ void vp415_state::vp415(machine_config &config) m_ctrlcpu->port_out_cb<3>().set(FUNC(vp415_state::ctrl_cpu_port3_w)); m_ctrlcpu->port_in_cb<3>().set(FUNC(vp415_state::ctrl_cpu_port3_r)); m_ctrlcpu->set_addrmap(AS_PROGRAM, &vp415_state::ctrl_program_map); - m_ctrlcpu->set_addrmap(AS_IO, &vp415_state::ctrl_io_map); + m_ctrlcpu->set_addrmap(AS_DATA, &vp415_state::ctrl_data_map); I8041A(config, m_ctrlmcu, XTAL(4'000'000)); // Verified on schematic m_ctrlmcu->p1_in_cb().set(FUNC(vp415_state::ctrl_mcu_port1_r)); @@ -752,7 +752,7 @@ void vp415_state::vp415(machine_config &config) m_drivecpu->port_out_cb<1>().set(FUNC(vp415_state::drive_cpu_port1_w)); m_drivecpu->port_out_cb<3>().set(FUNC(vp415_state::drive_cpu_port3_w)); m_drivecpu->set_addrmap(AS_PROGRAM, &vp415_state::drive_program_map); - m_drivecpu->set_addrmap(AS_IO, &vp415_state::drive_io_map); + m_drivecpu->set_addrmap(AS_DATA, &vp415_state::drive_data_map); i8155_device &i8155(I8155(config, I8155_TAG, 0)); i8155.out_pa_callback().set(CHARGEN_TAG, FUNC(mb88303_device::da_w)); diff --git a/src/mame/trs/trs80dt1.cpp b/src/mame/trs/trs80dt1.cpp index dc28c92b884..1291dba2bcd 100644 --- a/src/mame/trs/trs80dt1.cpp +++ b/src/mame/trs/trs80dt1.cpp @@ -358,7 +358,7 @@ void trs80dt1_state::trs80dt1(machine_config &config) /* basic machine hardware */ I8051(config, m_maincpu, 7.3728_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &trs80dt1_state::prg_map); - m_maincpu->set_addrmap(AS_IO, &trs80dt1_state::io_map); + m_maincpu->set_addrmap(AS_DATA, &trs80dt1_state::io_map); m_maincpu->port_out_cb<1>().set(FUNC(trs80dt1_state::port1_w)); m_maincpu->port_in_cb<1>().set(FUNC(trs80dt1_state::port1_r)); m_maincpu->port_out_cb<3>().set(FUNC(trs80dt1_state::port3_w)); diff --git a/src/mame/wang/wangpckb.cpp b/src/mame/wang/wangpckb.cpp index 52d6ffec348..f77c90587d8 100644 --- a/src/mame/wang/wangpckb.cpp +++ b/src/mame/wang/wangpckb.cpp @@ -96,10 +96,10 @@ const tiny_rom_entry *wangpc_keyboard_device::device_rom_region() const //------------------------------------------------- -// ADDRESS_MAP( wangpc_keyboard_io ) +// ADDRESS_MAP( wangpc_keyboard_data ) //------------------------------------------------- -void wangpc_keyboard_device::wangpc_keyboard_io(address_map &map) +void wangpc_keyboard_device::wangpc_keyboard_data(address_map &map) { //map(0x0000, 0xfeff).nopr(); map(0x47, 0x58).mirror(0xff00).nopr(); @@ -114,7 +114,7 @@ void wangpc_keyboard_device::wangpc_keyboard_io(address_map &map) void wangpc_keyboard_device::device_add_mconfig(machine_config &config) { I8051(config, m_maincpu, XTAL(4'000'000)); - m_maincpu->set_addrmap(AS_IO, &wangpc_keyboard_device::wangpc_keyboard_io); + m_maincpu->set_addrmap(AS_DATA, &wangpc_keyboard_device::wangpc_keyboard_data); m_maincpu->port_in_cb<1>().set(FUNC(wangpc_keyboard_device::kb_p1_r)); m_maincpu->port_out_cb<1>().set(FUNC(wangpc_keyboard_device::kb_p1_w)); m_maincpu->port_out_cb<2>().set(FUNC(wangpc_keyboard_device::kb_p2_w)); diff --git a/src/mame/wang/wangpckb.h b/src/mame/wang/wangpckb.h index 416bbcae779..59166370014 100644 --- a/src/mame/wang/wangpckb.h +++ b/src/mame/wang/wangpckb.h @@ -32,7 +32,7 @@ public: void write_rxd(int state); - void wangpc_keyboard_io(address_map &map) ATTR_COLD; + void wangpc_keyboard_data(address_map &map) ATTR_COLD; protected: // device-level overrides diff --git a/src/mame/wyse/wy150.cpp b/src/mame/wyse/wy150.cpp index 6790ad73b16..811814b38e5 100644 --- a/src/mame/wyse/wy150.cpp +++ b/src/mame/wyse/wy150.cpp @@ -76,7 +76,7 @@ void wy150_state::wy150(machine_config &config) { i80c32_device &maincpu(I80C32(config, "maincpu", 11_MHz_XTAL)); // Philips P80C32SBPN (e.g.) maincpu.set_addrmap(AS_PROGRAM, &wy150_state::prog_map); - maincpu.set_addrmap(AS_IO, &wy150_state::ext_map); + maincpu.set_addrmap(AS_DATA, &wy150_state::ext_map); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // 8464 or 5564 or similar (e.g. Winbond W2465-70LL) + battery diff --git a/src/mame/wyse/wy30p.cpp b/src/mame/wyse/wy30p.cpp index 50c2a4e2617..b02a6e9d3ae 100644 --- a/src/mame/wyse/wy30p.cpp +++ b/src/mame/wyse/wy30p.cpp @@ -114,7 +114,7 @@ void wy30p_state::wy30p(machine_config &config) { i8031_device &maincpu(I8031(config, "maincpu", 7.3728_MHz_XTAL)); maincpu.set_addrmap(AS_PROGRAM, &wy30p_state::prog_map); - maincpu.set_addrmap(AS_IO, &wy30p_state::ext_map); + maincpu.set_addrmap(AS_DATA, &wy30p_state::ext_map); maincpu.port_in_cb<1>().set(FUNC(wy30p_state::p1_r)); maincpu.port_in_cb<3>().set(FUNC(wy30p_state::p3_r)); maincpu.port_out_cb<3>().set(m_eeprom, FUNC(eeprom_serial_er5911_device::cs_write)).bit(3); diff --git a/src/mame/wyse/wy50.cpp b/src/mame/wyse/wy50.cpp index fb73a04bd7d..b36458dbfb9 100644 --- a/src/mame/wyse/wy50.cpp +++ b/src/mame/wyse/wy50.cpp @@ -305,7 +305,7 @@ void wy50_state::wy50(machine_config &config) { I8031(config, m_maincpu, 11_MHz_XTAL); // SAB8031P or SCN8031A m_maincpu->set_addrmap(AS_PROGRAM, &wy50_state::prg_map); - m_maincpu->set_addrmap(AS_IO, &wy50_state::io_map); + m_maincpu->set_addrmap(AS_DATA, &wy50_state::io_map); m_maincpu->port_in_cb<1>().set(FUNC(wy50_state::p1_r)); m_maincpu->port_out_cb<1>().set(FUNC(wy50_state::p1_w)); m_maincpu->port_in_cb<3>().set(FUNC(wy50_state::p3_r)); diff --git a/src/mame/wyse/wy55.cpp b/src/mame/wyse/wy55.cpp index 8a7141b73c5..6713f2ac769 100644 --- a/src/mame/wyse/wy55.cpp +++ b/src/mame/wyse/wy55.cpp @@ -107,7 +107,7 @@ void wy55_state::wy55(machine_config &config) { I80C32(config, m_maincpu, 14.7456_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &wy55_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &wy55_state::ext_map); + m_maincpu->set_addrmap(AS_DATA, &wy55_state::ext_map); m_maincpu->port_out_cb<1>().set_membank("progbank").bit(2); NVRAM(config, "nvram0", nvram_device::DEFAULT_ALL_0); // 8K SRAM + battery @@ -125,7 +125,7 @@ void wy55_state::wy185es(machine_config &config) { wy55(config); m_maincpu->set_clock(11_MHz_XTAL); - m_maincpu->set_addrmap(AS_IO, &wy55_state::wy185es_ext_map); + m_maincpu->set_addrmap(AS_DATA, &wy55_state::wy185es_ext_map); m_maincpu->port_out_cb<1>().set_nop(); SCN2661B(config, m_epci, 49.4235_MHz_XTAL / 10); // SCN2661BC1N28 @@ -136,7 +136,7 @@ void wy55_state::wy65(machine_config &config) { DS80C320(config, m_maincpu, 58.9824_MHz_XTAL / 4); // divider uncertain m_maincpu->set_addrmap(AS_PROGRAM, &wy55_state::prog_map); - m_maincpu->set_addrmap(AS_IO, &wy55_state::wy65_ext_map); + m_maincpu->set_addrmap(AS_DATA, &wy55_state::wy65_ext_map); // TODO: NVRAM? (4x W24257S-70LL on board) diff --git a/src/mame/wyse/wy60.cpp b/src/mame/wyse/wy60.cpp index 80a5770455d..a132e8efdad 100644 --- a/src/mame/wyse/wy60.cpp +++ b/src/mame/wyse/wy60.cpp @@ -262,7 +262,7 @@ void wy60_state::wy60(machine_config &config) i8031_device &maincpu(I8031(config, "maincpu", 11_MHz_XTAL)); // AMD P8051AH-40196 // FIXME: correct device type once 8051 core implements EA pin control maincpu.set_addrmap(AS_PROGRAM, &wy60_state::prog_map); - maincpu.set_addrmap(AS_IO, &wy60_state::ext_map); + maincpu.set_addrmap(AS_DATA, &wy60_state::ext_map); maincpu.port_out_cb<1>().set(FUNC(wy60_state::p1_w)); maincpu.port_in_cb<1>().set(FUNC(wy60_state::p1_r)); maincpu.port_out_cb<3>().set(m_aux, FUNC(rs232_port_device::write_txd)).bit(1); diff --git a/src/mame/wyse/wy85.cpp b/src/mame/wyse/wy85.cpp index a1f74478360..f6b26ae0927 100644 --- a/src/mame/wyse/wy85.cpp +++ b/src/mame/wyse/wy85.cpp @@ -341,7 +341,7 @@ void wy85_state::wy85(machine_config &config) { I8032(config, m_maincpu, 11_MHz_XTAL); // SCN8032H m_maincpu->set_addrmap(AS_PROGRAM, &wy85_state::prg_map); - m_maincpu->set_addrmap(AS_IO, &wy85_state::io_map); + m_maincpu->set_addrmap(AS_DATA, &wy85_state::io_map); m_maincpu->port_in_cb<1>().set(FUNC(wy85_state::p1_r)); m_maincpu->port_out_cb<1>().set(FUNC(wy85_state::p1_w)); m_maincpu->port_in_cb<3>().set(FUNC(wy85_state::p3_r)); |
