summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame
diff options
context:
space:
mode:
authorGravatarGravatar Vas Crabb <vas@vastheman.com>2019-11-15 05:11:51 +1100
committerGravatarGravatar Vas Crabb <vas@vastheman.com>2019-11-15 05:11:51 +1100
commitce3c38914d4b710e2e40c212af0d61aa4b328de0 (patch)
tree9f68c3964399f72379e3f7c349c57e56756879ca /src/mame
parentf7e679876fef04ee8d1f1ca5af6466423a265ae7 (diff)
c64.cpp, c128.cpp: fixed CBM IEC slot address not being set when replacing devices in machine config
bus/c64/rex_ep256.cpp: fixed array of EPROM slots not being populated (subdevices don't exist at construction time) cleanup: (nw) * having a macro for a device's expected tag in a header is bad - devices should not make assumptions about their tag or their location in the system hierarchy * device types exist in the global namespace - you must not use overly generic names for them as this is likely to cause collisions * device short names and titles each have their own namespace, but they're also global, and it should be possible to work out vaguely what a device is from its names * POSIX reserves all names ending in "_t" at global scope - we want fewer of these causing potential future issues, not more * if your device is in the global namespace, you should name it in a way that's not asking for name collisions to happen * we have a simple convention for device class names - it doesn't hurt to follow it: - concrete device_t implementations end with "_device" - device_interface implementations end with "_interface" (and often start with "device_") - abstract classes that derive from device_t end with "_device_base" * if you want to give your slot card device classes short, generic names, put them in a namespace for the "bus" * if you really want to use names ending with "_t", put them in a namespace or nest them inside a class
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/drivers/abc80.cpp2
-rw-r--r--src/mame/drivers/abc80x.cpp2
-rw-r--r--src/mame/drivers/atarist.cpp2
-rw-r--r--src/mame/drivers/c128.cpp2
-rw-r--r--src/mame/drivers/c64.cpp6
-rw-r--r--src/mame/drivers/mbee.cpp2
-rw-r--r--src/mame/drivers/next.cpp2
-rw-r--r--src/mame/includes/abc1600.h2
-rw-r--r--src/mame/includes/abc80.h2
-rw-r--r--src/mame/includes/lisa.h2
-rw-r--r--src/mame/includes/mac.h2
-rw-r--r--src/mame/includes/macpci.h2
-rw-r--r--src/mame/includes/next.h2
-rw-r--r--src/mame/includes/x68k.h2
14 files changed, 17 insertions, 15 deletions
diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp
index 7dea7548233..54d3d332575 100644
--- a/src/mame/drivers/abc80.cpp
+++ b/src/mame/drivers/abc80.cpp
@@ -531,7 +531,7 @@ void abc80_state::abc80(machine_config &config)
ABC80_KEYBOARD(config, m_kb, 0);
m_kb->keydown_wr_callback().set(FUNC(abc80_state::keydown_w));
- ABCBUS_SLOT(config, ABCBUS_TAG, XTAL(11'980'800)/2/2, abc80_cards, "abcexp");
+ ABCBUS_SLOT(config, m_bus, XTAL(11'980'800)/2/2, abc80_cards, "abcexp");
RS232_PORT(config, RS232_TAG, default_rs232_devices, nullptr);
generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, KEYBOARD_TAG, 0));
diff --git a/src/mame/drivers/abc80x.cpp b/src/mame/drivers/abc80x.cpp
index 8395ec6ced7..afab2b88c94 100644
--- a/src/mame/drivers/abc80x.cpp
+++ b/src/mame/drivers/abc80x.cpp
@@ -153,6 +153,8 @@ Notes:
#define LOG 0
+#define ABCBUS_TAG "bus"
+
//**************************************************************************
// SOUND
diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp
index 3d03aacb791..13c67039f01 100644
--- a/src/mame/drivers/atarist.cpp
+++ b/src/mame/drivers/atarist.cpp
@@ -1335,7 +1335,7 @@ void ste_state::ste_map(address_map &map)
void megaste_state::megaste_map(address_map &map)
{
st_map(map);
- map(0xff8c80, 0xff8c87).rw(Z8530_TAG, FUNC(scc8530_t::reg_r), FUNC(scc8530_t::reg_w)).umask16(0x00ff);
+ map(0xff8c80, 0xff8c87).rw(Z8530_TAG, FUNC(scc8530_legacy_device::reg_r), FUNC(scc8530_legacy_device::reg_w)).umask16(0x00ff);
map(0xfffc20, 0xfffc3f).rw(RP5C15_TAG, FUNC(rp5c15_device::read), FUNC(rp5c15_device::write)).umask16(0x00ff);
}
diff --git a/src/mame/drivers/c128.cpp b/src/mame/drivers/c128.cpp
index 87e9517cbad..aa92864ba67 100644
--- a/src/mame/drivers/c128.cpp
+++ b/src/mame/drivers/c128.cpp
@@ -1803,7 +1803,7 @@ void c128_state::c128d81(machine_config &config)
m_iec->srq_callback().set(FUNC(c128_state::iec_srq_w));
m_iec->data_callback().set(FUNC(c128_state::iec_data_w));
- CBM_IEC_SLOT(config.replace(), "iec8", c128d81_iec_devices, "c1563");
+ CBM_IEC_SLOT(config.replace(), "iec8", 8, c128d81_iec_devices, "c1563");
}
diff --git a/src/mame/drivers/c64.cpp b/src/mame/drivers/c64.cpp
index 95ebaafbbbc..60a969ea667 100644
--- a/src/mame/drivers/c64.cpp
+++ b/src/mame/drivers/c64.cpp
@@ -1572,7 +1572,7 @@ void sx64_state::ntsc_sx(machine_config &config)
m_maincpu->set_pulls(0x07, 0xc0);
// devices
- CBM_IEC_SLOT(config.replace(), "iec8", sx1541_iec_devices, "sx1541");
+ CBM_IEC_SLOT(config.replace(), "iec8", 8, sx1541_iec_devices, "sx1541");
}
@@ -1585,7 +1585,7 @@ void sx64_state::ntsc_dx(machine_config &config)
ntsc_sx(config);
// devices
- CBM_IEC_SLOT(config.replace(), "iec9", sx1541_iec_devices, "sx1541");
+ CBM_IEC_SLOT(config.replace(), "iec9", 9, sx1541_iec_devices, "sx1541");
}
@@ -1732,7 +1732,7 @@ void sx64_state::pal_sx(machine_config &config)
m_maincpu->set_pulls(0x07, 0xc0);
// devices
- CBM_IEC_SLOT(config.replace(), "iec8", sx1541_iec_devices, "sx1541");
+ CBM_IEC_SLOT(config.replace(), "iec8", 8, sx1541_iec_devices, "sx1541");
}
diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp
index fcab9586626..bac44bbf6ed 100644
--- a/src/mame/drivers/mbee.cpp
+++ b/src/mame/drivers/mbee.cpp
@@ -280,7 +280,7 @@ void mbee_state::mbeett_io(address_map &map)
map(0x0109, 0x0109).mirror(0xfe00).r(FUNC(mbee_state::speed_high_r));
map(0x000a, 0x000a).mirror(0xfe00).rw(FUNC(mbee_state::telcom_low_r), FUNC(mbee_state::port0a_w));
map(0x010a, 0x010a).mirror(0xfe00).rw(FUNC(mbee_state::telcom_high_r), FUNC(mbee_state::port0a_w));
- map(0x0068, 0x006f).mirror(0xff00).rw("scc", FUNC(scc8530_t::reg_r), FUNC(scc8530_t::reg_w));
+ map(0x0068, 0x006f).mirror(0xff00).rw("scc", FUNC(scc8530_legacy_device::reg_r), FUNC(scc8530_legacy_device::reg_w));
}
void mbee_state::mbee56_io(address_map &map)
diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp
index 07c9636e756..a999b0d64d3 100644
--- a/src/mame/drivers/next.cpp
+++ b/src/mame/drivers/next.cpp
@@ -915,7 +915,7 @@ void next_state::next_mem(address_map &map)
map(0x02014020, 0x02014023).mirror(0x300000).rw(FUNC(next_state::scsictrl_r), FUNC(next_state::scsictrl_w));
map(0x02016000, 0x02016003).mirror(0x300000).rw(FUNC(next_state::timer_data_r), FUNC(next_state::timer_data_w));
map(0x02016004, 0x02016007).mirror(0x300000).rw(FUNC(next_state::timer_ctrl_r), FUNC(next_state::timer_ctrl_w));
- map(0x02018000, 0x02018003).mirror(0x300000).rw(scc, FUNC(scc8530_t::reg_r), FUNC(scc8530_t::reg_w));
+ map(0x02018000, 0x02018003).mirror(0x300000).rw(scc, FUNC(scc8530_legacy_device::reg_r), FUNC(scc8530_legacy_device::reg_w));
// map(0x02018004, 0x02018007).mirror(0x300000); SCC CLK
// map(0x02018190, 0x02018197).mirror(0x300000); warp 9c DRAM timing
// map(0x02018198, 0x0201819f).mirror(0x300000); warp 9c VRAM timing
diff --git a/src/mame/includes/abc1600.h b/src/mame/includes/abc1600.h
index 69e1b5dce69..72a62c0db50 100644
--- a/src/mame/includes/abc1600.h
+++ b/src/mame/includes/abc1600.h
@@ -85,7 +85,7 @@ public:
required_device<z80dma_device> m_dma1;
required_device<z80dma_device> m_dma2;
required_device<z80dart_device> m_dart;
- required_device<scc8530_t> m_scc;
+ required_device<scc8530_legacy_device> m_scc;
required_device<z8536_device> m_cio;
required_device<fd1797_device> m_fdc;
required_device<e0516_device> m_rtc;
diff --git a/src/mame/includes/abc80.h b/src/mame/includes/abc80.h
index fd21f1e076d..b89da1fb058 100644
--- a/src/mame/includes/abc80.h
+++ b/src/mame/includes/abc80.h
@@ -71,7 +71,7 @@ public:
m_pio(*this, Z80PIO_TAG),
m_csg(*this, SN76477_TAG),
m_cassette(*this, "cassette"),
- m_bus(*this, ABCBUS_TAG),
+ m_bus(*this, "bus"),
m_kb(*this, ABC80_KEYBOARD_TAG),
m_ram(*this, RAM_TAG),
m_rs232(*this, RS232_TAG),
diff --git a/src/mame/includes/lisa.h b/src/mame/includes/lisa.h
index 28bc79b2507..c48acf1ee6e 100644
--- a/src/mame/includes/lisa.h
+++ b/src/mame/includes/lisa.h
@@ -141,7 +141,7 @@ private:
required_device<via6522_device> m_via0;
required_device<via6522_device> m_via1;
optional_device<applefdc_base_device> m_fdc;
- required_device<scc8530_t> m_scc;
+ required_device<scc8530_legacy_device> m_scc;
required_device<speaker_sound_device> m_speaker;
required_device<nvram_device> m_nvram;
required_device<ls259_device> m_latch;
diff --git a/src/mame/includes/mac.h b/src/mame/includes/mac.h
index a0735c98ce7..c47f84d3f8c 100644
--- a/src/mame/includes/mac.h
+++ b/src/mame/includes/mac.h
@@ -259,7 +259,7 @@ private:
optional_device<egret_device> m_egret;
optional_device<cuda_device> m_cuda;
required_device<ram_device> m_ram;
- required_device<scc8530_t> m_scc;
+ required_device<scc8530_legacy_device> m_scc;
optional_device<ncr539x_device> m_539x_1;
optional_device<ncr539x_device> m_539x_2;
optional_device<ncr5380_device> m_ncr5380;
diff --git a/src/mame/includes/macpci.h b/src/mame/includes/macpci.h
index 6fdbd2b9d62..d9454a6c9f0 100644
--- a/src/mame/includes/macpci.h
+++ b/src/mame/includes/macpci.h
@@ -50,7 +50,7 @@ private:
optional_device<awacs_device> m_awacs;
required_device<cuda_device> m_cuda;
required_device<ram_device> m_ram;
- optional_device<scc8530_t> m_scc;
+ optional_device<scc8530_legacy_device> m_scc;
optional_device<ncr539x_device> m_539x_1;
optional_device<ncr539x_device> m_539x_2;
diff --git a/src/mame/includes/next.h b/src/mame/includes/next.h
index d6f89821cc5..fd2cb2756ea 100644
--- a/src/mame/includes/next.h
+++ b/src/mame/includes/next.h
@@ -58,7 +58,7 @@ public:
private:
required_device<cpu_device> maincpu;
required_device<mccs1850_device> rtc;
- required_device<scc8530_t> scc;
+ required_device<scc8530_legacy_device> scc;
required_device<nextkbd_device> keyboard;
required_device<nscsi_bus_device> scsibus;
required_device<ncr5390_device> scsi;
diff --git a/src/mame/includes/x68k.h b/src/mame/includes/x68k.h
index 6e5f38e31ce..7d47e09cb06 100644
--- a/src/mame/includes/x68k.h
+++ b/src/mame/includes/x68k.h
@@ -114,7 +114,7 @@ protected:
required_device<palette_device> m_pcgpalette;
required_device<mc68901_device> m_mfpdev;
required_device<rp5c15_device> m_rtc;
- required_device<scc8530_t> m_scc;
+ required_device<scc8530_legacy_device> m_scc;
required_device<ym2151_device> m_ym2151;
required_device<i8255_device> m_ppi;
required_device<screen_device> m_screen;