summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2021-06-20 17:32:35 -0400
committer AJR <ajrhacker@users.noreply.github.com>2021-06-20 17:34:42 -0400
commit87894e9c99a63d33100e982674d491234a432ca4 (patch)
tree361e10b3d8c846a0cb661ab55d4aea5232a30cf5 /src/mame
parentcf01398c86af96c7320726de6361e9bbca4db68c (diff)
adam, bw2, cbm2, newbrain, pet, plus4, pofo, vic10, vic20: Eliminate bus tag macros and legacy lookups; use finder arrays in some places
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/drivers/adam.cpp34
-rw-r--r--src/mame/drivers/cbm2.cpp2
-rw-r--r--src/mame/drivers/pet.cpp2
-rw-r--r--src/mame/drivers/plus4.cpp2
-rw-r--r--src/mame/drivers/pofo.cpp2
-rw-r--r--src/mame/drivers/vic10.cpp2
-rw-r--r--src/mame/drivers/vic20.cpp2
-rw-r--r--src/mame/includes/adam.h8
-rw-r--r--src/mame/includes/bw2.h2
-rw-r--r--src/mame/includes/newbrain.h2
-rw-r--r--src/mame/includes/vip.h2
11 files changed, 28 insertions, 32 deletions
diff --git a/src/mame/drivers/adam.cpp b/src/mame/drivers/adam.cpp
index c4052ae3162..d3abeeeb31e 100644
--- a/src/mame/drivers/adam.cpp
+++ b/src/mame/drivers/adam.cpp
@@ -458,9 +458,9 @@ uint8_t adam_state::mreq_r(offs_t offset)
}
data = m_cart->bd_r(offset & 0x7fff, data, cs1, cs2, cs3, cs4);
- data = m_slot1->bd_r(offset & 0xff, data, 1, biorq, 1, 1, 1);
- data = m_slot2->bd_r(offset, data, bmreq, biorq, aux_rom_cs, 1, cas2);
- data = m_slot3->bd_r(offset, data, 1, 1, 1, cas1, cas2);
+ data = m_slot[0]->bd_r(offset & 0xff, data, 1, biorq, 1, 1, 1);
+ data = m_slot[1]->bd_r(offset, data, bmreq, biorq, aux_rom_cs, 1, cas2);
+ data = m_slot[2]->bd_r(offset, data, 1, 1, 1, cas1, cas2);
return data;
}
@@ -516,9 +516,9 @@ void adam_state::mreq_w(offs_t offset, uint8_t data)
m_ram->pointer()[offset] = data;
}
- m_slot1->bd_w(offset & 0xff, data, 1, biorq, 1, 1, 1);
- m_slot2->bd_w(offset, data, bmreq, biorq, aux_rom_cs, 1, cas2);
- m_slot3->bd_w(offset, data, 1, 1, 1, cas1, cas2);
+ m_slot[0]->bd_w(offset & 0xff, data, 1, biorq, 1, 1, 1);
+ m_slot[1]->bd_w(offset, data, bmreq, biorq, aux_rom_cs, 1, cas2);
+ m_slot[2]->bd_w(offset, data, 1, 1, 1, cas1, cas2);
}
@@ -557,9 +557,9 @@ uint8_t adam_state::iorq_r(offs_t offset)
break;
}
- data = m_slot1->bd_r(offset & 0xff, data, 1, biorq, 1, 1, 1);
- data = m_slot2->bd_r(offset, data, bmreq, biorq, aux_rom_cs, 1, cas2);
- data = m_slot3->bd_r(offset, data, 1, 1, 1, cas1, cas2);
+ data = m_slot[0]->bd_r(offset & 0xff, data, 1, biorq, 1, 1, 1);
+ data = m_slot[1]->bd_r(offset, data, bmreq, biorq, aux_rom_cs, 1, cas2);
+ data = m_slot[2]->bd_r(offset, data, 1, 1, 1, cas1, cas2);
return data;
}
@@ -609,9 +609,9 @@ void adam_state::iorq_w(offs_t offset, uint8_t data)
break;
}
- m_slot1->bd_w(offset & 0xff, data, 1, biorq, 1, 1, 1);
- m_slot2->bd_w(offset, data, bmreq, biorq, aux_rom_cs, 1, cas2);
- m_slot3->bd_w(offset, data, 1, 1, 1, cas1, cas2);
+ m_slot[0]->bd_w(offset & 0xff, data, 1, biorq, 1, 1, 1);
+ m_slot[1]->bd_w(offset, data, bmreq, biorq, aux_rom_cs, 1, cas2);
+ m_slot[2]->bd_w(offset, data, 1, 1, 1, cas1, cas2);
}
@@ -1076,11 +1076,11 @@ void adam_state::adam(machine_config &config)
ADAMNET_SLOT(config, "net15", m_adamnet, adamnet_devices, nullptr);
COLECOVISION_CARTRIDGE_SLOT(config, m_cart, colecovision_cartridges, nullptr);
- ADAM_EXPANSION_SLOT(config, m_slot1, XTAL(7'159'090)/2, adam_slot1_devices, "adamlink");
- m_slot1->irq().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
- ADAM_EXPANSION_SLOT(config, m_slot2, XTAL(7'159'090)/2, adam_slot2_devices, nullptr);
- m_slot2->irq().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
- ADAM_EXPANSION_SLOT(config, m_slot3, XTAL(7'159'090)/2, adam_slot3_devices, "ram");
+ ADAM_EXPANSION_SLOT(config, m_slot[0], XTAL(7'159'090)/2, adam_slot1_devices, "adamlink"); // left
+ m_slot[0]->irq().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+ ADAM_EXPANSION_SLOT(config, m_slot[1], XTAL(7'159'090)/2, adam_slot2_devices, nullptr); // center
+ m_slot[1]->irq().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+ ADAM_EXPANSION_SLOT(config, m_slot[2], XTAL(7'159'090)/2, adam_slot3_devices, "ram"); // right
COLECOVISION_CONTROL_PORT(config, m_joy1, colecovision_control_port_devices, "hand");
m_joy1->irq().set(FUNC(adam_state::joy1_irq_w));
diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp
index f9f45d9e660..6a4e1eb5cd6 100644
--- a/src/mame/drivers/cbm2.cpp
+++ b/src/mame/drivers/cbm2.cpp
@@ -81,7 +81,7 @@ public:
m_ieee2(*this, DS75161A_TAG),
m_joy1(*this, CONTROL1_TAG),
m_joy2(*this, CONTROL2_TAG),
- m_exp(*this, CBM2_EXPANSION_SLOT_TAG),
+ m_exp(*this, "exp"),
m_user(*this, USER_PORT_TAG),
m_ram(*this, RAM_TAG),
m_cassette(*this, PET_DATASSETTE_PORT_TAG),
diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp
index c6520fffa3e..f67490ba38a 100644
--- a/src/mame/drivers/pet.cpp
+++ b/src/mame/drivers/pet.cpp
@@ -202,7 +202,7 @@ public:
m_palette(*this, "palette"),
m_cassette(*this, PET_DATASSETTE_PORT_TAG),
m_cassette2(*this, PET_DATASSETTE_PORT2_TAG),
- m_exp(*this, PET_EXPANSION_SLOT_TAG),
+ m_exp(*this, "exp"),
m_user(*this, PET_USER_PORT_TAG),
m_speaker(*this, "speaker"),
m_cart_9000(*this, "cart_9000"),
diff --git a/src/mame/drivers/plus4.cpp b/src/mame/drivers/plus4.cpp
index 75ee574eb33..c7d44f5fba5 100644
--- a/src/mame/drivers/plus4.cpp
+++ b/src/mame/drivers/plus4.cpp
@@ -61,7 +61,7 @@ public:
m_iec(*this, CBM_IEC_TAG),
m_joy1(*this, CONTROL1_TAG),
m_joy2(*this, CONTROL2_TAG),
- m_exp(*this, PLUS4_EXPANSION_SLOT_TAG),
+ m_exp(*this, "exp"),
m_user(*this, PET_USER_PORT_TAG),
m_ram(*this, RAM_TAG),
m_cassette(*this, PET_DATASSETTE_PORT_TAG),
diff --git a/src/mame/drivers/pofo.cpp b/src/mame/drivers/pofo.cpp
index 66e20a90ec3..70d3cf11108 100644
--- a/src/mame/drivers/pofo.cpp
+++ b/src/mame/drivers/pofo.cpp
@@ -81,7 +81,7 @@ public:
m_keyboard(*this, "keyboard"),
m_dtmf(*this, PCD3311T_TAG),
m_ccm(*this, PORTFOLIO_MEMORY_CARD_SLOT_A_TAG),
- m_exp(*this, PORTFOLIO_EXPANSION_SLOT_TAG),
+ m_exp(*this, "exp"),
m_timer_tick(*this, TIMER_TICK_TAG),
m_nvram(*this, "nvram"),
m_ram(*this, "ram"),
diff --git a/src/mame/drivers/vic10.cpp b/src/mame/drivers/vic10.cpp
index b41700fbbcb..3d43698692c 100644
--- a/src/mame/drivers/vic10.cpp
+++ b/src/mame/drivers/vic10.cpp
@@ -42,7 +42,7 @@ public:
m_cia(*this, MOS6526_TAG),
m_joy1(*this, CONTROL1_TAG),
m_joy2(*this, CONTROL2_TAG),
- m_exp(*this, VIC10_EXPANSION_SLOT_TAG),
+ m_exp(*this, "exp"),
m_ram(*this, RAM_TAG),
m_cassette(*this, PET_DATASSETTE_PORT_TAG),
m_color_ram(*this, "color_ram", 0x400, ENDIANNESS_LITTLE),
diff --git a/src/mame/drivers/vic20.cpp b/src/mame/drivers/vic20.cpp
index b3b030a876d..4c6058c2c97 100644
--- a/src/mame/drivers/vic20.cpp
+++ b/src/mame/drivers/vic20.cpp
@@ -44,7 +44,7 @@ public:
m_vic(*this, VIC_TAG),
m_iec(*this, CBM_IEC_TAG),
m_joy(*this, CONTROL1_TAG),
- m_exp(*this, VIC20_EXPANSION_SLOT_TAG),
+ m_exp(*this, "exp"),
m_user(*this, PET_USER_PORT_TAG),
m_cassette(*this, PET_DATASSETTE_PORT_TAG),
m_ram(*this, RAM_TAG),
diff --git a/src/mame/includes/adam.h b/src/mame/includes/adam.h
index e4f74309486..723b3edabc0 100644
--- a/src/mame/includes/adam.h
+++ b/src/mame/includes/adam.h
@@ -35,9 +35,7 @@ public:
m_psg(*this, SN76489A_TAG),
m_ram(*this, RAM_TAG),
m_adamnet(*this, "adamnet"),
- m_slot1(*this, ADAM_LEFT_EXPANSION_SLOT_TAG),
- m_slot2(*this, ADAM_CENTER_EXPANSION_SLOT_TAG),
- m_slot3(*this, ADAM_RIGHT_EXPANSION_SLOT_TAG),
+ m_slot(*this, "slot%u", 1U),
m_cart(*this, COLECOVISION_CARTRIDGE_SLOT_TAG),
m_joy1(*this, CONTROL1_TAG),
m_joy2(*this, CONTROL2_TAG),
@@ -57,9 +55,7 @@ public:
required_device<sn76489a_device> m_psg;
required_device<ram_device> m_ram;
required_device<adamnet_device> m_adamnet;
- required_device<adam_expansion_slot_device> m_slot1;
- required_device<adam_expansion_slot_device> m_slot2;
- required_device<adam_expansion_slot_device> m_slot3;
+ required_device_array<adam_expansion_slot_device, 3> m_slot;
required_device<colecovision_cartridge_slot_device> m_cart;
required_device<colecovision_control_port_device> m_joy1;
required_device<colecovision_control_port_device> m_joy2;
diff --git a/src/mame/includes/bw2.h b/src/mame/includes/bw2.h
index d4d64e68388..01f31234785 100644
--- a/src/mame/includes/bw2.h
+++ b/src/mame/includes/bw2.h
@@ -37,7 +37,7 @@ public:
m_lcdc(*this, MSM6255_TAG),
m_pit(*this, "ic6"),
m_centronics(*this, CENTRONICS_TAG),
- m_exp(*this, BW2_EXPANSION_SLOT_TAG),
+ m_exp(*this, "exp"),
m_ram(*this, RAM_TAG),
m_floppy0(*this, WD2797_TAG":0"),
m_floppy1(*this, WD2797_TAG":1"),
diff --git a/src/mame/includes/newbrain.h b/src/mame/includes/newbrain.h
index 80eb1dec811..381b8e53682 100644
--- a/src/mame/includes/newbrain.h
+++ b/src/mame/includes/newbrain.h
@@ -30,7 +30,7 @@ public:
m_maincpu(*this, Z80_TAG),
m_cop(*this, COP420_TAG),
m_palette(*this, "palette"),
- m_exp(*this, NEWBRAIN_EXPANSION_SLOT_TAG),
+ m_exp(*this, "exp"),
m_cassette1(*this, "cassette1"),
m_cassette2(*this, "cassette2"),
m_rs232_v24(*this, RS232_V24_TAG),
diff --git a/src/mame/includes/vip.h b/src/mame/includes/vip.h
index 785df2b45ba..7f1013779e2 100644
--- a/src/mame/includes/vip.h
+++ b/src/mame/includes/vip.h
@@ -30,7 +30,7 @@ public:
, m_cassette(*this, "cassette")
, m_beeper(*this, DISCRETE_TAG)
, m_byteio(*this, VIP_BYTEIO_PORT_TAG)
- , m_exp(*this, VIP_EXPANSION_SLOT_TAG)
+ , m_exp(*this, "exp")
, m_ram(*this, RAM_TAG)
, m_rom(*this, CDP1802_TAG)
, m_chip8(*this, "chip8")