summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Patrick Mackinlay <pmackinlay@hotmail.com>2019-02-08 13:39:06 +0700
committer Patrick Mackinlay <pmackinlay@hotmail.com>2019-02-08 13:39:06 +0700
commite0325a8174b95e17767e8c1fc50b685f9c7b66bd (patch)
tree71d817df9d8859b8e7898e76f991a5cf638ca5cd
parent74ffa859900e8b6c9e833c1db74e327a7198d30d (diff)
indy: remove dependencies on mips3 (nw)
No functional change, only makes it easier to test with r4000 instead of mips3.
-rw-r--r--src/mame/machine/hpc3.h3
-rw-r--r--src/mame/machine/ioc2.cpp14
-rw-r--r--src/mame/machine/ioc2.h3
-rw-r--r--src/mame/machine/sgi.cpp5
-rw-r--r--src/mame/video/newport.h3
5 files changed, 12 insertions, 16 deletions
diff --git a/src/mame/machine/hpc3.h b/src/mame/machine/hpc3.h
index a27f2f80f53..12cdb9f05b0 100644
--- a/src/mame/machine/hpc3.h
+++ b/src/mame/machine/hpc3.h
@@ -11,7 +11,6 @@
#pragma once
-#include "cpu/mips/mips3.h"
#include "machine/ds1386.h"
#include "machine/eepromser.h"
#include "machine/hal2.h"
@@ -132,7 +131,7 @@ protected:
HPC3_DMACTRL_ENABLE = 0x10,
};
- required_device<mips3_device> m_maincpu;
+ required_device<cpu_device> m_maincpu;
required_device<wd33c93b_device> m_wd33c93;
optional_device<wd33c93b_device> m_wd33c93_2;
required_device<eeprom_serial_93cxx_device> m_eeprom;
diff --git a/src/mame/machine/ioc2.cpp b/src/mame/machine/ioc2.cpp
index b7eee3a055e..6146b8d55bd 100644
--- a/src/mame/machine/ioc2.cpp
+++ b/src/mame/machine/ioc2.cpp
@@ -173,25 +173,25 @@ void ioc2_device::device_reset()
void ioc2_device::raise_local_irq(int channel, uint8_t mask)
{
m_int3_local_status_reg[channel] |= mask;
- m_maincpu->set_input_line(MIPS3_IRQ0 + channel, (m_int3_local_mask_reg[channel] & m_int3_local_status_reg[channel]) ? ASSERT_LINE : CLEAR_LINE);
+ m_maincpu->set_input_line(channel, (m_int3_local_mask_reg[channel] & m_int3_local_status_reg[channel]) ? ASSERT_LINE : CLEAR_LINE);
}
void ioc2_device::lower_local_irq(int channel, uint8_t mask)
{
m_int3_local_status_reg[channel] &= ~mask;
- m_maincpu->set_input_line(MIPS3_IRQ0 + channel, (m_int3_local_mask_reg[channel] & m_int3_local_status_reg[channel]) ? ASSERT_LINE : CLEAR_LINE);
+ m_maincpu->set_input_line(channel, (m_int3_local_mask_reg[channel] & m_int3_local_status_reg[channel]) ? ASSERT_LINE : CLEAR_LINE);
}
WRITE_LINE_MEMBER(ioc2_device::timer0_int)
{
if (state)
- m_maincpu->set_input_line(MIPS3_IRQ2, ASSERT_LINE);
+ m_maincpu->set_input_line(2, ASSERT_LINE);
}
WRITE_LINE_MEMBER(ioc2_device::timer1_int)
{
if (state)
- m_maincpu->set_input_line(MIPS3_IRQ3, ASSERT_LINE);
+ m_maincpu->set_input_line(3, ASSERT_LINE);
}
WRITE_LINE_MEMBER(ioc2_device::pit_clock2_out)
@@ -624,7 +624,7 @@ void ioc2_device::set_local_int_mask(int channel, uint32_t mask)
if (old_line != new_line)
{
const uint32_t int_bits = (m_int3_local_mask_reg[channel] & m_int3_local_status_reg[channel]);
- m_maincpu->set_input_line(MIPS3_IRQ0 + channel, int_bits != 0 ? ASSERT_LINE : CLEAR_LINE);
+ m_maincpu->set_input_line(channel, int_bits != 0 ? ASSERT_LINE : CLEAR_LINE);
}
}
@@ -636,9 +636,9 @@ void ioc2_device::set_map_int_mask(int channel, uint32_t mask)
void ioc2_device::set_timer_int_clear(uint32_t data)
{
if (BIT(data, 0))
- m_maincpu->set_input_line(MIPS3_IRQ2, CLEAR_LINE);
+ m_maincpu->set_input_line(2, CLEAR_LINE);
if (BIT(data, 1))
- m_maincpu->set_input_line(MIPS3_IRQ3, CLEAR_LINE);
+ m_maincpu->set_input_line(3, CLEAR_LINE);
}
void ioc2_device::handle_reset_reg_write(uint8_t data)
diff --git a/src/mame/machine/ioc2.h b/src/mame/machine/ioc2.h
index d444d2696d6..5e99996e7c6 100644
--- a/src/mame/machine/ioc2.h
+++ b/src/mame/machine/ioc2.h
@@ -11,7 +11,6 @@
#pragma once
-#include "cpu/mips/mips3.h"
#include "machine/8042kbdc.h"
#include "machine/pc_lpt.h"
#include "machine/pckeybrd.h"
@@ -155,7 +154,7 @@ protected:
DMA_SEL_CLOCK_SEL_EXT = 0x20,
};
- required_device<mips3_device> m_maincpu;
+ required_device<cpu_device> m_maincpu;
required_device<scc85230_device> m_scc;
required_device<pc_lpt_device> m_pi1; // we assume standard parallel port (SPP) mode
// TODO: SGI parallel port (SGIPP), HP BOISE high speed parallel port (HPBPP), and Ricoh scanner modes
diff --git a/src/mame/machine/sgi.cpp b/src/mame/machine/sgi.cpp
index d48d0f32767..9eb08b76321 100644
--- a/src/mame/machine/sgi.cpp
+++ b/src/mame/machine/sgi.cpp
@@ -10,7 +10,6 @@
#include "emu.h"
#include "sgi.h"
-#include "cpu/mips/mips3.h"
#define LOG_UNKNOWN (1 << 0)
#define LOG_READS (1 << 1)
@@ -458,12 +457,12 @@ WRITE32_MEMBER( sgi_mc_device::write )
break;
case 0x00e8/4:
LOGMASKED(LOG_WRITES, "%s: CPU Error Status Clear\n", machine().describe_context());
- m_maincpu->set_input_line(MIPS3_IRQ4, CLEAR_LINE);
+ m_maincpu->set_input_line(4, CLEAR_LINE);
m_cpu_error_status = 0;
break;
case 0x00f8/4:
LOGMASKED(LOG_WRITES, "%s: GIO Error Status Clear\n", machine().describe_context());
- m_maincpu->set_input_line(MIPS3_IRQ4, CLEAR_LINE);
+ m_maincpu->set_input_line(4, CLEAR_LINE);
m_gio_error_status = 0;
break;
case 0x0100/4:
diff --git a/src/mame/video/newport.h b/src/mame/video/newport.h
index a5a3b4a0918..5b642b1c9df 100644
--- a/src/mame/video/newport.h
+++ b/src/mame/video/newport.h
@@ -9,7 +9,6 @@
#pragma once
-#include "cpu/mips/mips3.h"
#include "machine/hpc3.h"
class newport_video_device : public device_t
@@ -183,7 +182,7 @@ private:
DECLARE_WRITE32_MEMBER(vc2_w);
void do_rex3_command();
- required_device<mips3_device> m_maincpu;
+ required_device<cpu_device> m_maincpu;
required_device<hpc3_device> m_hpc3;
vc2_t m_vc2;
xmap_t m_xmap0;