Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 08:49:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

indy: remove dependencies on mips3 (nw)

Browse Source 
No functional change, only makes it easier to test with r4000 instead of mips3.
This commit is contained in:
Patrick Mackinlay 2019-02-08 13:39:06 +07:00
parent 74ffa85990
commit e0325a8174
5 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mame/machine/hpc3.h
View File

@ -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;

14
src/mame/machine/ioc2.cpp
View File

@ -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)

3
src/mame/machine/ioc2.h
View File

@ -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

5
src/mame/machine/sgi.cpp
View File

@ -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:

3
src/mame/video/newport.h
View File

@ -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;