summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-02-29 18:32:29 +1100
committer Vas Crabb <vas@vastheman.com>2020-02-29 18:32:52 +1100
commitf011a9134d0e0c789db24fa25c798fb2ff9e8387 (patch)
tree98bedc32e4a4b9903706d06c693c303bbef97870
parent46676197c5610a258fcd2440589a13a2cb945149 (diff)
clean up crud (nw)
-rw-r--r--scripts/src/cpu.lua4
-rw-r--r--scripts/toolchain.lua16
-rw-r--r--src/devices/machine/mc6844.cpp11
-rw-r--r--src/devices/machine/mc6844.h4
-rw-r--r--src/mame/machine/alfaskop_s41_kb.h2
5 files changed, 10 insertions, 27 deletions
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 3cf6ccc28e5..774511e1881 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -3138,7 +3138,9 @@ end
--------------------------------------------------
-- NEC 78K
---@src/devices/cpu/upd78k/upd78k.h,CPUS["UPD78K"] = true
+--@src/devices/cpu/upd78k/upd78k0.h,CPUS["UPD78K"] = true
+--@src/devices/cpu/upd78k/upd78k2.h,CPUS["UPD78K"] = true
+--@src/devices/cpu/upd78k/upd78k3.h,CPUS["UPD78K"] = true
--------------------------------------------------
if (CPUS["UPD78K"]~=null) then
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 45734c11971..4823083f0aa 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -262,14 +262,6 @@ function toolchain(_buildDir, _subDir)
end
premake.gcc.cc = toolchainPrefix .. "gcc"
premake.gcc.cxx = toolchainPrefix .. "g++"
--- work around GCC 4.9.2 not having proper linker for LTO=1 usage
- local version_4_ar = str_to_version(_OPTIONS["gcc_version"])
- if (version_4_ar < 50000) then
- premake.gcc.ar = toolchainPrefix .. "ar"
- end
- if (version_4_ar >= 50000) then
- premake.gcc.ar = toolchainPrefix .. "gcc-ar"
- end
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-mingw32-gcc")
end
@@ -282,14 +274,6 @@ function toolchain(_buildDir, _subDir)
end
premake.gcc.cc = toolchainPrefix .. "gcc"
premake.gcc.cxx = toolchainPrefix .. "g++"
--- work around GCC 4.9.2 not having proper linker for LTO=1 usage
- local version_4_ar = str_to_version(_OPTIONS["gcc_version"])
- if (version_4_ar < 50000) then
- premake.gcc.ar = toolchainPrefix .. "ar"
- end
- if (version_4_ar >= 50000) then
- premake.gcc.ar = toolchainPrefix .. "gcc-ar"
- end
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-mingw64-gcc")
end
diff --git a/src/devices/machine/mc6844.cpp b/src/devices/machine/mc6844.cpp
index e22c13c670f..a88b497a271 100644
--- a/src/devices/machine/mc6844.cpp
+++ b/src/devices/machine/mc6844.cpp
@@ -86,8 +86,8 @@ mc6844_device::mc6844_device(const machine_config &mconfig, const char *tag, dev
, m_out_drq2_cb(*this)
, m_in_memr_cb(*this)
, m_out_memw_cb(*this)
- , m_in_ior_cb{ { *this },{ *this },{ *this },{ *this } }
- , m_out_iow_cb{ { *this },{ *this },{ *this },{ *this } }
+ , m_in_ior_cb(*this)
+ , m_out_iow_cb(*this)
, m_state(STATE_S0)
, m_icount(0)
{
@@ -105,11 +105,8 @@ void mc6844_device::device_resolve_objects()
m_in_memr_cb.resolve_safe(0);
m_out_memw_cb.resolve_safe();
- for(auto &cb : m_in_ior_cb)
- cb.resolve_safe(0);
- for(auto &cb : m_out_iow_cb)
- cb.resolve_safe();
-
+ m_in_ior_cb.resolve_all_safe(0);
+ m_out_iow_cb.resolve_all_safe();
}
//-------------------------------------------------
diff --git a/src/devices/machine/mc6844.h b/src/devices/machine/mc6844.h
index e2db601e8e7..242528454a6 100644
--- a/src/devices/machine/mc6844.h
+++ b/src/devices/machine/mc6844.h
@@ -81,8 +81,8 @@ protected:
devcb_write_line m_out_drq2_cb;
devcb_read8 m_in_memr_cb;
devcb_write8 m_out_memw_cb;
- devcb_read8 m_in_ior_cb[4];
- devcb_write8 m_out_iow_cb[4];
+ devcb_read8::array<4> m_in_ior_cb;
+ devcb_write8::array<4> m_out_iow_cb;
/* channel_data structure holds info about each 6844 DMA channel */
struct m6844_channel_data
diff --git a/src/mame/machine/alfaskop_s41_kb.h b/src/mame/machine/alfaskop_s41_kb.h
index 1d99ec82264..de604fd37b4 100644
--- a/src/mame/machine/alfaskop_s41_kb.h
+++ b/src/mame/machine/alfaskop_s41_kb.h
@@ -30,7 +30,7 @@ protected:
virtual tiny_rom_entry const *device_rom_region() const override;
required_device<m6802_cpu_device> m_mcu;
- required_device<mc6846_device> m_mc6846;
+ required_device<mc6846_device> m_mc6846;
required_ioport_array<6> m_rows;
devcb_write_line m_txd_cb; // Callback for KBD-> S41
devcb_write8 m_leds_cb; // Callback for all 8 leds -> layout