summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2022-10-14 02:11:33 +1100
committer Vas Crabb <vas@vastheman.com>2022-10-14 02:11:33 +1100
commitdc7874c2b650ad2ae6b5ce1489da2deb0e0ab01a (patch)
treebbdf49d4f2f9958a45fdb1bb640ef7063e028133 /src/devices/machine
parent31581d2ec7b566a9eba34c4897939c267dda0564 (diff)
-bus/gameboy: Support MBC6 ROMs in GBX format.
-machine/68350sim.cpp: Don't use lambda auto-capture.
Diffstat (limited to 'src/devices/machine')
-rw-r--r--src/devices/machine/68340sim.cpp29
1 files changed, 15 insertions, 14 deletions
diff --git a/src/devices/machine/68340sim.cpp b/src/devices/machine/68340sim.cpp
index e70bb6bf9b6..373de8c9bb8 100644
--- a/src/devices/machine/68340sim.cpp
+++ b/src/devices/machine/68340sim.cpp
@@ -375,20 +375,6 @@ void m68340_cpu_device::m68340_internal_sim_cs_w(offs_t offset, uint16_t data, u
{
LOG("%s\n", FUNCNAME);
- auto combine_data32 = [&](uint32_t *varptr)
- {
- uint32_t data32 = data;
- uint32_t mem_mask32 = mem_mask;
-
- if(!BIT(offset,0))
- {
- data32 <<= 16;
- mem_mask32 <<= 16;
- }
-
- *varptr = (*varptr & ~mem_mask32) | (data32 & mem_mask32);
- };
-
offset += m68340_sim::REG_AM_CS0>>1;
if (BIT(offset, 1))
@@ -421,6 +407,21 @@ void m68340_cpu_device::m68340_internal_sim_cs_w(offs_t offset, uint16_t data, u
assert(m_m68340SIM);
m68340_sim &sim = *m_m68340SIM;
+ auto const combine_data32 =
+ [&offset, &data, &mem_mask] (uint32_t *varptr)
+ {
+ uint32_t data32 = data;
+ uint32_t mem_mask32 = mem_mask;
+
+ if (!BIT(offset,0))
+ {
+ data32 <<= 16;
+ mem_mask32 <<= 16;
+ }
+
+ *varptr = (*varptr & ~mem_mask32) | (data32 & mem_mask32);
+ };
+
switch ((offset << 1) & ~3)
{
case m68340_sim::REG_AM_CS0: