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

i8212, i8214: Rename IRQ to INT to agree with Intel pin names (nw)

Browse Source
This commit is contained in:
AJR 2017-09-24 22:22:20 -04:00
parent 9f2b0a952f
commit 82f2ea3020
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/machine/i8212.cpp
View File

@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(I8212, i8212_device, "i8212", "Intel 8212 I/O")
i8212_device::i8212_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, I8212, tag, owner, clock),
m_write_irq(*this),
m_write_int(*this),
m_read_di(*this),
m_write_do(*this),
m_md(MODE_INPUT),
@ -43,7 +43,7 @@ i8212_device::i8212_device(const machine_config &mconfig, const char *tag, devic
void i8212_device::device_start()
{
// resolve callbacks
m_write_irq.resolve_safe();
m_write_int.resolve_safe();
m_read_di.resolve_safe(0);
m_write_do.resolve_safe();
@ -77,7 +77,7 @@ void i8212_device::device_reset()
READ8_MEMBER( i8212_device::read )
{
// clear interrupt line
m_write_irq(CLEAR_LINE);
m_write_int(CLEAR_LINE);
LOG("I8212 INT: %u\n", CLEAR_LINE);
@ -127,7 +127,7 @@ WRITE_LINE_MEMBER( i8212_device::stb_w )
m_data = m_read_di(0);
// assert interrupt line
m_write_irq(ASSERT_LINE);
m_write_int(ASSERT_LINE);
LOG("I8212 INT: %u\n", ASSERT_LINE);
}

8
src/devices/machine/i8212.h
View File

@ -33,8 +33,8 @@
// INTERFACE CONFIGURATION MACROS
///*************************************************************************
#define MCFG_I8212_IRQ_CALLBACK(_write) \
devcb = &i8212_device::set_irq_wr_callback(*device, DEVCB_##_write);
#define MCFG_I8212_INT_CALLBACK(_write) \
devcb = &i8212_device::set_int_wr_callback(*device, DEVCB_##_write);
#define MCFG_I8212_DI_CALLBACK(_read) \
devcb = &i8212_device::set_di_rd_callback(*device, DEVCB_##_read);
@ -56,7 +56,7 @@ public:
// construction/destruction
i8212_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template <class Object> static devcb_base &set_irq_wr_callback(device_t &device, Object &&cb) { return downcast<i8212_device &>(device).m_write_irq.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_int_wr_callback(device_t &device, Object &&cb) { return downcast<i8212_device &>(device).m_write_int.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_di_rd_callback(device_t &device, Object &&cb) { return downcast<i8212_device &>(device).m_read_di.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_do_wr_callback(device_t &device, Object &&cb) { return downcast<i8212_device &>(device).m_write_do.set_callback(std::forward<Object>(cb)); }
@ -78,7 +78,7 @@ private:
MODE_OUTPUT
};
devcb_write_line m_write_irq;
devcb_write_line m_write_int;
devcb_read8 m_read_di;
devcb_write8 m_write_do;

8
src/devices/machine/i8214.cpp
View File

@ -39,8 +39,8 @@ void i8214_device::trigger_interrupt(int level)
m_write_enlg(0);
// set interrupt line
m_write_irq(ASSERT_LINE);
m_write_irq(CLEAR_LINE);
m_write_int(ASSERT_LINE);
m_write_int(CLEAR_LINE);
}
@ -83,7 +83,7 @@ void i8214_device::check_interrupt()
i8214_device::i8214_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, I8214, tag, owner, clock)
, m_write_irq(*this)
, m_write_int(*this)
, m_write_enlg(*this)
, m_inte(0)
, m_int_dis(0)
@ -103,7 +103,7 @@ i8214_device::i8214_device(const machine_config &mconfig, const char *tag, devic
void i8214_device::device_start()
{
// resolve callbacks
m_write_irq.resolve_safe();
m_write_int.resolve_safe();
m_write_enlg.resolve_safe();
m_int_dis = 0;

8
src/devices/machine/i8214.h
View File

@ -32,8 +32,8 @@
// INTERFACE CONFIGURATION MACROS
///*************************************************************************
#define MCFG_I8214_IRQ_CALLBACK(_write) \
devcb = &i8214_device::set_irq_wr_callback(*device, DEVCB_##_write);
#define MCFG_I8214_INT_CALLBACK(_write) \
devcb = &i8214_device::set_int_wr_callback(*device, DEVCB_##_write);
#define MCFG_I8214_ENLG_CALLBACK(_write) \
devcb = &i8214_device::set_enlg_wr_callback(*device, DEVCB_##_write);
@ -52,7 +52,7 @@ public:
// construction/destruction
i8214_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template <class Object> static devcb_base &set_irq_wr_callback(device_t &device, Object &&cb) { return downcast<i8214_device &>(device).m_write_irq.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_int_wr_callback(device_t &device, Object &&cb) { return downcast<i8214_device &>(device).m_write_int.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_enlg_wr_callback(device_t &device, Object &&cb) { return downcast<i8214_device &>(device).m_write_enlg.set_callback(std::forward<Object>(cb)); }
DECLARE_WRITE_LINE_MEMBER( sgs_w );
@ -72,7 +72,7 @@ private:
void check_interrupt();
void update_interrupt_line();
devcb_write_line m_write_irq;
devcb_write_line m_write_int;
devcb_write_line m_write_enlg;
int m_inte; // interrupt enable

6
src/mame/drivers/cmi.cpp
View File

@ -2781,11 +2781,11 @@ static MACHINE_CONFIG_START( cmi2x )
MCFG_MSM5832_ADD("msm5832", XTAL_32_768kHz)
MCFG_DEVICE_ADD("i8214_1", I8214, 1000000) // cmi_8214_intf_1
MCFG_I8214_IRQ_CALLBACK(WRITELINE(cmi_state, i8214_1_int_w))
MCFG_I8214_INT_CALLBACK(WRITELINE(cmi_state, i8214_1_int_w))
MCFG_DEVICE_ADD("i8214_2", I8214, 1000000) // cmi_8214_intf_2
MCFG_I8214_IRQ_CALLBACK(WRITELINE(cmi_state, i8214_2_int_w))
MCFG_I8214_INT_CALLBACK(WRITELINE(cmi_state, i8214_2_int_w))
MCFG_DEVICE_ADD("i8214_3", I8214, 1000000) // cmi_8214_intf_3
MCFG_I8214_IRQ_CALLBACK(WRITELINE(cmi_state, i8214_3_int_w))
MCFG_I8214_INT_CALLBACK(WRITELINE(cmi_state, i8214_3_int_w))
MCFG_I8214_ENLG_CALLBACK(WRITELINE(cmi_state, i8214_3_enlg))
MCFG_DEVICE_ADD("q133_pia_1", PIA6821, 0) // pia_q133_1_config

2
src/mame/drivers/mikromik.cpp
View File

@ -465,7 +465,7 @@ static MACHINE_CONFIG_START( mm1 )
// peripheral hardware
MCFG_DEVICE_ADD(I8212_TAG, I8212, 0)
MCFG_I8212_IRQ_CALLBACK(INPUTLINE(I8085A_TAG, I8085_RST65_LINE))
MCFG_I8212_INT_CALLBACK(INPUTLINE(I8085A_TAG, I8085_RST65_LINE))
MCFG_I8212_DI_CALLBACK(DEVREAD8(KB_TAG, mm1_keyboard_device, read))
MCFG_DEVICE_ADD(I8237_TAG, AM9517A, XTAL_6_144MHz/2)

2
src/mame/drivers/v1050.cpp
View File

@ -1041,7 +1041,7 @@ static MACHINE_CONFIG_START( v1050 )
// devices
MCFG_DEVICE_ADD(UPB8214_TAG, I8214, XTAL_16MHz/4)
MCFG_I8214_IRQ_CALLBACK(WRITELINE(v1050_state, pic_int_w))
MCFG_I8214_INT_CALLBACK(WRITELINE(v1050_state, pic_int_w))
MCFG_DEVICE_ADD(MSM58321RS_TAG, MSM58321, XTAL_32_768kHz)
MCFG_MSM58321_D0_HANDLER(WRITELINE(v1050_state, rtc_ppi_pa_0_w))