summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2020-05-21 19:57:43 +0200
committer Ivan Vangelista <mesgnet@yahoo.it>2020-05-21 19:57:43 +0200
commit889e65792ed3eb0e90c1c6cf266b6f4a08b9a26b (patch)
tree65d69f004e494e2fa57526066e022886416d07e6 /src/devices/bus
parent6b8cb09ee7cfdbc6415aebe4670b44e5b5756a2a (diff)
last batch of changes to make the https://github.com/mamedev/mame/tree/devcb-no-space branch build. (nw)
Diffstat (limited to 'src/devices/bus')
-rw-r--r--src/devices/bus/isa/3c503.cpp4
-rw-r--r--src/devices/bus/isa/mufdc.cpp2
-rw-r--r--src/devices/bus/isa/mufdc.h2
-rw-r--r--src/devices/bus/isa/ne1000.cpp12
-rw-r--r--src/devices/bus/isa/ne1000.h4
-rw-r--r--src/devices/bus/isa/ne2000.cpp16
-rw-r--r--src/devices/bus/isa/ne2000.h4
-rw-r--r--src/devices/bus/isa/sb16.cpp8
-rw-r--r--src/devices/bus/isa/sb16.h8
-rw-r--r--src/devices/bus/isa/stereo_fx.cpp6
-rw-r--r--src/devices/bus/isa/stereo_fx.h6
-rw-r--r--src/devices/bus/isa/wdxt_gen.cpp14
-rw-r--r--src/devices/bus/isa/wdxt_gen.h14
-rw-r--r--src/devices/bus/lpci/southbridge.cpp30
-rw-r--r--src/devices/bus/lpci/southbridge.h30
-rw-r--r--src/devices/bus/macpds/hyperdrive.cpp4
-rw-r--r--src/devices/bus/macpds/hyperdrive.h4
-rw-r--r--src/devices/bus/multibus/isbc202.cpp2
-rw-r--r--src/devices/bus/multibus/isbc202.h2
-rw-r--r--src/devices/bus/nubus/nubus_asntmc3b.cpp12
-rw-r--r--src/devices/bus/nubus/nubus_asntmc3b.h4
-rw-r--r--src/devices/bus/pc_kbd/ec1841.cpp8
-rw-r--r--src/devices/bus/pc_kbd/ec1841.h8
-rw-r--r--src/devices/bus/pc_kbd/iskr1030.cpp6
-rw-r--r--src/devices/bus/pc_kbd/iskr1030.h6
-rw-r--r--src/devices/bus/pc_kbd/keytro.cpp12
-rw-r--r--src/devices/bus/pc_kbd/keytro.h12
-rw-r--r--src/devices/bus/pc_kbd/msnat.cpp12
-rw-r--r--src/devices/bus/pc_kbd/msnat.h12
-rw-r--r--src/devices/bus/pc_kbd/pc83.cpp6
-rw-r--r--src/devices/bus/pc_kbd/pc83.h6
-rw-r--r--src/devices/bus/pc_kbd/pcat84.cpp10
-rw-r--r--src/devices/bus/pc_kbd/pcat84.h10
-rw-r--r--src/devices/bus/pc_kbd/pcxt83.cpp10
-rw-r--r--src/devices/bus/pc_kbd/pcxt83.h8
-rw-r--r--src/devices/bus/sg1000_exp/sk1100.cpp6
-rw-r--r--src/devices/bus/sg1000_exp/sk1100.h6
-rw-r--r--src/devices/bus/spc1000/fdd.cpp6
-rw-r--r--src/devices/bus/spc1000/fdd.h6
-rw-r--r--src/devices/bus/spectrum/opus.cpp4
-rw-r--r--src/devices/bus/spectrum/opus.h4
-rw-r--r--src/devices/bus/ss50/mpt.cpp8
-rw-r--r--src/devices/bus/ss50/piaide.cpp16
-rw-r--r--src/devices/bus/tanbus/mpvdu.cpp2
-rw-r--r--src/devices/bus/tanbus/mpvdu.h2
-rw-r--r--src/devices/bus/tanbus/ravdu.cpp2
-rw-r--r--src/devices/bus/tanbus/ravdu.h2
-rw-r--r--src/devices/bus/tanbus/tanex.cpp10
-rw-r--r--src/devices/bus/tanbus/tanex.h10
-rw-r--r--src/devices/bus/ti99/peb/cc_fdc.cpp2
-rw-r--r--src/devices/bus/ti99/peb/cc_fdc.h2
-rw-r--r--src/devices/bus/vic20/vic1112.cpp4
-rw-r--r--src/devices/bus/vic20/vic1112.h4
-rw-r--r--src/devices/bus/vme/vme_fccpu20.cpp6
-rw-r--r--src/devices/bus/vme/vme_fccpu20.h6
-rw-r--r--src/devices/bus/vme/vme_fcisio.cpp2
-rw-r--r--src/devices/bus/vme/vme_fcisio.h2
-rw-r--r--src/devices/bus/vme/vme_fcscsi.cpp6
-rw-r--r--src/devices/bus/vme/vme_fcscsi.h6
-rw-r--r--src/devices/bus/x68k/x68k_neptunex.cpp16
-rw-r--r--src/devices/bus/x68k/x68k_neptunex.h4
61 files changed, 229 insertions, 229 deletions
diff --git a/src/devices/bus/isa/3c503.cpp b/src/devices/bus/isa/3c503.cpp
index a9749abc66c..bb906605de7 100644
--- a/src/devices/bus/isa/3c503.cpp
+++ b/src/devices/bus/isa/3c503.cpp
@@ -111,7 +111,7 @@ READ8_MEMBER(el2_3c503_device::el2_3c503_loport_r) {
switch((m_regs.ctrl >> 2) & 3) {
case 0:
m_dp8390->dp8390_cs(CLEAR_LINE);
- return m_dp8390->dp8390_r(space, offset, mem_mask);
+ return m_dp8390->dp8390_r(offset);
case 1:
return m_prom[offset];
case 2:
@@ -126,7 +126,7 @@ WRITE8_MEMBER(el2_3c503_device::el2_3c503_loport_w) {
switch((m_regs.ctrl >> 2) & 3) {
case 0:
m_dp8390->dp8390_cs(CLEAR_LINE);
- return m_dp8390->dp8390_w(space, offset, data, mem_mask);
+ return m_dp8390->dp8390_w(offset, data);
case 1:
case 2:
logerror("3c503: invalid attempt to write to prom\n");
diff --git a/src/devices/bus/isa/mufdc.cpp b/src/devices/bus/isa/mufdc.cpp
index 61cbeecc95a..58408d191e7 100644
--- a/src/devices/bus/isa/mufdc.cpp
+++ b/src/devices/bus/isa/mufdc.cpp
@@ -170,7 +170,7 @@ void mufdc_device::device_reset()
// FDC INTERFACE
//**************************************************************************
-READ8_MEMBER( mufdc_device::fdc_input_r )
+uint8_t mufdc_device::fdc_input_r()
{
return ~m_config->read();
}
diff --git a/src/devices/bus/isa/mufdc.h b/src/devices/bus/isa/mufdc.h
index fd21c1feb28..1b7b949dc0d 100644
--- a/src/devices/bus/isa/mufdc.h
+++ b/src/devices/bus/isa/mufdc.h
@@ -53,7 +53,7 @@ protected:
private:
DECLARE_FLOPPY_FORMATS( floppy_formats );
- DECLARE_READ8_MEMBER( fdc_input_r );
+ uint8_t fdc_input_r();
DECLARE_WRITE_LINE_MEMBER( fdc_irq_w );
DECLARE_WRITE_LINE_MEMBER( fdc_drq_w );
diff --git a/src/devices/bus/isa/ne1000.cpp b/src/devices/bus/isa/ne1000.cpp
index 0be12869dca..d3c4f23e541 100644
--- a/src/devices/bus/isa/ne1000.cpp
+++ b/src/devices/bus/isa/ne1000.cpp
@@ -42,12 +42,12 @@ void ne1000_device::device_reset() {
READ8_MEMBER(ne1000_device::ne1000_port_r) {
if(offset < 16) {
m_dp8390->dp8390_cs(CLEAR_LINE);
- return m_dp8390->dp8390_r(space, offset, mem_mask);
+ return m_dp8390->dp8390_r(offset);
}
switch(offset) {
case 16:
m_dp8390->dp8390_cs(ASSERT_LINE);
- return m_dp8390->dp8390_r(space, offset, mem_mask);
+ return m_dp8390->dp8390_r(offset);
case 31:
m_dp8390->dp8390_reset(CLEAR_LINE);
return 0;
@@ -60,13 +60,13 @@ READ8_MEMBER(ne1000_device::ne1000_port_r) {
WRITE8_MEMBER(ne1000_device::ne1000_port_w) {
if(offset < 16) {
m_dp8390->dp8390_cs(CLEAR_LINE);
- m_dp8390->dp8390_w(space, offset, data, mem_mask);
+ m_dp8390->dp8390_w(offset, data);
return;
}
switch(offset) {
case 16:
m_dp8390->dp8390_cs(ASSERT_LINE);
- m_dp8390->dp8390_w(space, offset, data, mem_mask);
+ m_dp8390->dp8390_w(offset, data);
return;
case 31:
m_dp8390->dp8390_reset(ASSERT_LINE);
@@ -94,7 +94,7 @@ WRITE_LINE_MEMBER(ne1000_device::ne1000_irq_w) {
}
}
-READ8_MEMBER(ne1000_device::ne1000_mem_read) {
+uint8_t ne1000_device::ne1000_mem_read(offs_t offset) {
offset &= ~0xc000; // verify
if(offset < 16) return m_prom[offset];
if((offset < (8*1024)) || (offset >= (16*1024))) {
@@ -104,7 +104,7 @@ READ8_MEMBER(ne1000_device::ne1000_mem_read) {
return m_board_ram[offset - (8*1024)];
}
-WRITE8_MEMBER(ne1000_device::ne1000_mem_write) {
+void ne1000_device::ne1000_mem_write(offs_t offset, uint8_t data) {
offset &= ~0xc000; // verify
if((offset < (8*1024)) || (offset >= (16*1024))) {
logerror("ne1000: invalid memory write %04X\n", offset);
diff --git a/src/devices/bus/isa/ne1000.h b/src/devices/bus/isa/ne1000.h
index a59e24374ed..4be080b8a99 100644
--- a/src/devices/bus/isa/ne1000.h
+++ b/src/devices/bus/isa/ne1000.h
@@ -28,8 +28,8 @@ protected:
private:
void ne1000_irq_w(int state);
- DECLARE_READ8_MEMBER(ne1000_mem_read);
- DECLARE_WRITE8_MEMBER(ne1000_mem_write);
+ uint8_t ne1000_mem_read(offs_t offset);
+ void ne1000_mem_write(offs_t offset, uint8_t data);
required_device<dp8390d_device> m_dp8390;
uint8_t m_irq;
diff --git a/src/devices/bus/isa/ne2000.cpp b/src/devices/bus/isa/ne2000.cpp
index 246447836ba..17c8466ce50 100644
--- a/src/devices/bus/isa/ne2000.cpp
+++ b/src/devices/bus/isa/ne2000.cpp
@@ -43,14 +43,14 @@ READ16_MEMBER(ne2000_device::ne2000_port_r) {
offset <<= 1;
if(offset < 16) {
m_dp8390->dp8390_cs(CLEAR_LINE);
- return m_dp8390->dp8390_r(space, offset, 0xff) |
- m_dp8390->dp8390_r(space, offset+1, 0xff) << 8;
+ return m_dp8390->dp8390_r(offset) |
+ m_dp8390->dp8390_r(offset+1) << 8;
}
if(mem_mask == 0xff00) offset++;
switch(offset) {
case 16:
m_dp8390->dp8390_cs(ASSERT_LINE);
- return m_dp8390->dp8390_r(space, offset, mem_mask);
+ return m_dp8390->dp8390_r(offset);
case 31:
m_dp8390->dp8390_reset(CLEAR_LINE);
return 0;
@@ -68,15 +68,15 @@ WRITE16_MEMBER(ne2000_device::ne2000_port_w) {
data >>= 8;
offset++;
}
- m_dp8390->dp8390_w(space, offset, data & 0xff, 0xff);
- if(mem_mask == 0xffff) m_dp8390->dp8390_w(space, offset+1, data>>8, 0xff);
+ m_dp8390->dp8390_w(offset, data & 0xff);
+ if(mem_mask == 0xffff) m_dp8390->dp8390_w(offset+1, data>>8);
return;
}
if(mem_mask == 0xff00) offset++;
switch(offset) {
case 16:
m_dp8390->dp8390_cs(ASSERT_LINE);
- m_dp8390->dp8390_w(space, offset, data, mem_mask);
+ m_dp8390->dp8390_w(offset, data);
return;
case 31:
m_dp8390->dp8390_reset(ASSERT_LINE);
@@ -104,7 +104,7 @@ WRITE_LINE_MEMBER(ne2000_device::ne2000_irq_w) {
}
}
-READ8_MEMBER(ne2000_device::ne2000_mem_read) {
+uint8_t ne2000_device::ne2000_mem_read(offs_t offset) {
offset &= ~0x8000;
if(offset < 32) return m_prom[offset>>1];
if((offset < (16*1024)) || (offset >= (32*1024))) {
@@ -114,7 +114,7 @@ READ8_MEMBER(ne2000_device::ne2000_mem_read) {
return m_board_ram[offset - (16*1024)];
}
-WRITE8_MEMBER(ne2000_device::ne2000_mem_write) {
+void ne2000_device::ne2000_mem_write(offs_t offset, uint8_t data) {
offset &= ~0x8000;
if((offset < (16*1024)) || (offset >= (32*1024))) {
logerror("ne2000: invalid memory write %04X\n", offset);
diff --git a/src/devices/bus/isa/ne2000.h b/src/devices/bus/isa/ne2000.h
index 868d78b35a6..7f62e5e5167 100644
--- a/src/devices/bus/isa/ne2000.h
+++ b/src/devices/bus/isa/ne2000.h
@@ -26,8 +26,8 @@ protected:
private:
void ne2000_irq_w(int state);
- DECLARE_READ8_MEMBER(ne2000_mem_read);
- DECLARE_WRITE8_MEMBER(ne2000_mem_write);
+ uint8_t ne2000_mem_read(offs_t offset);
+ void ne2000_mem_write(offs_t offset, uint8_t data);
required_device<dp8390d_device> m_dp8390;
uint8_t m_irq;
diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp
index 0f2123409f9..8f17c5ea4a6 100644
--- a/src/devices/bus/isa/sb16.cpp
+++ b/src/devices/bus/isa/sb16.cpp
@@ -63,7 +63,7 @@ WRITE8_MEMBER( sb16_lle_device::dac_data_w )
m_rdac->write(data << 8);
}
-READ8_MEMBER( sb16_lle_device::p1_r )
+uint8_t sb16_lle_device::p1_r()
{
uint8_t ret = 0;
ret |= m_data_out << 0;
@@ -71,7 +71,7 @@ READ8_MEMBER( sb16_lle_device::p1_r )
return ret;
}
-WRITE8_MEMBER( sb16_lle_device::p1_w )
+void sb16_lle_device::p1_w(uint8_t data)
{
/* port P1
* bit0 - output byte ready
@@ -85,12 +85,12 @@ WRITE8_MEMBER( sb16_lle_device::p1_w )
*/
}
-READ8_MEMBER( sb16_lle_device::p2_r )
+uint8_t sb16_lle_device::p2_r()
{
return 0;
}
-WRITE8_MEMBER( sb16_lle_device::p2_w )
+void sb16_lle_device::p2_w(uint8_t data)
{
/* port P2
* bit0 -
diff --git a/src/devices/bus/isa/sb16.h b/src/devices/bus/isa/sb16.h
index 4eb9be9d804..5bd68235afd 100644
--- a/src/devices/bus/isa/sb16.h
+++ b/src/devices/bus/isa/sb16.h
@@ -45,10 +45,10 @@ private:
// mcu ports
DECLARE_READ8_MEMBER( dsp_data_r );
DECLARE_WRITE8_MEMBER( dsp_data_w );
- DECLARE_READ8_MEMBER( p1_r );
- DECLARE_WRITE8_MEMBER( p1_w );
- DECLARE_READ8_MEMBER( p2_r );
- DECLARE_WRITE8_MEMBER( p2_w );
+ uint8_t p1_r();
+ void p1_w(uint8_t data);
+ uint8_t p2_r();
+ void p2_w(uint8_t data);
DECLARE_WRITE8_MEMBER( rate_w );
DECLARE_READ8_MEMBER( dma8_r );
DECLARE_WRITE8_MEMBER( dma8_w );
diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp
index 9a12302d7c0..5e34e9cb19b 100644
--- a/src/devices/bus/isa/stereo_fx.cpp
+++ b/src/devices/bus/isa/stereo_fx.cpp
@@ -27,12 +27,12 @@ WRITE8_MEMBER( stereo_fx_device::dev_dsp_data_w )
}
// port 1 is the left DAC but is written and read bitwise during capture
-READ8_MEMBER( stereo_fx_device::p1_r )
+uint8_t stereo_fx_device::p1_r()
{
return 0x80;
}
-READ8_MEMBER( stereo_fx_device::p3_r )
+uint8_t stereo_fx_device::p3_r()
{
uint8_t ret = 0;
@@ -43,7 +43,7 @@ READ8_MEMBER( stereo_fx_device::p3_r )
return ret;
}
-WRITE8_MEMBER( stereo_fx_device::p3_w )
+void stereo_fx_device::p3_w(uint8_t data)
{
m_t1 = (data & 0x20) >> 5;
}
diff --git a/src/devices/bus/isa/stereo_fx.h b/src/devices/bus/isa/stereo_fx.h
index c3fa08339b8..7044f80a28f 100644
--- a/src/devices/bus/isa/stereo_fx.h
+++ b/src/devices/bus/isa/stereo_fx.h
@@ -56,9 +56,9 @@ private:
// mcu ports
DECLARE_READ8_MEMBER( dev_dsp_data_r );
DECLARE_WRITE8_MEMBER( dev_dsp_data_w );
- DECLARE_READ8_MEMBER( p1_r );
- DECLARE_READ8_MEMBER( p3_r );
- DECLARE_WRITE8_MEMBER( p3_w );
+ uint8_t p1_r();
+ uint8_t p3_r();
+ void p3_w(uint8_t data);
DECLARE_WRITE8_MEMBER( dev_host_irq_w );
DECLARE_WRITE8_MEMBER( raise_drq_w );
DECLARE_WRITE8_MEMBER( port20_w );
diff --git a/src/devices/bus/isa/wdxt_gen.cpp b/src/devices/bus/isa/wdxt_gen.cpp
index 3448589b9a5..b86188d3249 100644
--- a/src/devices/bus/isa/wdxt_gen.cpp
+++ b/src/devices/bus/isa/wdxt_gen.cpp
@@ -118,17 +118,17 @@ WRITE_LINE_MEMBER( wdxt_gen_device::mr_w )
}
}
-READ8_MEMBER( wdxt_gen_device::rd322_r )
+uint8_t wdxt_gen_device::rd322_r()
{
return 0xff;
}
-READ8_MEMBER( wdxt_gen_device::ram_r )
+uint8_t wdxt_gen_device::ram_r(offs_t offset)
{
return m_ram[offset];
}
-WRITE8_MEMBER( wdxt_gen_device::ram_w )
+void wdxt_gen_device::ram_w(offs_t offset, uint8_t data)
{
m_ram[offset] = data;
}
@@ -260,7 +260,7 @@ READ_LINE_MEMBER( wdxt_gen_device::wd1015_t1_r )
// wd1015_p1_r -
//-------------------------------------------------
-READ8_MEMBER( wdxt_gen_device::wd1015_p1_r )
+uint8_t wdxt_gen_device::wd1015_p1_r()
{
/*
@@ -289,7 +289,7 @@ READ8_MEMBER( wdxt_gen_device::wd1015_p1_r )
// wd1015_p1_w -
//-------------------------------------------------
-WRITE8_MEMBER( wdxt_gen_device::wd1015_p1_w )
+void wdxt_gen_device::wd1015_p1_w(uint8_t data)
{
/*
@@ -316,7 +316,7 @@ WRITE8_MEMBER( wdxt_gen_device::wd1015_p1_w )
// wd1015_p2_r -
//-------------------------------------------------
-READ8_MEMBER( wdxt_gen_device::wd1015_p2_r )
+uint8_t wdxt_gen_device::wd1015_p2_r()
{
/*
@@ -347,7 +347,7 @@ READ8_MEMBER( wdxt_gen_device::wd1015_p2_r )
// wd1015_p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( wdxt_gen_device::wd1015_p2_w )
+void wdxt_gen_device::wd1015_p2_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/isa/wdxt_gen.h b/src/devices/bus/isa/wdxt_gen.h
index d909b7bd155..f238f6750a1 100644
--- a/src/devices/bus/isa/wdxt_gen.h
+++ b/src/devices/bus/isa/wdxt_gen.h
@@ -58,14 +58,14 @@ private:
DECLARE_WRITE_LINE_MEMBER( irq5_w );
DECLARE_WRITE_LINE_MEMBER( drq3_w );
DECLARE_WRITE_LINE_MEMBER( mr_w );
- DECLARE_READ8_MEMBER( rd322_r );
- DECLARE_READ8_MEMBER( ram_r );
- DECLARE_WRITE8_MEMBER( ram_w );
+ uint8_t rd322_r();
+ uint8_t ram_r(offs_t offset);
+ void ram_w(offs_t offset, uint8_t data);
DECLARE_READ_LINE_MEMBER( wd1015_t1_r );
- DECLARE_READ8_MEMBER( wd1015_p1_r );
- DECLARE_WRITE8_MEMBER( wd1015_p1_w );
- DECLARE_READ8_MEMBER( wd1015_p2_r );
- DECLARE_WRITE8_MEMBER( wd1015_p2_w );
+ uint8_t wd1015_p1_r();
+ void wd1015_p1_w(uint8_t data);
+ uint8_t wd1015_p2_r();
+ void wd1015_p2_w(uint8_t data);
void wd1015_io(address_map &map);
diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp
index a9d928abd30..8b9795b8fe5 100644
--- a/src/devices/bus/lpci/southbridge.cpp
+++ b/src/devices/bus/lpci/southbridge.cpp
@@ -254,7 +254,7 @@ void southbridge_device::device_reset()
* pic8259 configuration
*
*************************************************************/
-READ8_MEMBER( southbridge_device::get_slave_ack )
+uint8_t southbridge_device::get_slave_ack(offs_t offset)
{
if (offset==2) // IRQ = 2
return m_pic8259_slave->acknowledge();
@@ -411,22 +411,22 @@ void southbridge_device::pc_dma_write_word(offs_t offset, uint8_t data)
}
-READ8_MEMBER( southbridge_device::pc_dma8237_0_dack_r ) { return m_isabus->dack_r(0); }
-READ8_MEMBER( southbridge_device::pc_dma8237_1_dack_r ) { return m_isabus->dack_r(1); }
-READ8_MEMBER( southbridge_device::pc_dma8237_2_dack_r ) { return m_isabus->dack_r(2); }
-READ8_MEMBER( southbridge_device::pc_dma8237_3_dack_r ) { return m_isabus->dack_r(3); }
-READ8_MEMBER( southbridge_device::pc_dma8237_5_dack_r ) { return m_isabus->dack_r(5); }
-READ8_MEMBER( southbridge_device::pc_dma8237_6_dack_r ) { return m_isabus->dack_r(6); }
-READ8_MEMBER( southbridge_device::pc_dma8237_7_dack_r ) { return m_isabus->dack_r(7); }
+uint8_t southbridge_device::pc_dma8237_0_dack_r() { return m_isabus->dack_r(0); }
+uint8_t southbridge_device::pc_dma8237_1_dack_r() { return m_isabus->dack_r(1); }
+uint8_t southbridge_device::pc_dma8237_2_dack_r() { return m_isabus->dack_r(2); }
+uint8_t southbridge_device::pc_dma8237_3_dack_r() { return m_isabus->dack_r(3); }
+uint8_t southbridge_device::pc_dma8237_5_dack_r() { return m_isabus->dack_r(5); }
+uint8_t southbridge_device::pc_dma8237_6_dack_r() { return m_isabus->dack_r(6); }
+uint8_t southbridge_device::pc_dma8237_7_dack_r() { return m_isabus->dack_r(7); }
-WRITE8_MEMBER( southbridge_device::pc_dma8237_0_dack_w ){ m_isabus->dack_w(0, data); }
-WRITE8_MEMBER( southbridge_device::pc_dma8237_1_dack_w ){ m_isabus->dack_w(1, data); }
-WRITE8_MEMBER( southbridge_device::pc_dma8237_2_dack_w ){ m_isabus->dack_w(2, data); }
-WRITE8_MEMBER( southbridge_device::pc_dma8237_3_dack_w ){ m_isabus->dack_w(3, data); }
-WRITE8_MEMBER( southbridge_device::pc_dma8237_5_dack_w ){ m_isabus->dack_w(5, data); }
-WRITE8_MEMBER( southbridge_device::pc_dma8237_6_dack_w ){ m_isabus->dack_w(6, data); }
-WRITE8_MEMBER( southbridge_device::pc_dma8237_7_dack_w ){ m_isabus->dack_w(7, data); }
+void southbridge_device::pc_dma8237_0_dack_w(uint8_t data) { m_isabus->dack_w(0, data); }
+void southbridge_device::pc_dma8237_1_dack_w(uint8_t data) { m_isabus->dack_w(1, data); }
+void southbridge_device::pc_dma8237_2_dack_w(uint8_t data) { m_isabus->dack_w(2, data); }
+void southbridge_device::pc_dma8237_3_dack_w(uint8_t data) { m_isabus->dack_w(3, data); }
+void southbridge_device::pc_dma8237_5_dack_w(uint8_t data) { m_isabus->dack_w(5, data); }
+void southbridge_device::pc_dma8237_6_dack_w(uint8_t data) { m_isabus->dack_w(6, data); }
+void southbridge_device::pc_dma8237_7_dack_w(uint8_t data) { m_isabus->dack_w(7, data); }
WRITE_LINE_MEMBER( southbridge_device::at_dma8237_out_eop )
{
diff --git a/src/devices/bus/lpci/southbridge.h b/src/devices/bus/lpci/southbridge.h
index c5a647acacf..3ffe7033412 100644
--- a/src/devices/bus/lpci/southbridge.h
+++ b/src/devices/bus/lpci/southbridge.h
@@ -88,25 +88,25 @@ private:
DECLARE_READ8_MEMBER(at_portb_r);
DECLARE_WRITE8_MEMBER(at_portb_w);
DECLARE_WRITE_LINE_MEMBER(iochck_w);
- DECLARE_READ8_MEMBER(get_slave_ack);
+ uint8_t get_slave_ack(offs_t offset);
DECLARE_WRITE_LINE_MEMBER(at_pit8254_out0_changed);
DECLARE_WRITE_LINE_MEMBER(at_pit8254_out1_changed);
DECLARE_WRITE_LINE_MEMBER(at_pit8254_out2_changed);
DECLARE_WRITE_LINE_MEMBER(pc_dma_hrq_changed);
- DECLARE_READ8_MEMBER(pc_dma8237_0_dack_r);
- DECLARE_READ8_MEMBER(pc_dma8237_1_dack_r);
- DECLARE_READ8_MEMBER(pc_dma8237_2_dack_r);
- DECLARE_READ8_MEMBER(pc_dma8237_3_dack_r);
- DECLARE_READ8_MEMBER(pc_dma8237_5_dack_r);
- DECLARE_READ8_MEMBER(pc_dma8237_6_dack_r);
- DECLARE_READ8_MEMBER(pc_dma8237_7_dack_r);
- DECLARE_WRITE8_MEMBER(pc_dma8237_0_dack_w);
- DECLARE_WRITE8_MEMBER(pc_dma8237_1_dack_w);
- DECLARE_WRITE8_MEMBER(pc_dma8237_2_dack_w);
- DECLARE_WRITE8_MEMBER(pc_dma8237_3_dack_w);
- DECLARE_WRITE8_MEMBER(pc_dma8237_5_dack_w);
- DECLARE_WRITE8_MEMBER(pc_dma8237_6_dack_w);
- DECLARE_WRITE8_MEMBER(pc_dma8237_7_dack_w);
+ uint8_t pc_dma8237_0_dack_r();
+ uint8_t pc_dma8237_1_dack_r();
+ uint8_t pc_dma8237_2_dack_r();
+ uint8_t pc_dma8237_3_dack_r();
+ uint8_t pc_dma8237_5_dack_r();
+ uint8_t pc_dma8237_6_dack_r();
+ uint8_t pc_dma8237_7_dack_r();
+ void pc_dma8237_0_dack_w(uint8_t data);
+ void pc_dma8237_1_dack_w(uint8_t data);
+ void pc_dma8237_2_dack_w(uint8_t data);
+ void pc_dma8237_3_dack_w(uint8_t data);
+ void pc_dma8237_5_dack_w(uint8_t data);
+ void pc_dma8237_6_dack_w(uint8_t data);
+ void pc_dma8237_7_dack_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(at_dma8237_out_eop);
DECLARE_WRITE_LINE_MEMBER(pc_dack0_w);
DECLARE_WRITE_LINE_MEMBER(pc_dack1_w);
diff --git a/src/devices/bus/macpds/hyperdrive.cpp b/src/devices/bus/macpds/hyperdrive.cpp
index d880ed9ec17..2d6fddbebf2 100644
--- a/src/devices/bus/macpds/hyperdrive.cpp
+++ b/src/devices/bus/macpds/hyperdrive.cpp
@@ -180,12 +180,12 @@ READ16_MEMBER( macpds_hyperdrive_device::hyperdrive_r )
return m_hdc->read(offset);
}
-WRITE8_MEMBER( macpds_hyperdrive_device::hdd_w )
+void macpds_hyperdrive_device::hdd_w(offs_t offset, uint8_t data)
{
// printf("hdd_w: %02x @ %x\n", data, offset);
}
-READ8_MEMBER( macpds_hyperdrive_device::hdd_r )
+uint8_t macpds_hyperdrive_device::hdd_r(offs_t offset)
{
// printf("hdd_r: @ %x\n", offset);
return 0;
diff --git a/src/devices/bus/macpds/hyperdrive.h b/src/devices/bus/macpds/hyperdrive.h
index 9d8000b1c88..7b2d4491212 100644
--- a/src/devices/bus/macpds/hyperdrive.h
+++ b/src/devices/bus/macpds/hyperdrive.h
@@ -42,8 +42,8 @@ private:
DECLARE_READ16_MEMBER(hyperdrive_r);
DECLARE_WRITE16_MEMBER(hyperdrive_w);
- DECLARE_READ8_MEMBER(hdd_r);
- DECLARE_WRITE8_MEMBER(hdd_w);
+ uint8_t hdd_r(offs_t offset);
+ void hdd_w(offs_t offset, uint8_t data);
};
diff --git a/src/devices/bus/multibus/isbc202.cpp b/src/devices/bus/multibus/isbc202.cpp
index 490ed125e97..f526fb1648a 100644
--- a/src/devices/bus/multibus/isbc202.cpp
+++ b/src/devices/bus/multibus/isbc202.cpp
@@ -341,7 +341,7 @@ WRITE_LINE_MEMBER(isbc202_device::co_w)
m_cpes[ 3 ]->li_w(state);
}
-READ8_MEMBER(isbc202_device::px_r)
+uint8_t isbc202_device::px_r()
{
if (BIT(m_px_s1s0 , 0)) {
return m_cmd & 7;
diff --git a/src/devices/bus/multibus/isbc202.h b/src/devices/bus/multibus/isbc202.h
index b72e860b9fc..c16772e0b6c 100644
--- a/src/devices/bus/multibus/isbc202.h
+++ b/src/devices/bus/multibus/isbc202.h
@@ -37,7 +37,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(co_w);
- DECLARE_READ8_MEMBER(px_r);
+ uint8_t px_r();
protected:
// device_t overrides
diff --git a/src/devices/bus/nubus/nubus_asntmc3b.cpp b/src/devices/bus/nubus/nubus_asntmc3b.cpp
index 2da81f791db..a96dbcfc655 100644
--- a/src/devices/bus/nubus/nubus_asntmc3b.cpp
+++ b/src/devices/bus/nubus/nubus_asntmc3b.cpp
@@ -145,12 +145,12 @@ WRITE32_MEMBER( nubus_mac8390_device::en_w )
if (mem_mask == 0xff000000)
{
// printf("%02x to 8390 @ %x\n", data>>24, 0xf-offset);
- m_dp83902->dp8390_w(space, 0xf-offset, data>>24);
+ m_dp83902->dp8390_w(0xf-offset, data>>24);
}
else if (mem_mask == 0xffff0000)
{
m_dp83902->dp8390_cs(1);
- m_dp83902->dp8390_w(space, 0xf-offset, data>>16);
+ m_dp83902->dp8390_w(0xf-offset, data>>16);
m_dp83902->dp8390_cs(0);
}
else
@@ -163,12 +163,12 @@ READ32_MEMBER( nubus_mac8390_device::en_r )
{
if (mem_mask == 0xff000000)
{
- return (m_dp83902->dp8390_r(space, 0xf-offset)<<24);
+ return (m_dp83902->dp8390_r(0xf-offset)<<24);
}
else if (mem_mask == 0xffff0000)
{
m_dp83902->dp8390_cs(1);
- return (m_dp83902->dp8390_r(space, 0xf-offset)<<16);
+ return (m_dp83902->dp8390_r(0xf-offset)<<16);
m_dp83902->dp8390_cs(0);
}
else
@@ -191,13 +191,13 @@ WRITE_LINE_MEMBER( nubus_mac8390_device::dp_irq_w )
}
}
-READ8_MEMBER( nubus_mac8390_device::dp_mem_read )
+uint8_t nubus_mac8390_device::dp_mem_read(offs_t offset)
{
// printf("MC3NB: 8390 read RAM @ %x = %02x\n", offset, m_ram[offset]);
return m_ram[offset];
}
-WRITE8_MEMBER( nubus_mac8390_device::dp_mem_write )
+void nubus_mac8390_device::dp_mem_write(offs_t offset, uint8_t data)
{
// printf("MC3NB: 8390 wrote %02x to RAM @ %x\n", data, offset);
m_ram[offset] = data;
diff --git a/src/devices/bus/nubus/nubus_asntmc3b.h b/src/devices/bus/nubus/nubus_asntmc3b.h
index 7b1ee196a13..177cf30900b 100644
--- a/src/devices/bus/nubus/nubus_asntmc3b.h
+++ b/src/devices/bus/nubus/nubus_asntmc3b.h
@@ -39,8 +39,8 @@ protected:
private:
void dp_irq_w(int state);
- DECLARE_READ8_MEMBER(dp_mem_read);
- DECLARE_WRITE8_MEMBER(dp_mem_write);
+ uint8_t dp_mem_read(offs_t offset);
+ void dp_mem_write(offs_t offset, uint8_t data);
uint8_t m_ram[0x20000];
uint8_t m_prom[16];
diff --git a/src/devices/bus/pc_kbd/ec1841.cpp b/src/devices/bus/pc_kbd/ec1841.cpp
index 2a36345e1fa..a7cc897cb8a 100644
--- a/src/devices/bus/pc_kbd/ec1841.cpp
+++ b/src/devices/bus/pc_kbd/ec1841.cpp
@@ -344,7 +344,7 @@ WRITE_LINE_MEMBER( ec_1841_keyboard_device::data_write )
// bus_w -
//-------------------------------------------------
-WRITE8_MEMBER( ec_1841_keyboard_device::bus_w )
+void ec_1841_keyboard_device::bus_w(uint8_t data)
{
LOGDBG("bus_w %02x\n", data);
@@ -356,7 +356,7 @@ WRITE8_MEMBER( ec_1841_keyboard_device::bus_w )
// p1_r -
//-------------------------------------------------
-READ8_MEMBER( ec_1841_keyboard_device::p1_r )
+uint8_t ec_1841_keyboard_device::p1_r()
{
/*
@@ -388,7 +388,7 @@ READ8_MEMBER( ec_1841_keyboard_device::p1_r )
// p1_w -
//-------------------------------------------------
-WRITE8_MEMBER( ec_1841_keyboard_device::p1_w )
+void ec_1841_keyboard_device::p1_w(uint8_t data)
{
/*
bit description
@@ -412,7 +412,7 @@ WRITE8_MEMBER( ec_1841_keyboard_device::p1_w )
// p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( ec_1841_keyboard_device::p2_w )
+void ec_1841_keyboard_device::p2_w(uint8_t data)
{
/*
bit description
diff --git a/src/devices/bus/pc_kbd/ec1841.h b/src/devices/bus/pc_kbd/ec1841.h
index 72e9dc639d0..08309b35d9e 100644
--- a/src/devices/bus/pc_kbd/ec1841.h
+++ b/src/devices/bus/pc_kbd/ec1841.h
@@ -43,10 +43,10 @@ protected:
virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override;
private:
- DECLARE_WRITE8_MEMBER( bus_w );
- DECLARE_READ8_MEMBER( p1_r );
- DECLARE_WRITE8_MEMBER( p1_w );
- DECLARE_WRITE8_MEMBER( p2_w );
+ void bus_w(uint8_t data);
+ uint8_t p1_r();
+ void p1_w(uint8_t data);
+ void p2_w(uint8_t data);
DECLARE_READ_LINE_MEMBER( t1_r );
required_device<i8048_device> m_maincpu;
diff --git a/src/devices/bus/pc_kbd/iskr1030.cpp b/src/devices/bus/pc_kbd/iskr1030.cpp
index 3f91451d9ab..9835b4ca7fb 100644
--- a/src/devices/bus/pc_kbd/iskr1030.cpp
+++ b/src/devices/bus/pc_kbd/iskr1030.cpp
@@ -417,7 +417,7 @@ READ8_MEMBER( iskr_1030_keyboard_device::ram_r )
// p1_r -
//-------------------------------------------------
-READ8_MEMBER( iskr_1030_keyboard_device::p1_r )
+uint8_t iskr_1030_keyboard_device::p1_r()
{
/*
bit description
@@ -444,7 +444,7 @@ READ8_MEMBER( iskr_1030_keyboard_device::p1_r )
// p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( iskr_1030_keyboard_device::p2_w )
+void iskr_1030_keyboard_device::p2_w(uint8_t data)
{
/*
bit description
@@ -468,7 +468,7 @@ WRITE8_MEMBER( iskr_1030_keyboard_device::p2_w )
// p1_w - OK
//-------------------------------------------------
-WRITE8_MEMBER( iskr_1030_keyboard_device::p1_w )
+void iskr_1030_keyboard_device::p1_w(uint8_t data)
{
/*
bit description
diff --git a/src/devices/bus/pc_kbd/iskr1030.h b/src/devices/bus/pc_kbd/iskr1030.h
index 0bc0796360f..358934b87a8 100644
--- a/src/devices/bus/pc_kbd/iskr1030.h
+++ b/src/devices/bus/pc_kbd/iskr1030.h
@@ -44,9 +44,9 @@ protected:
virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override;
private:
- DECLARE_READ8_MEMBER( p1_r );
- DECLARE_WRITE8_MEMBER( p1_w );
- DECLARE_WRITE8_MEMBER( p2_w );
+ uint8_t p1_r();
+ void p1_w(uint8_t data);
+ void p2_w(uint8_t data);
DECLARE_READ_LINE_MEMBER( t1_r );
DECLARE_READ8_MEMBER( ram_r );
diff --git a/src/devices/bus/pc_kbd/keytro.cpp b/src/devices/bus/pc_kbd/keytro.cpp
index 72149e8ddea..6d80655c236 100644
--- a/src/devices/bus/pc_kbd/keytro.cpp
+++ b/src/devices/bus/pc_kbd/keytro.cpp
@@ -585,13 +585,13 @@ WRITE8_MEMBER( pc_kbd_keytronic_pc3270_device::internal_data_write )
}
-READ8_MEMBER( pc_kbd_keytronic_pc3270_device::p1_read )
+uint8_t pc_kbd_keytronic_pc3270_device::p1_read()
{
return m_p1 & m_p1_data;
}
-WRITE8_MEMBER( pc_kbd_keytronic_pc3270_device::p1_write )
+void pc_kbd_keytronic_pc3270_device::p1_write(uint8_t data)
{
if (LOG)
logerror("keytronic_pc3270::p1_write(): write %02x\n", data);
@@ -600,13 +600,13 @@ WRITE8_MEMBER( pc_kbd_keytronic_pc3270_device::p1_write )
}
-READ8_MEMBER( pc_kbd_keytronic_pc3270_device::p2_read )
+uint8_t pc_kbd_keytronic_pc3270_device::p2_read()
{
return m_p2;
}
-WRITE8_MEMBER( pc_kbd_keytronic_pc3270_device::p2_write )
+void pc_kbd_keytronic_pc3270_device::p2_write(uint8_t data)
{
if (LOG)
logerror("keytronic_pc3270::p2_write(): write %02x\n", data);
@@ -615,7 +615,7 @@ WRITE8_MEMBER( pc_kbd_keytronic_pc3270_device::p2_write )
}
-READ8_MEMBER( pc_kbd_keytronic_pc3270_device::p3_read )
+uint8_t pc_kbd_keytronic_pc3270_device::p3_read()
{
uint8_t data = m_p3;
@@ -628,7 +628,7 @@ READ8_MEMBER( pc_kbd_keytronic_pc3270_device::p3_read )
}
-WRITE8_MEMBER( pc_kbd_keytronic_pc3270_device::p3_write )
+void pc_kbd_keytronic_pc3270_device::p3_write(uint8_t data)
{
if (LOG)
logerror("keytronic_pc3270::p3_write(): write %02x\n", data);
diff --git a/src/devices/bus/pc_kbd/keytro.h b/src/devices/bus/pc_kbd/keytro.h
index c1e86e92f82..3adcaf4aa8f 100644
--- a/src/devices/bus/pc_kbd/keytro.h
+++ b/src/devices/bus/pc_kbd/keytro.h
@@ -49,12 +49,12 @@ protected:
DECLARE_READ8_MEMBER( internal_data_read );
DECLARE_WRITE8_MEMBER( internal_data_write );
- DECLARE_READ8_MEMBER( p1_read );
- DECLARE_WRITE8_MEMBER( p1_write );
- DECLARE_READ8_MEMBER( p2_read );
- DECLARE_WRITE8_MEMBER( p2_write );
- DECLARE_READ8_MEMBER( p3_read );
- DECLARE_WRITE8_MEMBER( p3_write );
+ uint8_t p1_read();
+ void p1_write(uint8_t data);
+ uint8_t p2_read();
+ void p2_write(uint8_t data);
+ uint8_t p3_read();
+ void p3_write(uint8_t data);
void keytronic_pc3270_io(address_map &map);
void keytronic_pc3270_program(address_map &map);
diff --git a/src/devices/bus/pc_kbd/msnat.cpp b/src/devices/bus/pc_kbd/msnat.cpp
index 67919240d72..058a1ef39ff 100644
--- a/src/devices/bus/pc_kbd/msnat.cpp
+++ b/src/devices/bus/pc_kbd/msnat.cpp
@@ -282,7 +282,7 @@ WRITE_LINE_MEMBER( pc_kbd_microsoft_natural_device::data_write )
}
-READ8_MEMBER( pc_kbd_microsoft_natural_device::p0_read )
+uint8_t pc_kbd_microsoft_natural_device::p0_read()
{
uint8_t data = 0xFF;
@@ -341,25 +341,25 @@ READ8_MEMBER( pc_kbd_microsoft_natural_device::p0_read )
}
-WRITE8_MEMBER( pc_kbd_microsoft_natural_device::p0_write )
+void pc_kbd_microsoft_natural_device::p0_write(uint8_t data)
{
m_p0 = data;
}
-WRITE8_MEMBER( pc_kbd_microsoft_natural_device::p1_write )
+void pc_kbd_microsoft_natural_device::p1_write(uint8_t data)
{
m_p1 = data;
}
-WRITE8_MEMBER( pc_kbd_microsoft_natural_device::p2_write )
+void pc_kbd_microsoft_natural_device::p2_write(uint8_t data)
{
m_p2 = data;
}
-READ8_MEMBER( pc_kbd_microsoft_natural_device::p3_read )
+uint8_t pc_kbd_microsoft_natural_device::p3_read()
{
uint8_t data = m_p3 & ~0x21;
@@ -373,7 +373,7 @@ READ8_MEMBER( pc_kbd_microsoft_natural_device::p3_read )
}
-WRITE8_MEMBER( pc_kbd_microsoft_natural_device::p3_write )
+void pc_kbd_microsoft_natural_device::p3_write(uint8_t data)
{
if ( m_pc_kbdc )
{
diff --git a/src/devices/bus/pc_kbd/msnat.h b/src/devices/bus/pc_kbd/msnat.h
index d4453c8b64d..6ec5327675e 100644
--- a/src/devices/bus/pc_kbd/msnat.h
+++ b/src/devices/bus/pc_kbd/msnat.h
@@ -49,12 +49,12 @@ private:
uint8_t m_p2;
uint8_t m_p3;
- DECLARE_READ8_MEMBER(p0_read);
- DECLARE_WRITE8_MEMBER(p0_write);
- DECLARE_WRITE8_MEMBER(p1_write);
- DECLARE_WRITE8_MEMBER(p2_write);
- DECLARE_READ8_MEMBER(p3_read);
- DECLARE_WRITE8_MEMBER(p3_write);
+ uint8_t p0_read();
+ void p0_write(uint8_t data);
+ void p1_write(uint8_t data);
+ void p2_write(uint8_t data);
+ uint8_t p3_read();
+ void p3_write(uint8_t data);
};
diff --git a/src/devices/bus/pc_kbd/pc83.cpp b/src/devices/bus/pc_kbd/pc83.cpp
index 9cfc3ee31e0..5e214660257 100644
--- a/src/devices/bus/pc_kbd/pc83.cpp
+++ b/src/devices/bus/pc_kbd/pc83.cpp
@@ -265,7 +265,7 @@ void ibm_pc_83_keyboard_device::device_reset()
// bus_w -
//-------------------------------------------------
-WRITE8_MEMBER( ibm_pc_83_keyboard_device::bus_w )
+void ibm_pc_83_keyboard_device::bus_w(uint8_t data)
{
/*
@@ -290,7 +290,7 @@ WRITE8_MEMBER( ibm_pc_83_keyboard_device::bus_w )
// p1_r -
//-------------------------------------------------
-READ8_MEMBER( ibm_pc_83_keyboard_device::p1_r )
+uint8_t ibm_pc_83_keyboard_device::p1_r()
{
/*
@@ -320,7 +320,7 @@ READ8_MEMBER( ibm_pc_83_keyboard_device::p1_r )
// p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( ibm_pc_83_keyboard_device::p2_w )
+void ibm_pc_83_keyboard_device::p2_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/pc_kbd/pc83.h b/src/devices/bus/pc_kbd/pc83.h
index 6b800c7b8a0..1401a96ff13 100644
--- a/src/devices/bus/pc_kbd/pc83.h
+++ b/src/devices/bus/pc_kbd/pc83.h
@@ -45,9 +45,9 @@ protected:
virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override { };
private:
- DECLARE_WRITE8_MEMBER( bus_w );
- DECLARE_READ8_MEMBER( p1_r );
- DECLARE_WRITE8_MEMBER( p2_w );
+ void bus_w(uint8_t data);
+ uint8_t p1_r();
+ void p2_w(uint8_t data);
DECLARE_READ_LINE_MEMBER( t0_r );
required_device<i8048_device> m_maincpu;
diff --git a/src/devices/bus/pc_kbd/pcat84.cpp b/src/devices/bus/pc_kbd/pcat84.cpp
index 47cb48496e9..a3796a7408a 100644
--- a/src/devices/bus/pc_kbd/pcat84.cpp
+++ b/src/devices/bus/pc_kbd/pcat84.cpp
@@ -395,7 +395,7 @@ void ibm_pc_at_84_keyboard_device::device_reset()
// bus_w -
//-------------------------------------------------
-WRITE8_MEMBER( ibm_pc_at_84_keyboard_device::bus_w )
+void ibm_pc_at_84_keyboard_device::bus_w(uint8_t data)
{
/*
@@ -425,7 +425,7 @@ WRITE8_MEMBER( ibm_pc_at_84_keyboard_device::bus_w )
// p1_r -
//-------------------------------------------------
-READ8_MEMBER( ibm_pc_at_84_keyboard_device::p1_r )
+uint8_t ibm_pc_at_84_keyboard_device::p1_r()
{
/*
@@ -454,7 +454,7 @@ READ8_MEMBER( ibm_pc_at_84_keyboard_device::p1_r )
// p1_w -
//-------------------------------------------------
-WRITE8_MEMBER( ibm_pc_at_84_keyboard_device::p1_w )
+void ibm_pc_at_84_keyboard_device::p1_w(uint8_t data)
{
/*
@@ -484,7 +484,7 @@ WRITE8_MEMBER( ibm_pc_at_84_keyboard_device::p1_w )
// p2_r -
//-------------------------------------------------
-READ8_MEMBER( ibm_pc_at_84_keyboard_device::p2_r )
+uint8_t ibm_pc_at_84_keyboard_device::p2_r()
{
/*
@@ -513,7 +513,7 @@ READ8_MEMBER( ibm_pc_at_84_keyboard_device::p2_r )
// p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( ibm_pc_at_84_keyboard_device::p2_w )
+void ibm_pc_at_84_keyboard_device::p2_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/pc_kbd/pcat84.h b/src/devices/bus/pc_kbd/pcat84.h
index 2ed3fcc2b7c..7ddb9494e78 100644
--- a/src/devices/bus/pc_kbd/pcat84.h
+++ b/src/devices/bus/pc_kbd/pcat84.h
@@ -47,11 +47,11 @@ protected:
virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override { };
private:
- DECLARE_WRITE8_MEMBER( bus_w );
- DECLARE_READ8_MEMBER( p1_r );
- DECLARE_WRITE8_MEMBER( p1_w );
- DECLARE_READ8_MEMBER( p2_r );
- DECLARE_WRITE8_MEMBER( p2_w );
+ void bus_w(uint8_t data);
+ uint8_t p1_r();
+ void p1_w(uint8_t data);
+ uint8_t p2_r();
+ void p2_w(uint8_t data);
DECLARE_READ_LINE_MEMBER( t0_r );
DECLARE_READ_LINE_MEMBER( t1_r );
diff --git a/src/devices/bus/pc_kbd/pcxt83.cpp b/src/devices/bus/pc_kbd/pcxt83.cpp
index 366ef89332f..728d858845f 100644
--- a/src/devices/bus/pc_kbd/pcxt83.cpp
+++ b/src/devices/bus/pc_kbd/pcxt83.cpp
@@ -293,9 +293,9 @@ WRITE_LINE_MEMBER( ibm_pc_xt_83_keyboard_device::data_write )
// bus_r -
//-------------------------------------------------
-READ8_MEMBER( ibm_pc_xt_83_keyboard_device::bus_r )
+uint8_t ibm_pc_xt_83_keyboard_device::bus_r()
{
- // HACK this should be handled in mcs48.c
+ // HACK this should be handled in mcs48.cpp
return m_bus;
}
@@ -304,7 +304,7 @@ READ8_MEMBER( ibm_pc_xt_83_keyboard_device::bus_r )
// bus_w -
//-------------------------------------------------
-WRITE8_MEMBER( ibm_pc_xt_83_keyboard_device::bus_w )
+void ibm_pc_xt_83_keyboard_device::bus_w(uint8_t data)
{
/*
@@ -352,7 +352,7 @@ WRITE8_MEMBER( ibm_pc_xt_83_keyboard_device::bus_w )
// p1_w -
//-------------------------------------------------
-WRITE8_MEMBER( ibm_pc_xt_83_keyboard_device::p1_w )
+void ibm_pc_xt_83_keyboard_device::p1_w(uint8_t data)
{
/*
@@ -377,7 +377,7 @@ WRITE8_MEMBER( ibm_pc_xt_83_keyboard_device::p1_w )
// p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( ibm_pc_xt_83_keyboard_device::p2_w )
+void ibm_pc_xt_83_keyboard_device::p2_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/pc_kbd/pcxt83.h b/src/devices/bus/pc_kbd/pcxt83.h
index d2e7175e8c4..6044141610e 100644
--- a/src/devices/bus/pc_kbd/pcxt83.h
+++ b/src/devices/bus/pc_kbd/pcxt83.h
@@ -44,10 +44,10 @@ protected:
virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override;
private:
- DECLARE_READ8_MEMBER( bus_r );
- DECLARE_WRITE8_MEMBER( bus_w );
- DECLARE_WRITE8_MEMBER( p1_w );
- DECLARE_WRITE8_MEMBER( p2_w );
+ uint8_t bus_r();
+ void bus_w(uint8_t data);
+ void p1_w(uint8_t data);
+ void p2_w(uint8_t data);
DECLARE_READ_LINE_MEMBER( t0_r );
DECLARE_READ_LINE_MEMBER( t1_r );
diff --git a/src/devices/bus/sg1000_exp/sk1100.cpp b/src/devices/bus/sg1000_exp/sk1100.cpp
index 1bb0a01adfd..c02b86d5994 100644
--- a/src/devices/bus/sg1000_exp/sk1100.cpp
+++ b/src/devices/bus/sg1000_exp/sk1100.cpp
@@ -235,7 +235,7 @@ bool sega_sk1100_device::is_readable(uint8_t offset)
I8255 INTERFACE
-------------------------------------------------*/
-READ8_MEMBER( sega_sk1100_device::ppi_pa_r )
+uint8_t sega_sk1100_device::ppi_pa_r()
{
/*
Signal Description
@@ -253,7 +253,7 @@ READ8_MEMBER( sega_sk1100_device::ppi_pa_r )
return m_pa[m_keylatch]->read();
}
-READ8_MEMBER( sega_sk1100_device::ppi_pb_r )
+uint8_t sega_sk1100_device::ppi_pb_r()
{
/*
Signal Description
@@ -284,7 +284,7 @@ READ8_MEMBER( sega_sk1100_device::ppi_pb_r )
return data;
}
-WRITE8_MEMBER( sega_sk1100_device::ppi_pc_w )
+void sega_sk1100_device::ppi_pc_w(uint8_t data)
{
/*
Signal Description
diff --git a/src/devices/bus/sg1000_exp/sk1100.h b/src/devices/bus/sg1000_exp/sk1100.h
index 13ff5780f64..0fa78b06af7 100644
--- a/src/devices/bus/sg1000_exp/sk1100.h
+++ b/src/devices/bus/sg1000_exp/sk1100.h
@@ -49,9 +49,9 @@ protected:
virtual bool is_readable(uint8_t offset) override;
private:
- DECLARE_READ8_MEMBER( ppi_pa_r );
- DECLARE_READ8_MEMBER( ppi_pb_r );
- DECLARE_WRITE8_MEMBER( ppi_pc_w );
+ uint8_t ppi_pa_r();
+ uint8_t ppi_pb_r();
+ void ppi_pc_w(uint8_t data);
required_device<cassette_image_device> m_cassette;
required_device<i8255_device> m_ppi;
diff --git a/src/devices/bus/spc1000/fdd.cpp b/src/devices/bus/spc1000/fdd.cpp
index d89035df9c1..531010349e8 100644
--- a/src/devices/bus/spc1000/fdd.cpp
+++ b/src/devices/bus/spc1000/fdd.cpp
@@ -14,17 +14,17 @@
IMPLEMENTATION
***************************************************************************/
-READ8_MEMBER(spc1000_fdd_exp_device::i8255_c_r)
+uint8_t spc1000_fdd_exp_device::i8255_c_r()
{
return m_i8255_0_pc >> 4;
}
-WRITE8_MEMBER(spc1000_fdd_exp_device::i8255_b_w)
+void spc1000_fdd_exp_device::i8255_b_w(uint8_t data)
{
m_i8255_portb = data;
}
-WRITE8_MEMBER(spc1000_fdd_exp_device::i8255_c_w)
+void spc1000_fdd_exp_device::i8255_c_w(uint8_t data)
{
m_i8255_1_pc = data;
}
diff --git a/src/devices/bus/spc1000/fdd.h b/src/devices/bus/spc1000/fdd.h
index 93994369efe..3b3ef8bb00b 100644
--- a/src/devices/bus/spc1000/fdd.h
+++ b/src/devices/bus/spc1000/fdd.h
@@ -51,9 +51,9 @@ private:
uint8_t m_i8255_1_pc;
uint8_t m_i8255_portb;
- DECLARE_WRITE8_MEMBER(i8255_b_w);
- DECLARE_READ8_MEMBER(i8255_c_r);
- DECLARE_WRITE8_MEMBER(i8255_c_w);
+ void i8255_b_w(uint8_t data);
+ uint8_t i8255_c_r();
+ void i8255_c_w(uint8_t data);
DECLARE_READ8_MEMBER(tc_r);
DECLARE_WRITE8_MEMBER(control_w);
diff --git a/src/devices/bus/spectrum/opus.cpp b/src/devices/bus/spectrum/opus.cpp
index 88eb2deb6a3..6b50fefeb01 100644
--- a/src/devices/bus/spectrum/opus.cpp
+++ b/src/devices/bus/spectrum/opus.cpp
@@ -255,7 +255,7 @@ void spectrum_opus_device::mreq_w(offs_t offset, uint8_t data)
m_exp->mreq_w(offset, data);
}
-WRITE8_MEMBER(spectrum_opus_device::pia_out_a)
+void spectrum_opus_device::pia_out_a(uint8_t data)
{
floppy_image_device *floppy = nullptr;
@@ -272,7 +272,7 @@ WRITE8_MEMBER(spectrum_opus_device::pia_out_a)
m_fdc->dden_w(BIT(data, 5));
}
-WRITE8_MEMBER(spectrum_opus_device::pia_out_b)
+void spectrum_opus_device::pia_out_b(uint8_t data)
{
m_centronics->write_data1(BIT(data, 1));
m_centronics->write_data2(BIT(data, 2));
diff --git a/src/devices/bus/spectrum/opus.h b/src/devices/bus/spectrum/opus.h
index 62e4e640b58..43fc404d9b3 100644
--- a/src/devices/bus/spectrum/opus.h
+++ b/src/devices/bus/spectrum/opus.h
@@ -50,8 +50,8 @@ protected:
virtual DECLARE_READ_LINE_MEMBER(romcs) override;
private:
- DECLARE_WRITE8_MEMBER(pia_out_a);
- DECLARE_WRITE8_MEMBER(pia_out_b);
+ void pia_out_a(uint8_t data);
+ void pia_out_b(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(busy_w);
required_ioport m_joy;
diff --git a/src/devices/bus/ss50/mpt.cpp b/src/devices/bus/ss50/mpt.cpp
index 95735b3ae1d..4664f72a047 100644
--- a/src/devices/bus/ss50/mpt.cpp
+++ b/src/devices/bus/ss50/mpt.cpp
@@ -35,8 +35,8 @@ protected:
virtual void register_write(offs_t offset, u8 data) override;
private:
- DECLARE_WRITE8_MEMBER(pia_b_w);
- DECLARE_READ8_MEMBER(pia_cb1_r);
+ void pia_b_w(uint8_t data);
+ uint8_t pia_cb1_r();
DECLARE_WRITE_LINE_MEMBER(pia_irq_b);
TIMER_CALLBACK_MEMBER(mpt_timer_callback);
DECLARE_WRITE_LINE_MEMBER(pia_irqa_w);
@@ -115,7 +115,7 @@ void ss50_mpt_device::register_write(offs_t offset, u8 data)
}
-WRITE8_MEMBER(ss50_mpt_device::pia_b_w)
+void ss50_mpt_device::pia_b_w(uint8_t data)
{
if (data & 0x80)
{
@@ -171,7 +171,7 @@ WRITE8_MEMBER(ss50_mpt_device::pia_b_w)
m_mpt_timer->enable(true);
}
-READ8_MEMBER(ss50_mpt_device::pia_cb1_r)
+uint8_t ss50_mpt_device::pia_cb1_r()
{
return m_mpt_timer_state;
}
diff --git a/src/devices/bus/ss50/piaide.cpp b/src/devices/bus/ss50/piaide.cpp
index afedc512934..a8ac76efdf6 100644
--- a/src/devices/bus/ss50/piaide.cpp
+++ b/src/devices/bus/ss50/piaide.cpp
@@ -73,10 +73,10 @@ private:
uint8_t m_pia_porta;
uint8_t m_pia_portb;
- DECLARE_READ8_MEMBER(pia_a_r);
- DECLARE_READ8_MEMBER(pia_b_r);
- DECLARE_WRITE8_MEMBER(pia_a_w);
- DECLARE_WRITE8_MEMBER(pia_b_w);
+ uint8_t pia_a_r();
+ uint8_t pia_b_r();
+ void pia_a_w(uint8_t data);
+ void pia_b_w(uint8_t data);
};
@@ -123,22 +123,22 @@ void ss50_piaide_device::register_write(offs_t offset, uint8_t data)
/******* MC6821 PIA on IDE Board *******/
/* Read/Write handlers for pia ide */
-READ8_MEMBER( ss50_piaide_device::pia_a_r )
+uint8_t ss50_piaide_device::pia_a_r()
{
return m_pia_porta;
}
-READ8_MEMBER( ss50_piaide_device::pia_b_r )
+uint8_t ss50_piaide_device::pia_b_r()
{
return m_pia_portb;
}
-WRITE8_MEMBER( ss50_piaide_device::pia_a_w )
+void ss50_piaide_device::pia_a_w(uint8_t data)
{
m_pia_porta = data;
}
-WRITE8_MEMBER( ss50_piaide_device::pia_b_w )
+void ss50_piaide_device::pia_b_w(uint8_t data)
{
uint16_t tempidedata;
diff --git a/src/devices/bus/tanbus/mpvdu.cpp b/src/devices/bus/tanbus/mpvdu.cpp
index d172c93cae0..e9f4fe766eb 100644
--- a/src/devices/bus/tanbus/mpvdu.cpp
+++ b/src/devices/bus/tanbus/mpvdu.cpp
@@ -142,7 +142,7 @@ void tanbus_mpvdu_device::set_inhibit_lines(offs_t offset, int &inhram, int &inh
// IMPLEMENTATION
//**************************************************************************
-READ8_MEMBER(tanbus_mpvdu_device::videoram_r)
+uint8_t tanbus_mpvdu_device::videoram_r(offs_t offset)
{
return m_videoram[offset];
}
diff --git a/src/devices/bus/tanbus/mpvdu.h b/src/devices/bus/tanbus/mpvdu.h
index c4c48b96199..ddde01e0611 100644
--- a/src/devices/bus/tanbus/mpvdu.h
+++ b/src/devices/bus/tanbus/mpvdu.h
@@ -43,7 +43,7 @@ protected:
virtual void set_inhibit_lines(offs_t offset, int &inhram, int &inhrom) override;
private:
- DECLARE_READ8_MEMBER(videoram_r);
+ uint8_t videoram_r(offs_t offset);
MC6845_UPDATE_ROW(crtc_update_row);
DECLARE_WRITE_LINE_MEMBER(vsync_changed);
diff --git a/src/devices/bus/tanbus/ravdu.cpp b/src/devices/bus/tanbus/ravdu.cpp
index 2a53497d079..80664797081 100644
--- a/src/devices/bus/tanbus/ravdu.cpp
+++ b/src/devices/bus/tanbus/ravdu.cpp
@@ -154,7 +154,7 @@ void tanbus_ravdu_device::set_inhibit_lines(offs_t offset, int &inhram, int &inh
// IMPLEMENTATION
//**************************************************************************
-READ8_MEMBER(tanbus_ravdu_device::videoram_r)
+uint8_t tanbus_ravdu_device::videoram_r(offs_t offset)
{
return m_videoram[offset & 0x7ff];
}
diff --git a/src/devices/bus/tanbus/ravdu.h b/src/devices/bus/tanbus/ravdu.h
index 4817abb78f4..f21dc73c4f5 100644
--- a/src/devices/bus/tanbus/ravdu.h
+++ b/src/devices/bus/tanbus/ravdu.h
@@ -44,7 +44,7 @@ protected:
virtual void set_inhibit_lines(offs_t offset, int &inhram, int &inhrom) override;
private:
- DECLARE_READ8_MEMBER(videoram_r);
+ uint8_t videoram_r(offs_t offset);
MC6845_UPDATE_ROW(crtc_update_row);
DECLARE_WRITE_LINE_MEMBER(vsync_changed);
diff --git a/src/devices/bus/tanbus/tanex.cpp b/src/devices/bus/tanbus/tanex.cpp
index 1670040da1b..cf9fd8b893d 100644
--- a/src/devices/bus/tanbus/tanex.cpp
+++ b/src/devices/bus/tanbus/tanex.cpp
@@ -380,19 +380,19 @@ WRITE_LINE_MEMBER(tanbus_tanex_device::bus_irq_w)
// VIA callback functions for VIA #0
//**************************************************************
-READ8_MEMBER(tanbus_tanex_device::via_0_in_a)
+uint8_t tanbus_tanex_device::via_0_in_a()
{
int data = ioport("JOY")->read();
LOG("via_0_in_a %02X\n", data);
return data;
}
-WRITE8_MEMBER(tanbus_tanex_device::via_0_out_a)
+void tanbus_tanex_device::via_0_out_a(uint8_t data)
{
LOG("via_0_out_a %02X\n", data);
}
-WRITE8_MEMBER(tanbus_tanex_device::via_0_out_b)
+void tanbus_tanex_device::via_0_out_b(uint8_t data)
{
LOG("via_0_out_b %02X\n", data);
/* bit #5 is the replay cassette drive */
@@ -415,12 +415,12 @@ WRITE_LINE_MEMBER(tanbus_tanex_device::via_0_out_cb2)
// VIA callback functions for VIA #1
//**************************************************************
-WRITE8_MEMBER(tanbus_tanex_device::via_1_out_a)
+void tanbus_tanex_device::via_1_out_a(uint8_t data)
{
LOG("via_1_out_a %02X\n", data);
}
-WRITE8_MEMBER(tanbus_tanex_device::via_1_out_b)
+void tanbus_tanex_device::via_1_out_b(uint8_t data)
{
LOG("via_1_out_b %02X\n", data);
}
diff --git a/src/devices/bus/tanbus/tanex.h b/src/devices/bus/tanbus/tanex.h
index 757e75f0224..ec3f75fb344 100644
--- a/src/devices/bus/tanbus/tanex.h
+++ b/src/devices/bus/tanbus/tanex.h
@@ -53,13 +53,13 @@ private:
DECLARE_WRITE_LINE_MEMBER(bus_irq_w);
DECLARE_WRITE_LINE_MEMBER(bus_so_w);
TIMER_DEVICE_CALLBACK_MEMBER(read_cassette);
- DECLARE_READ8_MEMBER(via_0_in_a);
- DECLARE_WRITE8_MEMBER(via_0_out_a);
- DECLARE_WRITE8_MEMBER(via_0_out_b);
+ uint8_t via_0_in_a();
+ void via_0_out_a(uint8_t data);
+ void via_0_out_b(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(via_0_out_ca2);
DECLARE_WRITE_LINE_MEMBER(via_0_out_cb2);
- DECLARE_WRITE8_MEMBER(via_1_out_a);
- DECLARE_WRITE8_MEMBER(via_1_out_b);
+ void via_1_out_a(uint8_t data);
+ void via_1_out_b(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(via_1_out_ca2);
DECLARE_WRITE_LINE_MEMBER(via_1_out_cb2);
diff --git a/src/devices/bus/ti99/peb/cc_fdc.cpp b/src/devices/bus/ti99/peb/cc_fdc.cpp
index d26ae2604a9..e9f663e48aa 100644
--- a/src/devices/bus/ti99/peb/cc_fdc.cpp
+++ b/src/devices/bus/ti99/peb/cc_fdc.cpp
@@ -286,7 +286,7 @@ WRITE_LINE_MEMBER( corcomp_fdc_device::clock_in )
m_tms9901->phi_line(state);
}
-READ8_MEMBER( corcomp_fdc_device::tms9901_input )
+uint8_t corcomp_fdc_device::tms9901_input(offs_t offset)
{
// Inputs
// INT1: Switch 8
diff --git a/src/devices/bus/ti99/peb/cc_fdc.h b/src/devices/bus/ti99/peb/cc_fdc.h
index 116604e8857..2fb3d806af7 100644
--- a/src/devices/bus/ti99/peb/cc_fdc.h
+++ b/src/devices/bus/ti99/peb/cc_fdc.h
@@ -49,7 +49,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( fdc_irq_w );
DECLARE_WRITE_LINE_MEMBER( fdc_drq_w );
DECLARE_WRITE_LINE_MEMBER( fdc_hld_w );
- DECLARE_READ8_MEMBER( tms9901_input );
+ uint8_t tms9901_input(offs_t offset);
DECLARE_WRITE_LINE_MEMBER( select_dsk );
DECLARE_WRITE_LINE_MEMBER( side_select );
DECLARE_WRITE_LINE_MEMBER( motor_w );
diff --git a/src/devices/bus/vic20/vic1112.cpp b/src/devices/bus/vic20/vic1112.cpp
index 77b421f51d8..118298c2122 100644
--- a/src/devices/bus/vic20/vic1112.cpp
+++ b/src/devices/bus/vic20/vic1112.cpp
@@ -34,7 +34,7 @@ WRITE_LINE_MEMBER( vic1112_device::via0_irq_w )
m_slot->irq_w(m_via0_irq | m_via1_irq);
}
-READ8_MEMBER( vic1112_device::via0_pb_r )
+uint8_t vic1112_device::via0_pb_r()
{
/*
@@ -62,7 +62,7 @@ READ8_MEMBER( vic1112_device::via0_pb_r )
return data;
}
-WRITE8_MEMBER( vic1112_device::via0_pb_w )
+void vic1112_device::via0_pb_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/vic20/vic1112.h b/src/devices/bus/vic20/vic1112.h
index 5c4e05446a0..8353ad2390d 100644
--- a/src/devices/bus/vic20/vic1112.h
+++ b/src/devices/bus/vic20/vic1112.h
@@ -47,8 +47,8 @@ protected:
private:
DECLARE_WRITE_LINE_MEMBER( via0_irq_w );
- DECLARE_READ8_MEMBER( via0_pb_r );
- DECLARE_WRITE8_MEMBER( via0_pb_w );
+ uint8_t via0_pb_r();
+ void via0_pb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( via1_irq_w );
required_device<via6522_device> m_via0;
diff --git a/src/devices/bus/vme/vme_fccpu20.cpp b/src/devices/bus/vme/vme_fccpu20.cpp
index 1866a3c128e..d2a71141e21 100644
--- a/src/devices/bus/vme/vme_fccpu20.cpp
+++ b/src/devices/bus/vme/vme_fccpu20.cpp
@@ -558,14 +558,14 @@ void vme_fccpu20_device::update_irq_to_maincpu()
#define BR8N38400 0x08
#define FORCEBUG 0x30
-READ8_MEMBER (vme_fccpu20_device::pita_r)
+uint8_t vme_fccpu20_device::pita_r()
{
LOG("%s\n", FUNCNAME);
return FORCEBUG | BR7N9600;
}
/* Enabling/Disabling of VME IRQ 1-7 */
-READ8_MEMBER (vme_fccpu20_device::pitb_r)
+uint8_t vme_fccpu20_device::pitb_r()
{
LOG("%s\n", FUNCNAME);
return 0xff;
@@ -573,7 +573,7 @@ READ8_MEMBER (vme_fccpu20_device::pitb_r)
/* VME board ID bit and bus release software settings (output) (ROR, RAT, RATAR, RATBCLR, RORAT, RORRAT */
/* Bit 4 is bus available */
-READ8_MEMBER (vme_fccpu20_device::pitc_r)
+uint8_t vme_fccpu20_device::pitc_r()
{
uint8_t board_id = 0;
diff --git a/src/devices/bus/vme/vme_fccpu20.h b/src/devices/bus/vme/vme_fccpu20.h
index 23ebf0338d6..d5f64ff3d5f 100644
--- a/src/devices/bus/vme/vme_fccpu20.h
+++ b/src/devices/bus/vme/vme_fccpu20.h
@@ -60,9 +60,9 @@ private:
DECLARE_WRITE_LINE_MEMBER(bim_irq_callback);
/* PIT callbacks */
- DECLARE_READ8_MEMBER (pita_r);
- DECLARE_READ8_MEMBER (pitb_r);
- DECLARE_READ8_MEMBER (pitc_r);
+ uint8_t pita_r();
+ uint8_t pitb_r();
+ uint8_t pitc_r();
// Below are duplicated declarations from src/mame/drivers/fccpu20.cpp
DECLARE_READ32_MEMBER (bootvect_r);
diff --git a/src/devices/bus/vme/vme_fcisio.cpp b/src/devices/bus/vme/vme_fcisio.cpp
index ff13b51fd07..9961ae78597 100644
--- a/src/devices/bus/vme/vme_fcisio.cpp
+++ b/src/devices/bus/vme/vme_fcisio.cpp
@@ -449,7 +449,7 @@ WRITE8_MEMBER (vme_fcisio1_card_device::not_implemented_w){
}
// TODO: Get a manual to understand the config options for real
-READ8_MEMBER (vme_fcisio1_card_device::config_rd){
+uint8_t vme_fcisio1_card_device::config_rd(){
uint8_t ret = 0;
LOG("%s\n", FUNCNAME);
diff --git a/src/devices/bus/vme/vme_fcisio.h b/src/devices/bus/vme/vme_fcisio.h
index 9a0c8056617..6f1f20ef39f 100644
--- a/src/devices/bus/vme/vme_fcisio.h
+++ b/src/devices/bus/vme/vme_fcisio.h
@@ -28,7 +28,7 @@ protected:
virtual const tiny_rom_entry *device_rom_region() const override;
private:
- DECLARE_READ8_MEMBER (config_rd);
+ uint8_t config_rd();
DECLARE_READ16_MEMBER (bootvect_r);
diff --git a/src/devices/bus/vme/vme_fcscsi.cpp b/src/devices/bus/vme/vme_fcscsi.cpp
index 47fcd376ce2..1682e0d9f17 100644
--- a/src/devices/bus/vme/vme_fcscsi.cpp
+++ b/src/devices/bus/vme/vme_fcscsi.cpp
@@ -406,7 +406,7 @@ WRITE8_MEMBER (vme_fcscsi1_card_device::tcr_w){
return;
}
-WRITE8_MEMBER (vme_fcscsi1_card_device::led_w){
+void vme_fcscsi1_card_device::led_w(uint8_t data) {
LOG("%s [%02x]\n", FUNCNAME, data);
m_fdc->dden_w(BIT(data, 7));
@@ -450,12 +450,12 @@ WRITE_LINE_MEMBER(vme_fcscsi1_card_device::fdc_irq)
update_irq_to_maincpu();
}
-READ8_MEMBER(vme_fcscsi1_card_device::fdc_read_byte)
+uint8_t vme_fcscsi1_card_device::fdc_read_byte()
{
return m_fdc->data_r();
}
-WRITE8_MEMBER(vme_fcscsi1_card_device::fdc_write_byte)
+void vme_fcscsi1_card_device::fdc_write_byte(uint8_t data)
{
m_fdc->data_w(data & 0xff);
}
diff --git a/src/devices/bus/vme/vme_fcscsi.h b/src/devices/bus/vme/vme_fcscsi.h
index d36320d6183..52bfec48dd5 100644
--- a/src/devices/bus/vme/vme_fcscsi.h
+++ b/src/devices/bus/vme/vme_fcscsi.h
@@ -40,14 +40,14 @@ private:
//fdc
DECLARE_WRITE_LINE_MEMBER(fdc_irq);
- DECLARE_READ8_MEMBER(fdc_read_byte);
- DECLARE_WRITE8_MEMBER(fdc_write_byte);
+ uint8_t fdc_read_byte();
+ void fdc_write_byte(uint8_t data);
DECLARE_FLOPPY_FORMATS(floppy_formats);
DECLARE_READ16_MEMBER (bootvect_r);
DECLARE_READ8_MEMBER (tcr_r);
DECLARE_WRITE8_MEMBER (tcr_w);
- DECLARE_WRITE8_MEMBER (led_w);
+ void led_w(uint8_t data);
/* Dummy driver routines */
DECLARE_READ8_MEMBER(not_implemented_r);
diff --git a/src/devices/bus/x68k/x68k_neptunex.cpp b/src/devices/bus/x68k/x68k_neptunex.cpp
index 9cc8c022d23..b1fd9d4542f 100644
--- a/src/devices/bus/x68k/x68k_neptunex.cpp
+++ b/src/devices/bus/x68k/x68k_neptunex.cpp
@@ -63,15 +63,15 @@ READ16_MEMBER(x68k_neptune_device::x68k_neptune_port_r)
if(offset < 0x100+16)
{
m_dp8390->dp8390_cs(CLEAR_LINE);
- return (m_dp8390->dp8390_r(space, offset, 0xff) << 8)|
- m_dp8390->dp8390_r(space, offset+1, 0xff);
+ return (m_dp8390->dp8390_r(offset) << 8)|
+ m_dp8390->dp8390_r(offset+1);
}
//if(mem_mask == 0x00ff) offset++;
switch(offset)
{
case 0x100+16:
m_dp8390->dp8390_cs(ASSERT_LINE);
- data = m_dp8390->dp8390_r(space, offset, mem_mask);
+ data = m_dp8390->dp8390_r(offset);
data = ((data & 0x00ff) << 8) | ((data & 0xff00) >> 8);
return data;
case 0x100+31:
@@ -95,8 +95,8 @@ WRITE16_MEMBER(x68k_neptune_device::x68k_neptune_port_w)
data <<= 8;
offset++;
}
- m_dp8390->dp8390_w(space, offset, data>>8, 0xff);
- if(mem_mask == 0xffff) m_dp8390->dp8390_w(space, offset+1, data & 0xff, 0xff);
+ m_dp8390->dp8390_w(offset, data>>8);
+ if(mem_mask == 0xffff) m_dp8390->dp8390_w(offset+1, data & 0xff);
return;
}
//if(mem_mask == 0x00ff) offset++;
@@ -105,7 +105,7 @@ WRITE16_MEMBER(x68k_neptune_device::x68k_neptune_port_w)
case 0x100+16:
m_dp8390->dp8390_cs(ASSERT_LINE);
data = ((data & 0x00ff) << 8) | ((data & 0xff00) >> 8);
- m_dp8390->dp8390_w(space, offset, data, mem_mask);
+ m_dp8390->dp8390_w(offset, data);
return;
case 0x100+31:
m_dp8390->dp8390_reset(ASSERT_LINE);
@@ -116,7 +116,7 @@ WRITE16_MEMBER(x68k_neptune_device::x68k_neptune_port_w)
return;
}
-READ8_MEMBER(x68k_neptune_device::x68k_neptune_mem_read)
+uint8_t x68k_neptune_device::x68k_neptune_mem_read(offs_t offset)
{
if(offset < 32) return m_prom[offset>>1];
if((offset < (16*1024)) || (offset >= (32*1024)))
@@ -127,7 +127,7 @@ READ8_MEMBER(x68k_neptune_device::x68k_neptune_mem_read)
return m_board_ram[offset - (16*1024)];
}
-WRITE8_MEMBER(x68k_neptune_device::x68k_neptune_mem_write)
+void x68k_neptune_device::x68k_neptune_mem_write(offs_t offset, uint8_t data)
{
if((offset < (16*1024)) || (offset >= (32*1024)))
{
diff --git a/src/devices/bus/x68k/x68k_neptunex.h b/src/devices/bus/x68k/x68k_neptunex.h
index 0684193e2ac..6bcfe6f7025 100644
--- a/src/devices/bus/x68k/x68k_neptunex.h
+++ b/src/devices/bus/x68k/x68k_neptunex.h
@@ -40,8 +40,8 @@ protected:
virtual uint8_t iack2() override;
private:
- DECLARE_READ8_MEMBER(x68k_neptune_mem_read);
- DECLARE_WRITE8_MEMBER(x68k_neptune_mem_write);
+ uint8_t x68k_neptune_mem_read(offs_t offset);
+ void x68k_neptune_mem_write(offs_t offset, uint8_t data);
void x68k_neptune_irq_w(int state);
x68k_expansion_slot_device *m_slot;