summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author smf- <smf-@users.noreply.github.com>2020-04-02 02:10:22 +0100
committer smf- <smf-@users.noreply.github.com>2020-04-02 02:10:22 +0100
commit1e4709c33dc82ee5877a2ddde25ed1286bf42fa8 (patch)
tree4973bc2ed3fd5170e12dd478ee77e73cb6967776
parent70591d6faea1f85d25de9e8e32027aad2f5f44a1 (diff)
removed some dummy_space() calls (nw)
-rw-r--r--src/devices/cpu/dsp16/dsp16.cpp12
-rw-r--r--src/mame/audio/cage.cpp2
-rw-r--r--src/mame/audio/dcs.cpp8
-rw-r--r--src/mame/audio/dcs.h4
-rw-r--r--src/mame/machine/midwayic.cpp4
-rw-r--r--src/mame/machine/midwayic.h2
-rw-r--r--src/mame/video/gic.cpp6
7 files changed, 19 insertions, 19 deletions
diff --git a/src/devices/cpu/dsp16/dsp16.cpp b/src/devices/cpu/dsp16/dsp16.cpp
index a8536761a24..f0c28c5ca32 100644
--- a/src/devices/cpu/dsp16/dsp16.cpp
+++ b/src/devices/cpu/dsp16/dsp16.cpp
@@ -363,7 +363,7 @@ void dsp16_device_base::device_reset()
m_ose_cb(m_ose_out = 1U);
// PIO reset outputs
- m_pdb_w_cb(machine().dummy_space(), m_psel_out, 0xffffU, 0x0000U);
+ m_pdb_w_cb(m_psel_out, 0xffffU, 0x0000U);
if (!m_pids_out)
{
LOGPIO("DSP16: de-asserting PIDS for reset\n");
@@ -1537,7 +1537,7 @@ inline void dsp16_device_base::pio_step()
if (!--m_pio_pids_cnt)
{
if (!m_pio_r_cb.isnull())
- m_pio_pdx_in = m_pio_r_cb(machine().dummy_space(), m_psel_out, 0xffffU);
+ m_pio_pdx_in = m_pio_r_cb(m_psel_out, 0xffffU);
m_pids_cb(m_pids_out = 1U);
LOGPIO("DSP16: PIO read active edge PSEL = %u, PDX = %04X (PC = %04X)\n", m_psel_out, m_pio_pdx_in, m_st_pcbase);
}
@@ -1555,9 +1555,9 @@ inline void dsp16_device_base::pio_step()
{
LOGPIO("DSP16: PIO write active edge PSEL = %u, PDX = %04X (PC = %04X)\n", m_psel_out, m_pio_pdx_out, m_st_pcbase);
m_pods_cb(1U);
- m_pio_w_cb(machine().dummy_space(), m_psel_out, m_pio_pdx_out, 0xffffU);
+ m_pio_w_cb(m_psel_out, m_pio_pdx_out, 0xffffU);
m_pods_out = 1U;
- m_pdb_w_cb(machine().dummy_space(), m_psel_out, 0xffffU, 0x0000U);
+ m_pdb_w_cb(m_psel_out, 0xffffU, 0x0000U);
}
}
else
@@ -2003,7 +2003,7 @@ void dsp16_device_base::pio_pioc_write(u16 value)
if (!m_pods_out)
{
m_pods_cb(m_pods_out = 1U); // actually high-impedance
- m_pdb_w_cb(machine().dummy_space(), m_psel_out, 0xffffU, 0x0000U);
+ m_pdb_w_cb(m_psel_out, 0xffffU, 0x0000U);
}
}
}
@@ -2066,7 +2066,7 @@ void dsp16_device_base::pio_pdx_write(u16 sel, u16 value)
{
assert(m_pods_out);
m_pods_cb(m_pods_out = 0U);
- m_pdb_w_cb(machine().dummy_space(), sel, value, 0xffffU);
+ m_pdb_w_cb(sel, value, 0xffffU);
}
m_pio_pods_cnt = pio_strobe() + 1; // decremented this cycle
}
diff --git a/src/mame/audio/cage.cpp b/src/mame/audio/cage.cpp
index 1866e730cc8..339df3ac3b6 100644
--- a/src/mame/audio/cage.cpp
+++ b/src/mame/audio/cage.cpp
@@ -435,7 +435,7 @@ void atari_cage_device::update_control_lines()
if ((m_control & 2) && m_cage_to_cpu_ready)
reason |= CAGE_IRQ_REASON_DATA_READY;
- m_irqhandler(machine().dummy_space(), 0, reason);
+ m_irqhandler(0, reason);
/* set the IOF input lines */
val = m_cpu->state_int(TMS3203X_IOF);
val &= ~0x88;
diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp
index 52202db87fc..8009b12ee6f 100644
--- a/src/mame/audio/dcs.cpp
+++ b/src/mame/audio/dcs.cpp
@@ -1458,7 +1458,7 @@ void dcs_audio_device::set_io_callbacks(write_line_delegate output_full_cb, writ
}
-void dcs_audio_device::set_fifo_callbacks(read16_delegate fifo_data_r, read16_delegate fifo_status_r, write_line_delegate fifo_reset_w)
+void dcs_audio_device::set_fifo_callbacks(read16smo_delegate fifo_data_r, read16_delegate fifo_status_r, write_line_delegate fifo_reset_w)
{
m_fifo_data_r = fifo_data_r;
m_fifo_status_r = fifo_status_r;
@@ -1513,7 +1513,7 @@ READ16_MEMBER( dcs_audio_device::latch_status_r )
READ16_MEMBER( dcs_audio_device::fifo_input_r )
{
if (!m_fifo_data_r.isnull())
- return m_fifo_data_r(space,0, 0xffff);
+ return m_fifo_data_r();
else
return 0xffff;
}
@@ -2184,7 +2184,7 @@ void dcs_audio_device::fifo_notify(int count, int max)
if (transfer.state != 5 || transfer.fifo_entries == transfer.writes_left || transfer.fifo_entries >= 256)
{
for ( ; transfer.fifo_entries; transfer.fifo_entries--)
- preprocess_write(m_fifo_data_r(machine().dummy_space(), 0, 0xffff));
+ preprocess_write(m_fifo_data_r());
}
}
@@ -2197,7 +2197,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( dcs_audio_device::transfer_watchdog_callback )
if (transfer.fifo_entries && starting_writes_left == transfer.writes_left)
{
for ( ; transfer.fifo_entries; transfer.fifo_entries--)
- preprocess_write(m_fifo_data_r(machine().dummy_space(), 0, 0xffff));
+ preprocess_write(m_fifo_data_r());
}
if (transfer.watchdog != nullptr)
transfer.watchdog->adjust(attotime::from_msec(1), transfer.writes_left);
diff --git a/src/mame/audio/dcs.h b/src/mame/audio/dcs.h
index aa61cc0f707..9811d63f979 100644
--- a/src/mame/audio/dcs.h
+++ b/src/mame/audio/dcs.h
@@ -26,7 +26,7 @@ public:
void set_auto_ack(int state);
- void set_fifo_callbacks(read16_delegate fifo_data_r, read16_delegate fifo_status_r, write_line_delegate fifo_reset_w);
+ void set_fifo_callbacks(read16smo_delegate fifo_data_r, read16_delegate fifo_status_r, write_line_delegate fifo_reset_w);
void set_io_callbacks(write_line_delegate output_full_cb, write_line_delegate input_empty_cb);
uint16_t data_r();
@@ -217,7 +217,7 @@ protected:
write_line_delegate m_output_full_cb;
write_line_delegate m_input_empty_cb;
- read16_delegate m_fifo_data_r;
+ read16smo_delegate m_fifo_data_r;
read16_delegate m_fifo_status_r;
write_line_delegate m_fifo_reset_w;
diff --git a/src/mame/machine/midwayic.cpp b/src/mame/machine/midwayic.cpp
index 560e6a4b838..bb5b5ef2051 100644
--- a/src/mame/machine/midwayic.cpp
+++ b/src/mame/machine/midwayic.cpp
@@ -757,7 +757,7 @@ void midway_ioasic_device::device_start()
if (m_has_dcs)
{
m_dcs->set_fifo_callbacks(
- read16_delegate(*this, FUNC(midway_ioasic_device::fifo_r)),
+ read16smo_delegate(*this, FUNC(midway_ioasic_device::fifo_r)),
read16_delegate(*this, FUNC(midway_ioasic_device::fifo_status_r)),
write_line_delegate(*this, FUNC(midway_ioasic_device::fifo_reset_w)));
m_dcs->set_io_callbacks(
@@ -854,7 +854,7 @@ WRITE_LINE_MEMBER(midway_ioasic_device::ioasic_output_full)
*
*************************************/
-READ16_MEMBER(midway_ioasic_device::fifo_r)
+uint16_t midway_ioasic_device::fifo_r()
{
uint16_t result = 0;
diff --git a/src/mame/machine/midwayic.h b/src/mame/machine/midwayic.h
index 4e0a18a36d8..3c629688ac9 100644
--- a/src/mame/machine/midwayic.h
+++ b/src/mame/machine/midwayic.h
@@ -164,7 +164,7 @@ public:
void fifo_full_w(uint16_t data);
DECLARE_WRITE_LINE_MEMBER(fifo_reset_w);
- DECLARE_READ16_MEMBER(fifo_r);
+ uint16_t fifo_r();
DECLARE_READ16_MEMBER(fifo_status_r);
DECLARE_WRITE_LINE_MEMBER(ioasic_input_empty);
diff --git a/src/mame/video/gic.cpp b/src/mame/video/gic.cpp
index 30f882c68b8..3934d67455c 100644
--- a/src/mame/video/gic.cpp
+++ b/src/mame/video/gic.cpp
@@ -186,7 +186,7 @@ uint32_t gic_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
for(uint8_t cx=0;cx<GIC_LEFT_W;cx++){
draw_char_left(XSTART+(cx*GIC_CHAR_W),
YSTART+(cy*GIC_CHAR_H),
- m_ram(machine().dummy_space(), current, 0xff),
+ m_ram(current),
m_bitmap);
current++;
}
@@ -199,7 +199,7 @@ uint32_t gic_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
for(uint8_t cy=0;cy<GIC_RIGHT_H;cy++){
for(uint8_t cx=0;cx<GIC_RIGHT_W;cx++){
//complex case
- uint8_t data = m_ram(machine().dummy_space(), current++, 0xff);
+ uint8_t data = m_ram(current++);
size_t currX = (XSTART+ (cx*(3+GIC_CHAR_W)));
size_t currUP = (YSTART+ (cy*(2*GIC_CHAR_H)));
@@ -295,7 +295,7 @@ void gic_device::sound_stream_update(sound_stream &stream, stream_sample_t **inp
//lo for 1824(228*8)
//hi for 1824(228*8)
- uint8_t audioByte = m_ram(machine().dummy_space(), GIC_AUDIO_BYTE, 0xff)*2;
+ uint8_t audioByte = m_ram(GIC_AUDIO_BYTE)*2;
if(!audioByte){
for(size_t i = 0; i < samples; i++)