summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/apple2e.cpp
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2017-12-19 19:07:12 +0100
committer Olivier Galibert <galibert@pobox.com>2017-12-19 19:08:36 +0100
commit4d3a61f9daeb45df5dd4f95d7dabeff64ad9bafa (patch)
treecff0d0db694cfc80eb4a58e5961928bc62c41b53 /src/mame/drivers/apple2e.cpp
parent5ee6e4dd26eb1f5a3964a2b87ded6864f92c64e2 (diff)
memory: Remove some space parameters from the apple2 domain [O. Galibert]
Diffstat (limited to 'src/mame/drivers/apple2e.cpp')
-rw-r--r--src/mame/drivers/apple2e.cpp58
1 files changed, 29 insertions, 29 deletions
diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp
index 8eb1f04fb0b..cefc26e00a7 100644
--- a/src/mame/drivers/apple2e.cpp
+++ b/src/mame/drivers/apple2e.cpp
@@ -429,9 +429,9 @@ private:
uint8_t read_floatingbus();
void update_slotrom_banks();
void lc_update(int offset, bool writing);
- uint8_t read_slot_rom(address_space &space, int slotbias, int offset);
- void write_slot_rom(address_space &space, int slotbias, int offset, uint8_t data);
- uint8_t read_int_rom(address_space &space, int slotbias, int offset);
+ uint8_t read_slot_rom(int slotbias, int offset);
+ void write_slot_rom(int slotbias, int offset, uint8_t data);
+ uint8_t read_int_rom(int slotbias, int offset);
void auxbank_update();
void cec_lcrom_update();
void raise_irq(int irq);
@@ -2083,7 +2083,7 @@ READ8_MEMBER(apple2e_state::c080_r)
{
if (m_slotdevice[slot] != nullptr)
{
- return m_slotdevice[slot]->read_c0nx(space, offset % 0x10);
+ return m_slotdevice[slot]->read_c0nx(offset % 0x10);
}
else
{
@@ -2113,7 +2113,7 @@ WRITE8_MEMBER(apple2e_state::c080_w)
{
if (m_slotdevice[slot] != nullptr)
{
- m_slotdevice[slot]->write_c0nx(space, offset % 0x10, data);
+ m_slotdevice[slot]->write_c0nx(offset % 0x10, data);
}
else
{
@@ -2139,7 +2139,7 @@ WRITE8_MEMBER(apple2e_state::c080_w)
}
}
-uint8_t apple2e_state::read_slot_rom(address_space &space, int slotbias, int offset)
+uint8_t apple2e_state::read_slot_rom(int slotbias, int offset)
{
int slotnum = ((offset>>8) & 0xf) + slotbias;
@@ -2151,13 +2151,13 @@ uint8_t apple2e_state::read_slot_rom(address_space &space, int slotbias, int off
update_slotrom_banks();
}
- return m_slotdevice[slotnum]->read_cnxx(space, offset&0xff);
+ return m_slotdevice[slotnum]->read_cnxx(offset&0xff);
}
return read_floatingbus();
}
-void apple2e_state::write_slot_rom(address_space &space, int slotbias, int offset, uint8_t data)
+void apple2e_state::write_slot_rom(int slotbias, int offset, uint8_t data)
{
int slotnum = ((offset>>8) & 0xf) + slotbias;
@@ -2169,25 +2169,25 @@ void apple2e_state::write_slot_rom(address_space &space, int slotbias, int offse
update_slotrom_banks();
}
- m_slotdevice[slotnum]->write_cnxx(space, offset&0xff, data);
+ m_slotdevice[slotnum]->write_cnxx(offset&0xff, data);
}
}
-uint8_t apple2e_state::read_int_rom(address_space &space, int slotbias, int offset)
+uint8_t apple2e_state::read_int_rom(int slotbias, int offset)
{
//return m_rom_ptr[slotbias + offset];
- return m_ds1315->read(space, slotbias + offset);
+ return m_ds1315->read(machine().dummy_space(), slotbias + offset);
}
READ8_MEMBER(apple2e_state::nsc_backing_r) { return m_rom_ptr[offset]; }
-READ8_MEMBER(apple2e_state::c100_r) { return read_slot_rom(space, 1, offset); }
-READ8_MEMBER(apple2e_state::c100_int_r) { return read_int_rom(space, 0x100, offset); }
-READ8_MEMBER(apple2e_state::c100_int_bank_r) { return read_int_rom(space, 0x4100, offset); }
+READ8_MEMBER(apple2e_state::c100_r) { return read_slot_rom(1, offset); }
+READ8_MEMBER(apple2e_state::c100_int_r) { return read_int_rom(0x100, offset); }
+READ8_MEMBER(apple2e_state::c100_int_bank_r) { return read_int_rom(0x4100, offset); }
READ8_MEMBER(apple2e_state::c100_cec_r) { return m_rom_ptr[0xc100 + offset]; }
READ8_MEMBER(apple2e_state::c100_cec_bank_r) { return m_rom_ptr[0x4100 + offset]; }
-WRITE8_MEMBER(apple2e_state::c100_w) { write_slot_rom(space, 1, offset, data); }
-READ8_MEMBER(apple2e_state::c300_r) { return read_slot_rom(space, 3, offset); }
+WRITE8_MEMBER(apple2e_state::c100_w) { write_slot_rom(1, offset, data); }
+READ8_MEMBER(apple2e_state::c300_r) { return read_slot_rom(3, offset); }
READ8_MEMBER(apple2e_state::c300_int_r)
{
@@ -2196,7 +2196,7 @@ READ8_MEMBER(apple2e_state::c300_int_r)
m_intc8rom = true;
update_slotrom_banks();
}
- return read_int_rom(space, 0x300, offset);
+ return read_int_rom(0x300, offset);
}
READ8_MEMBER(apple2e_state::c300_int_bank_r)
@@ -2206,7 +2206,7 @@ READ8_MEMBER(apple2e_state::c300_int_bank_r)
m_intc8rom = true;
update_slotrom_banks();
}
- return read_int_rom(space, 0x4300, offset);
+ return read_int_rom(0x4300, offset);
}
WRITE8_MEMBER(apple2e_state::c300_w)
@@ -2217,31 +2217,31 @@ WRITE8_MEMBER(apple2e_state::c300_w)
update_slotrom_banks();
}
- write_slot_rom(space, 3, offset, data);
+ write_slot_rom(3, offset, data);
}
READ8_MEMBER(apple2e_state::c300_cec_r) { return m_rom_ptr[0xc300 + offset]; }
READ8_MEMBER(apple2e_state::c300_cec_bank_r) { return m_rom_ptr[0x4300 + offset]; }
-READ8_MEMBER(apple2e_state::c400_r) { return read_slot_rom(space, 4, offset); }
+READ8_MEMBER(apple2e_state::c400_r) { return read_slot_rom(4, offset); }
READ8_MEMBER(apple2e_state::c400_int_r)
{
if ((offset < 0x100) && (m_mockingboard4c))
{
- return read_slot_rom(space, 4, offset);
+ return read_slot_rom(4, offset);
}
- return read_int_rom(space, 0x400, offset);
+ return read_int_rom(0x400, offset);
}
READ8_MEMBER(apple2e_state::c400_int_bank_r)
{
if ((offset < 0x100) && (m_mockingboard4c))
{
- return read_slot_rom(space, 4, offset);
+ return read_slot_rom(4, offset);
}
- return read_int_rom(space, 0x4400, offset);
+ return read_int_rom(0x4400, offset);
}
WRITE8_MEMBER(apple2e_state::c400_w)
@@ -2251,7 +2251,7 @@ WRITE8_MEMBER(apple2e_state::c400_w)
m_mockingboard4c = true;
}
- write_slot_rom(space, 4, offset, data);
+ write_slot_rom(4, offset, data);
}
READ8_MEMBER(apple2e_state::c400_cec_r) { return m_rom_ptr[0xc400 + offset]; }
@@ -2277,7 +2277,7 @@ READ8_MEMBER(apple2e_state::c800_r)
if ((m_cnxx_slot > 0) && (m_slotdevice[m_cnxx_slot] != nullptr))
{
- return m_slotdevice[m_cnxx_slot]->read_c800(space, offset&0xfff);
+ return m_slotdevice[m_cnxx_slot]->read_c800(offset&0xfff);
}
return read_floatingbus();
@@ -2344,7 +2344,7 @@ WRITE8_MEMBER(apple2e_state::c800_w)
if ((m_cnxx_slot > 0) && (m_slotdevice[m_cnxx_slot] != nullptr))
{
- m_slotdevice[m_cnxx_slot]->write_c800(space, offset&0xfff, data);
+ m_slotdevice[m_cnxx_slot]->write_c800(offset&0xfff, data);
}
}
@@ -2355,7 +2355,7 @@ READ8_MEMBER(apple2e_state::inh_r)
{
if (m_inh_slot != -1)
{
- return m_slotdevice[m_inh_slot]->read_inh_rom(space, offset + 0xd000);
+ return m_slotdevice[m_inh_slot]->read_inh_rom(offset + 0xd000);
}
assert(0); // hitting inh_r with invalid m_inh_slot should not be possible
@@ -2366,7 +2366,7 @@ WRITE8_MEMBER(apple2e_state::inh_w)
{
if (m_inh_slot != -1)
{
- m_slotdevice[m_inh_slot]->write_inh_rom(space, offset + 0xd000, data);
+ m_slotdevice[m_inh_slot]->write_inh_rom(offset + 0xd000, data);
}
}