summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2019-02-18 23:35:05 -0500
committer AJR <ajrhacker@users.noreply.github.com>2019-02-18 23:35:05 -0500
commit4f049026f6c76f531f6bd1faeaa06d1d97db274b (patch)
treec6a683ce094c358a9b1043f60f87e670cb15f66a /src/devices
parent42f54961d8552fed54bd53e63b0e14bcd0c9a71e (diff)
bus/pet: Eliminate address_space argument from interface methods (nw)
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/bus/pet/64k.cpp6
-rw-r--r--src/devices/bus/pet/64k.h6
-rw-r--r--src/devices/bus/pet/exp.cpp12
-rw-r--r--src/devices/bus/pet/exp.h12
-rw-r--r--src/devices/bus/pet/hsg.cpp10
-rw-r--r--src/devices/bus/pet/hsg.h6
-rw-r--r--src/devices/bus/pet/superpet.cpp12
-rw-r--r--src/devices/bus/pet/superpet.h6
-rw-r--r--src/devices/machine/mos6702.cpp4
-rw-r--r--src/devices/machine/mos6702.h4
10 files changed, 39 insertions, 39 deletions
diff --git a/src/devices/bus/pet/64k.cpp b/src/devices/bus/pet/64k.cpp
index 34249220f3e..85f91114386 100644
--- a/src/devices/bus/pet/64k.cpp
+++ b/src/devices/bus/pet/64k.cpp
@@ -113,7 +113,7 @@ void pet_64k_expansion_device::device_reset()
// pet_norom_r - NO ROM read
//-------------------------------------------------
-int pet_64k_expansion_device::pet_norom_r(address_space &space, offs_t offset, int sel)
+int pet_64k_expansion_device::pet_norom_r(offs_t offset, int sel)
{
return !BIT(m_ctrl, 7);
}
@@ -123,7 +123,7 @@ int pet_64k_expansion_device::pet_norom_r(address_space &space, offs_t offset, i
// pet_bd_r - buffered data read
//-------------------------------------------------
-uint8_t pet_64k_expansion_device::pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel)
+uint8_t pet_64k_expansion_device::pet_bd_r(offs_t offset, uint8_t data, int &sel)
{
if (BIT(m_ctrl, 7))
{
@@ -164,7 +164,7 @@ uint8_t pet_64k_expansion_device::pet_bd_r(address_space &space, offs_t offset,
// pet_bd_w - buffered data write
//-------------------------------------------------
-void pet_64k_expansion_device::pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel)
+void pet_64k_expansion_device::pet_bd_w(offs_t offset, uint8_t data, int &sel)
{
if (BIT(m_ctrl, 7))
{
diff --git a/src/devices/bus/pet/64k.h b/src/devices/bus/pet/64k.h
index 82f50cab77a..7cf03cd621b 100644
--- a/src/devices/bus/pet/64k.h
+++ b/src/devices/bus/pet/64k.h
@@ -33,9 +33,9 @@ protected:
virtual void device_reset() override;
// device_pet_expansion_card_interface overrides
- virtual int pet_norom_r(address_space &space, offs_t offset, int sel) override;
- virtual uint8_t pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel) override;
- virtual void pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel) override;
+ virtual int pet_norom_r(offs_t offset, int sel) override;
+ virtual uint8_t pet_bd_r(offs_t offset, uint8_t data, int &sel) override;
+ virtual void pet_bd_w(offs_t offset, uint8_t data, int &sel) override;
private:
inline uint8_t read_ram(offs_t offset);
diff --git a/src/devices/bus/pet/exp.cpp b/src/devices/bus/pet/exp.cpp
index ab7cc9e04dd..07aa7155b93 100644
--- a/src/devices/bus/pet/exp.cpp
+++ b/src/devices/bus/pet/exp.cpp
@@ -115,9 +115,9 @@ void pet_expansion_slot_device::device_reset()
// norom_r - NO ROM read
//-------------------------------------------------
-int pet_expansion_slot_device::norom_r(address_space &space, offs_t offset, int sel)
+int pet_expansion_slot_device::norom_r(offs_t offset, int sel)
{
- return m_card ? m_card->pet_norom_r(space, offset, sel) : 1;
+ return m_card ? m_card->pet_norom_r(offset, sel) : 1;
}
@@ -125,11 +125,11 @@ int pet_expansion_slot_device::norom_r(address_space &space, offs_t offset, int
// read - buffered data read
//-------------------------------------------------
-uint8_t pet_expansion_slot_device::read(address_space &space, offs_t offset, uint8_t data, int &sel)
+uint8_t pet_expansion_slot_device::read(offs_t offset, uint8_t data, int &sel)
{
if (m_card != nullptr)
{
- data = m_card->pet_bd_r(space, offset, data, sel);
+ data = m_card->pet_bd_r(offset, data, sel);
}
return data;
@@ -140,11 +140,11 @@ uint8_t pet_expansion_slot_device::read(address_space &space, offs_t offset, uin
// write - buffered data write
//-------------------------------------------------
-void pet_expansion_slot_device::write(address_space &space, offs_t offset, uint8_t data, int &sel)
+void pet_expansion_slot_device::write(offs_t offset, uint8_t data, int &sel)
{
if (m_card != nullptr)
{
- m_card->pet_bd_w(space, offset, data, sel);
+ m_card->pet_bd_w(offset, data, sel);
}
}
diff --git a/src/devices/bus/pet/exp.h b/src/devices/bus/pet/exp.h
index 0ed8b00177b..39309b65f4c 100644
--- a/src/devices/bus/pet/exp.h
+++ b/src/devices/bus/pet/exp.h
@@ -52,9 +52,9 @@ public:
auto dma_write_callback() { return m_write_dma.bind(); }
// computer interface
- int norom_r(address_space &space, offs_t offset, int sel);
- uint8_t read(address_space &space, offs_t offset, uint8_t data, int &sel);
- void write(address_space &space, offs_t offset, uint8_t data, int &sel);
+ int norom_r(offs_t offset, int sel);
+ uint8_t read(offs_t offset, uint8_t data, int &sel);
+ void write(offs_t offset, uint8_t data, int &sel);
DECLARE_READ_LINE_MEMBER( diag_r );
DECLARE_WRITE_LINE_MEMBER( irq_w );
@@ -111,9 +111,9 @@ protected:
device_pet_expansion_card_interface(const machine_config &mconfig, device_t &device);
// runtime
- virtual int pet_norom_r(address_space &space, offs_t offset, int sel) { return 1; }
- virtual uint8_t pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel) { return data; };
- virtual void pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel) { };
+ virtual int pet_norom_r(offs_t offset, int sel) { return 1; }
+ virtual uint8_t pet_bd_r(offs_t offset, uint8_t data, int &sel) { return data; };
+ virtual void pet_bd_w(offs_t offset, uint8_t data, int &sel) { };
virtual int pet_diag_r() { return 1; }
virtual void pet_irq_w(int state) { }
diff --git a/src/devices/bus/pet/hsg.cpp b/src/devices/bus/pet/hsg.cpp
index 62b60d496a8..4c821cdbf48 100644
--- a/src/devices/bus/pet/hsg.cpp
+++ b/src/devices/bus/pet/hsg.cpp
@@ -178,7 +178,7 @@ void cbm8000_hsg_device::device_reset()
// pet_norom_r - NO ROM read
//-------------------------------------------------
-int cbm8000_hsg_device::pet_norom_r(address_space &space, offs_t offset, int sel)
+int cbm8000_hsg_device::pet_norom_r(offs_t offset, int sel)
{
return !(offset >= 0x9000 && offset < 0xaf00);
}
@@ -188,7 +188,7 @@ int cbm8000_hsg_device::pet_norom_r(address_space &space, offs_t offset, int sel
// pet_bd_r - buffered data read
//-------------------------------------------------
-uint8_t cbm8000_hsg_device::pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel)
+uint8_t cbm8000_hsg_device::pet_bd_r(offs_t offset, uint8_t data, int &sel)
{
switch (sel)
{
@@ -224,7 +224,7 @@ uint8_t cbm8000_hsg_device::pet_bd_r(address_space &space, offs_t offset, uint8_
}
else if (offset >= 0xaf70 && offset < 0xaf80)
{
- data = m_gdc->data_r(space, offset & 0x0f);
+ data = m_gdc->data_r(machine().dummy_space(), offset & 0x0f);
}
break;
}
@@ -237,7 +237,7 @@ uint8_t cbm8000_hsg_device::pet_bd_r(address_space &space, offs_t offset, uint8_
// pet_bd_w - buffered data write
//-------------------------------------------------
-void cbm8000_hsg_device::pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel)
+void cbm8000_hsg_device::pet_bd_w(offs_t offset, uint8_t data, int &sel)
{
if (offset == 0xaf00)
{
@@ -258,6 +258,6 @@ void cbm8000_hsg_device::pet_bd_w(address_space &space, offs_t offset, uint8_t d
}
else if (offset >= 0xaf70 && offset < 0xaf80)
{
- m_gdc->data_w(space, offset & 0x0f, data);
+ m_gdc->data_w(machine().dummy_space(), offset & 0x0f, data);
}
}
diff --git a/src/devices/bus/pet/hsg.h b/src/devices/bus/pet/hsg.h
index 406fe27ce57..e86cb101ac3 100644
--- a/src/devices/bus/pet/hsg.h
+++ b/src/devices/bus/pet/hsg.h
@@ -36,9 +36,9 @@ protected:
virtual const tiny_rom_entry *device_rom_region() const override;
// device_pet_expansion_card_interface overrides
- virtual int pet_norom_r(address_space &space, offs_t offset, int sel) override;
- virtual uint8_t pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel) override;
- virtual void pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel) override;
+ virtual int pet_norom_r(offs_t offset, int sel) override;
+ virtual uint8_t pet_bd_r(offs_t offset, uint8_t data, int &sel) override;
+ virtual void pet_bd_w(offs_t offset, uint8_t data, int &sel) override;
required_device<ef9365_device> m_gdc;
diff --git a/src/devices/bus/pet/superpet.cpp b/src/devices/bus/pet/superpet.cpp
index b69e7828a5a..ab518bec49f 100644
--- a/src/devices/bus/pet/superpet.cpp
+++ b/src/devices/bus/pet/superpet.cpp
@@ -225,7 +225,7 @@ void superpet_device::device_reset()
// pet_norom_r - NO ROM read
//-------------------------------------------------
-int superpet_device::pet_norom_r(address_space &space, offs_t offset, int sel)
+int superpet_device::pet_norom_r(offs_t offset, int sel)
{
return BIT(m_system, 0);
}
@@ -235,9 +235,9 @@ int superpet_device::pet_norom_r(address_space &space, offs_t offset, int sel)
// pet_bd_r - buffered data read
//-------------------------------------------------
-uint8_t superpet_device::pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel)
+uint8_t superpet_device::pet_bd_r(offs_t offset, uint8_t data, int &sel)
{
- int norom = pet_norom_r(space, offset, sel);
+ int norom = pet_norom_r(offset, sel);
switch (sel)
{
@@ -277,7 +277,7 @@ uint8_t superpet_device::pet_bd_r(address_space &space, offs_t offset, uint8_t d
case 0xefe1:
case 0xefe2:
case 0xefe3:
- data = m_dongle->read(space, offset & 0x03);
+ data = m_dongle->read(offset & 0x03);
break;
case 0xeff0:
@@ -296,7 +296,7 @@ uint8_t superpet_device::pet_bd_r(address_space &space, offs_t offset, uint8_t d
// pet_bd_w - buffered data write
//-------------------------------------------------
-void superpet_device::pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel)
+void superpet_device::pet_bd_w(offs_t offset, uint8_t data, int &sel)
{
switch (sel)
{
@@ -314,7 +314,7 @@ void superpet_device::pet_bd_w(address_space &space, offs_t offset, uint8_t data
case 0xefe1:
case 0xefe2:
case 0xefe3:
- m_dongle->write(space, offset & 0x03, data);
+ m_dongle->write(offset & 0x03, data);
printf("6702 %u %02x\n", offset & 0x03, data);
break;
diff --git a/src/devices/bus/pet/superpet.h b/src/devices/bus/pet/superpet.h
index 35c74af8ab0..6a6dfde0889 100644
--- a/src/devices/bus/pet/superpet.h
+++ b/src/devices/bus/pet/superpet.h
@@ -41,9 +41,9 @@ protected:
virtual ioport_constructor device_input_ports() const override;
// device_pet_expansion_card_interface overrides
- virtual int pet_norom_r(address_space &space, offs_t offset, int sel) override;
- virtual uint8_t pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel) override;
- virtual void pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel) override;
+ virtual int pet_norom_r(offs_t offset, int sel) override;
+ virtual uint8_t pet_bd_r(offs_t offset, uint8_t data, int &sel) override;
+ virtual void pet_bd_w(offs_t offset, uint8_t data, int &sel) override;
virtual int pet_diag_r() override;
virtual void pet_irq_w(int state) override;
diff --git a/src/devices/machine/mos6702.cpp b/src/devices/machine/mos6702.cpp
index a5fa3d4c088..1b552054cb4 100644
--- a/src/devices/machine/mos6702.cpp
+++ b/src/devices/machine/mos6702.cpp
@@ -49,7 +49,7 @@ void mos6702_device::device_start()
// read -
//-------------------------------------------------
-READ8_MEMBER( mos6702_device::read )
+uint8_t mos6702_device::read(offs_t offset)
{
return 0;
}
@@ -59,6 +59,6 @@ READ8_MEMBER( mos6702_device::read )
// write -
//-------------------------------------------------
-WRITE8_MEMBER( mos6702_device::write )
+void mos6702_device::write(offs_t offset, uint8_t data)
{
}
diff --git a/src/devices/machine/mos6702.h b/src/devices/machine/mos6702.h
index b000d33747b..ab1ea945e6e 100644
--- a/src/devices/machine/mos6702.h
+++ b/src/devices/machine/mos6702.h
@@ -37,8 +37,8 @@ public:
// construction/destruction
mos6702_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
protected:
// device-level overrides