summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Wilbert Pol <wilbertpol@users.noreply.github.com>2015-08-11 22:30:09 +0200
committer Wilbert Pol <wilbertpol@users.noreply.github.com>2015-08-11 22:52:46 +0200
commitf749c73b26b1290fa7403f35b9e6a82ed1fbdc89 (patch)
treedd22d0aef2bfdb72d34d7551624767958ca2c58f
parent0381d9c416177e1be03a92c869e7eb8513de63e9 (diff)
no longer using read_safe from code under src/mess (nw)
-rw-r--r--src/mess/drivers/mac.c2
-rw-r--r--src/mess/drivers/megadriv.c22
-rw-r--r--src/mess/drivers/segapico.c33
-rw-r--r--src/mess/machine/amstrad.c18
-rw-r--r--src/mess/machine/coco.c4
-rw-r--r--src/mess/machine/mbee.c2
-rw-r--r--src/mess/machine/super80.c2
-rw-r--r--src/mess/video/mac.c4
-rw-r--r--src/mess/video/nes.c23
9 files changed, 54 insertions, 56 deletions
diff --git a/src/mess/drivers/mac.c b/src/mess/drivers/mac.c
index 56a4c7f95a8..5ba63ada537 100644
--- a/src/mess/drivers/mac.c
+++ b/src/mess/drivers/mac.c
@@ -202,7 +202,7 @@ READ8_MEMBER( mac_state::mac_sonora_vctl_r )
if (offset == 2)
{
// printf("Sonora: read monitor ID at PC=%x\n", m_maincpu->pc());
- return (m_montype->read_safe(6)<<4);
+ return ((m_montype ? m_montype->read() : 6)<<4);
}
return m_sonora_vctl[offset];
diff --git a/src/mess/drivers/megadriv.c b/src/mess/drivers/megadriv.c
index 34e17a29190..63164a11d0f 100644
--- a/src/mess/drivers/megadriv.c
+++ b/src/mess/drivers/megadriv.c
@@ -54,14 +54,14 @@ READ8_MEMBER(md_cons_state::mess_md_io_read_data_port)
{
/* here we read B, C & the additional buttons */
retdata = (m_megadrive_io_data_regs[portnum] & helper_6b) |
- (((m_io_pad6b[0][portnum]->read_safe(0) & 0x30) |
- (m_io_pad6b[1][portnum]->read_safe(0) & 0x0f)) & ~helper_6b);
+ ((((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0x30) |
+ ((m_io_pad6b[1][portnum] ? m_io_pad6b[1][portnum]->read() : 0) & 0x0f)) & ~helper_6b);
}
else
{
/* here we read B, C & the directional buttons */
retdata = (m_megadrive_io_data_regs[portnum] & helper_6b) |
- ((m_io_pad6b[0][portnum]->read_safe(0) & 0x3f) & ~helper_6b);
+ (((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0x3f) & ~helper_6b);
}
}
else
@@ -70,20 +70,20 @@ READ8_MEMBER(md_cons_state::mess_md_io_read_data_port)
{
/* here we read ((Start & A) >> 2) | 0x00 */
retdata = (m_megadrive_io_data_regs[portnum] & helper_6b) |
- (((m_io_pad6b[0][portnum]->read_safe(0) & 0xc0) >> 2) & ~helper_6b);
+ ((((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0xc0) >> 2) & ~helper_6b);
}
else if (m_io_stage[portnum]==2)
{
/* here we read ((Start & A) >> 2) | 0x0f */
retdata = (m_megadrive_io_data_regs[portnum] & helper_6b) |
- ((((m_io_pad6b[0][portnum]->read_safe(0) & 0xc0) >> 2) | 0x0f) & ~helper_6b);
+ (((((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0xc0) >> 2) | 0x0f) & ~helper_6b);
}
else
{
/* here we read ((Start & A) >> 2) | Up and Down */
retdata = (m_megadrive_io_data_regs[portnum] & helper_6b) |
- ((((m_io_pad6b[0][portnum]->read_safe(0) & 0xc0) >> 2) |
- (m_io_pad6b[0][portnum]->read_safe(0) & 0x03)) & ~helper_6b);
+ (((((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0xc0) >> 2) |
+ ((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0x03)) & ~helper_6b);
}
}
@@ -107,14 +107,14 @@ READ8_MEMBER(md_cons_state::mess_md_io_read_data_port)
{
/* here we read B, C & the directional buttons */
retdata = (m_megadrive_io_data_regs[portnum] & helper_3b) |
- (((m_io_pad3b[portnum]->read_safe(0) & 0x3f) | 0x40) & ~helper_3b);
+ ((((m_io_pad3b[portnum] ? m_io_pad3b[portnum]->read() : 0) & 0x3f) | 0x40) & ~helper_3b);
}
else
{
/* here we read ((Start & A) >> 2) | Up and Down */
retdata = (m_megadrive_io_data_regs[portnum] & helper_3b) |
- ((((m_io_pad3b[portnum]->read_safe(0) & 0xc0) >> 2) |
- (m_io_pad3b[portnum]->read_safe(0) & 0x03) | 0x40) & ~helper_3b);
+ (((((m_io_pad3b[portnum] ? m_io_pad3b[portnum]->read() : 0) & 0xc0) >> 2) |
+ ((m_io_pad3b[portnum] ? m_io_pad3b[portnum]->read() : 0) & 0x03) | 0x40) & ~helper_3b);
}
}
@@ -311,7 +311,7 @@ MACHINE_RESET_MEMBER(md_cons_state, ms_megadriv)
// same as screen_eof_megadriv but with addition of 32x and SegaCD/MegaCD pieces
void md_cons_state::screen_eof_console(screen_device &screen, bool state)
{
- if (m_io_reset->read_safe(0x00) & 0x01)
+ if (m_io_reset && (m_io_reset->read() & 0x01))
m_maincpu->set_input_line(INPUT_LINE_RESET, PULSE_LINE);
// rising edge
diff --git a/src/mess/drivers/segapico.c b/src/mess/drivers/segapico.c
index 805aa14db7c..df93af5705b 100644
--- a/src/mess/drivers/segapico.c
+++ b/src/mess/drivers/segapico.c
@@ -130,14 +130,19 @@ class pico_base_state : public md_cons_state
public:
pico_base_state(const machine_config &mconfig, device_type type, const char *tag)
: md_cons_state(mconfig, type, tag),
- m_upd7759(*this, "7759") { }
+ m_upd7759(*this, "7759"),
+ m_io_page(*this, "PAGE"),
+ m_io_pad(*this, "PAD"),
+ m_io_penx(*this, "PENX"),
+ m_io_peny(*this, "PENY")
+ { }
optional_device<upd7759_device> m_upd7759;
- ioport_port *m_io_page;
- ioport_port *m_io_pad;
- ioport_port *m_io_penx;
- ioport_port *m_io_peny;
+ required_ioport m_io_page;
+ required_ioport m_io_pad;
+ required_ioport m_io_penx;
+ required_ioport m_io_peny;
UINT8 m_page_register;
@@ -171,13 +176,13 @@ UINT16 pico_base_state::pico_read_penpos(int pen)
switch (pen)
{
case PICO_PENX:
- penpos = m_io_penx->read_safe(0);
+ penpos = m_io_penx->read();
penpos |= 0x6;
penpos = penpos * 320 / 255;
penpos += 0x3d;
break;
case PICO_PENY:
- penpos = m_io_peny->read_safe(0);
+ penpos = m_io_peny->read();
penpos |= 0x6;
penpos = penpos * 251 / 255;
penpos += 0x1fc;
@@ -197,7 +202,7 @@ READ16_MEMBER(pico_base_state::pico_68k_io_read )
retdata = m_version_hi_nibble;
break;
case 1:
- retdata = m_io_pad->read_safe(0);
+ retdata = m_io_pad->read();
break;
/*
@@ -230,7 +235,7 @@ READ16_MEMBER(pico_base_state::pico_68k_io_read )
either page 5 or page 6 is often unused.
*/
{
- UINT8 tmp = m_io_page->read_safe(0);
+ UINT8 tmp = m_io_page->read();
if (tmp == 2 && m_page_register != 0x3f)
{
m_page_register <<= 1;
@@ -336,11 +341,6 @@ SLOT_INTERFACE_END
MACHINE_START_MEMBER(pico_state,pico)
{
- m_io_page = ioport("PAGE");
- m_io_pad = ioport("PAD");
- m_io_penx = ioport("PENX");
- m_io_peny = ioport("PENY");
-
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7fffff, read16_delegate(FUNC(base_md_cart_slot_device::read),(base_md_cart_slot_device*)m_picocart), write16_delegate(FUNC(base_md_cart_slot_device::write),(base_md_cart_slot_device*)m_picocart));
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa13000, 0xa130ff, read16_delegate(FUNC(base_md_cart_slot_device::read_a13),(base_md_cart_slot_device*)m_picocart), write16_delegate(FUNC(base_md_cart_slot_device::write_a13),(base_md_cart_slot_device*)m_picocart));
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa15000, 0xa150ff, read16_delegate(FUNC(base_md_cart_slot_device::read_a15),(base_md_cart_slot_device*)m_picocart), write16_delegate(FUNC(base_md_cart_slot_device::write_a15),(base_md_cart_slot_device*)m_picocart));
@@ -547,11 +547,6 @@ SLOT_INTERFACE_END
MACHINE_START_MEMBER(copera_state,copera)
{
- m_io_page = ioport("PAGE");
- m_io_pad = ioport("PAD");
- m_io_penx = ioport("PENX");
- m_io_peny = ioport("PENY");
-
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7fffff, read16_delegate(FUNC(base_md_cart_slot_device::read),(base_md_cart_slot_device*)m_picocart), write16_delegate(FUNC(base_md_cart_slot_device::write),(base_md_cart_slot_device*)m_picocart));
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa13000, 0xa130ff, read16_delegate(FUNC(base_md_cart_slot_device::read_a13),(base_md_cart_slot_device*)m_picocart), write16_delegate(FUNC(base_md_cart_slot_device::write_a13),(base_md_cart_slot_device*)m_picocart));
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa15000, 0xa150ff, read16_delegate(FUNC(base_md_cart_slot_device::read_a15),(base_md_cart_slot_device*)m_picocart), write16_delegate(FUNC(base_md_cart_slot_device::write_a15),(base_md_cart_slot_device*)m_picocart));
diff --git a/src/mess/machine/amstrad.c b/src/mess/machine/amstrad.c
index 508ed6f2e82..2e7d5796894 100644
--- a/src/mess/machine/amstrad.c
+++ b/src/mess/machine/amstrad.c
@@ -2660,17 +2660,17 @@ READ8_MEMBER(amstrad_state::amstrad_psg_porta_read)
{
if(m_system_type != SYSTEM_GX4000)
{
- if((m_io_ctrltype->read_safe(0) == 1) && (m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F) == 9)
+ if(m_io_ctrltype && (m_io_ctrltype->read() == 1) && (m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F) == 9)
{
return m_amx_mouse_data;
}
- if((m_io_ctrltype->read_safe(0) == 2) && (m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F) == 9)
+ if(m_io_ctrltype && (m_io_ctrltype->read() == 2) && (m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F) == 9)
{
- return (m_io_kbrow[m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F]->read_safe(0) & 0x80) | 0x7f;
+ return (m_io_kbrow[m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F] ? m_io_kbrow[m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F]->read() & 0x80 : 0) | 0x7f;
}
}
- return m_io_kbrow[m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F]->read_safe(0) & 0xFF;
+ return m_io_kbrow[m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F] ? m_io_kbrow[m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F]->read() : 0;
}
return 0xFF;
}
@@ -2705,14 +2705,14 @@ IRQ_CALLBACK_MEMBER(amstrad_state::amstrad_cpu_acknowledge_int)
if(m_system_type != SYSTEM_GX4000)
{
// update AMX mouse inputs (normally done every 1/300th of a second)
- if(m_io_ctrltype->read_safe(0) == 1)
+ if(m_io_ctrltype && m_io_ctrltype->read() == 1)
{
static UINT8 prev_x,prev_y;
UINT8 data_x, data_y;
m_amx_mouse_data = 0x0f;
- data_x = m_io_mouse1->read_safe(0) & 0xff;
- data_y = m_io_mouse2->read_safe(0) & 0xff;
+ data_x = m_io_mouse1 ? m_io_mouse1->read() : 0;
+ data_y = m_io_mouse2 ? m_io_mouse2->read() : 0;
if(data_x > prev_x)
m_amx_mouse_data &= ~0x08;
@@ -2722,11 +2722,11 @@ IRQ_CALLBACK_MEMBER(amstrad_state::amstrad_cpu_acknowledge_int)
m_amx_mouse_data &= ~0x02;
if(data_y < prev_y)
m_amx_mouse_data &= ~0x01;
- m_amx_mouse_data |= (m_io_mouse3->read_safe(0) << 4);
+ m_amx_mouse_data |= ((m_io_mouse3 ? m_io_mouse3->read() : 0) << 4);
prev_x = data_x;
prev_y = data_y;
- m_amx_mouse_data |= (m_io_kbrow[9]->read_safe(0) & 0x80); // DEL key
+ m_amx_mouse_data |= ((m_io_kbrow[9] ? m_io_kbrow[9]->read() : 0) & 0x80); // DEL key
}
}
return 0xFF;
diff --git a/src/mess/machine/coco.c b/src/mess/machine/coco.c
index 58b21d7f7a2..7994f5b9caa 100644
--- a/src/mess/machine/coco.c
+++ b/src/mess/machine/coco.c
@@ -1163,7 +1163,7 @@ WRITE8_MEMBER( coco_state::ff60_write )
READ8_MEMBER( coco_state::ff40_read )
{
- if (offset >= 1 && offset <= 2 && m_beckerportconfig->read_safe(0) == 1)
+ if (offset >= 1 && offset <= 2 && m_beckerportconfig && m_beckerportconfig->read() == 1)
{
return m_beckerport->read(space, offset-1, mem_mask);
}
@@ -1179,7 +1179,7 @@ READ8_MEMBER( coco_state::ff40_read )
WRITE8_MEMBER( coco_state::ff40_write )
{
- if (offset >= 1 && offset <= 2 && m_beckerportconfig->read_safe(0) == 1)
+ if (offset >= 1 && offset <= 2 && m_beckerportconfig && m_beckerportconfig->read() == 1)
{
return m_beckerport->write(space, offset-1, data, mem_mask);
}
diff --git a/src/mess/machine/mbee.c b/src/mess/machine/mbee.c
index 6ec80af7fad..e2f6b08a94a 100644
--- a/src/mess/machine/mbee.c
+++ b/src/mess/machine/mbee.c
@@ -726,7 +726,7 @@ QUICKLOAD_LOAD_MEMBER( mbee_state, mbee_z80bin )
if (execute_address != 0xffff)
{
/* check to see if autorun is on */
- autorun = m_io_config->read_safe(0xFF) & 1;
+ autorun = m_io_config->read() & 1;
space.write_word(0xa6, execute_address); /* fix the EXEC command */
diff --git a/src/mess/machine/super80.c b/src/mess/machine/super80.c
index 6f4a59d1ac8..b77c04b68fd 100644
--- a/src/mess/machine/super80.c
+++ b/src/mess/machine/super80.c
@@ -233,7 +233,7 @@ QUICKLOAD_LOAD_MEMBER( super80_state, super80 )
/* is this file executable? */
if (exec_addr != 0xffff)
/* check to see if autorun is on */
- if BIT(m_io_config->read_safe(0xFF), 0)
+ if BIT(m_io_config->read(), 0)
m_maincpu->set_pc(exec_addr);
return IMAGE_INIT_PASS;
diff --git a/src/mess/video/mac.c b/src/mess/video/mac.c
index baffedf186d..289c62feb57 100644
--- a/src/mess/video/mac.c
+++ b/src/mess/video/mac.c
@@ -246,7 +246,7 @@ VIDEO_RESET_MEMBER(mac_state,macrbv)
view = 0;
if (m_montype)
{
- m_rbv_montype = m_montype->read_safe(2);
+ m_rbv_montype = m_montype->read();
}
else
{
@@ -308,7 +308,7 @@ VIDEO_RESET_MEMBER(mac_state,macsonora)
visarea.min_x = 0;
visarea.min_y = 0;
- m_rbv_montype = m_montype->read_safe(2);
+ m_rbv_montype = m_montype ? m_montype->read() : 2;
switch (m_rbv_montype)
{
case 1: // 15" portrait display
diff --git a/src/mess/video/nes.c b/src/mess/video/nes.c
index 3c898d58b1b..077f4efe3a2 100644
--- a/src/mess/video/nes.c
+++ b/src/mess/video/nes.c
@@ -42,18 +42,21 @@ UINT32 nes_state::screen_update_nes(screen_device &screen, bitmap_ind16 &bitmap,
if ((m_cartslot && m_cartslot->exists() && (m_cartslot->get_pcb_id() == STD_DISKSYS)) // first scenario = disksys in m_cartslot (= famicom)
|| m_disk) // second scenario = disk via fixed internal disk option (fds & famitwin)
{
- // latch this input so it doesn't go at warp speed
- if ((m_io_disksel->read_safe(0) & 0x01) && (!m_last_frame_flip))
+ if (m_io_disksel)
{
- if (m_disk)
- m_disk->disk_flip_side();
- else
- m_cartslot->disk_flip_side();
- m_last_frame_flip = 1;
+ // latch this input so it doesn't go at warp speed
+ if ((m_io_disksel->read() & 0x01) && (!m_last_frame_flip))
+ {
+ if (m_disk)
+ m_disk->disk_flip_side();
+ else
+ m_cartslot->disk_flip_side();
+ m_last_frame_flip = 1;
+ }
+
+ if (!(m_io_disksel->read() & 0x01))
+ m_last_frame_flip = 0;
}
-
- if (!(m_io_disksel->read_safe(1) & 0x01))
- m_last_frame_flip = 0;
}
return 0;
}