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

Merge pull request #2666 from JoakimLarsson/z80xxx_iack

Browse Source 
z80sio/z80scc: now returns cpu specific default vector when no interr…
This commit is contained in:
R. Belmont 2017-10-12 14:40:52 -04:00 committed by GitHub
commit ec10507edd
3 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/devices/machine/z80scc.cpp
View File

@ -81,17 +81,16 @@ DONE (x) (p=partly) NMOS CMOS ESCC EMSCC
#define LOG_GENERAL (1U << 0) #define LOG_GENERAL (1U << 0)
#define LOG_SETUP (1U << 1) #define LOG_SETUP (1U << 1)
#define LOG_PRINTF (1U << 2) #define LOG_READ (1U << 2)
#define LOG_READ (1U << 3) #define LOG_INT (1U << 3)
#define LOG_INT (1U << 4) #define LOG_CMD (1U << 4)
#define LOG_CMD (1U << 5) #define LOG_TX (1U << 5)
#define LOG_TX (1U << 6) #define LOG_RCV (1U << 6)
#define LOG_RCV (1U << 7) #define LOG_CTS (1U << 7)
#define LOG_CTS (1U << 8) #define LOG_DCD (1U << 8)
#define LOG_DCD (1U << 9) #define LOG_SYNC (1U << 9)
#define LOG_SYNC (1U << 10)
//#define VERBOSE (LOG_CMD|LOG_INT|LOG_SETUP|LOG_TX|LOG_RCV|LOG_READ|LOG_CTS|LOG_DCD) //#define VERBOSE (LOG_INT|LOG_READ|LOG_SETUP|LOG_TX|LOG_CMD)
//#define LOG_OUTPUT_FUNC printf //#define LOG_OUTPUT_FUNC printf
#include "logmacro.h" #include "logmacro.h"
@ -187,7 +186,8 @@ z80scc_device::z80scc_device(const machine_config &mconfig, device_type type, co
m_out_rxdrqb_cb(*this), m_out_rxdrqb_cb(*this),
m_out_txdrqb_cb(*this), m_out_txdrqb_cb(*this),
m_variant(variant), m_variant(variant),
m_wr0_ptrbits(0) m_wr0_ptrbits(0),
m_cputag(nullptr)
{ {
for (auto & elem : m_int_state) for (auto & elem : m_int_state)
elem = 0; elem = 0;
@ -371,6 +371,8 @@ int z80scc_device::z80daisy_irq_state()
//------------------------------------------------- //-------------------------------------------------
int z80scc_device::z80daisy_irq_ack() int z80scc_device::z80daisy_irq_ack()
{ {
int ret = -1; // Indicate default vector
LOGINT("%s %s \n",tag(), FUNCNAME); LOGINT("%s %s \n",tag(), FUNCNAME);
// loop over all interrupt sources // loop over all interrupt sources
for (auto & elem : m_int_state) for (auto & elem : m_int_state)
@ -383,18 +385,28 @@ int z80scc_device::z80daisy_irq_ack()
LOGINT(" - Found an INT request, "); LOGINT(" - Found an INT request, ");
if (m_wr9 & z80scc_channel::WR9_BIT_VIS) if (m_wr9 & z80scc_channel::WR9_BIT_VIS)
{ {
LOGINT("but WR9 D1 set to use autovector, returning -1\n"); LOGINT("but WR9 D1 set to use autovector, returning the default vector\n");
return -1; break;
} }
else else
{ {
LOGINT("returning RR2: %02x\n", m_chanB->m_rr2 ); LOGINT("returning RR2: %02x\n", m_chanB->m_rr2 );
return m_chanB->m_rr2; ret = m_chanB->m_rr2;
break;
} }
} }
} }
return -1; // Did we not find a vector? Get the notion of a default vector from the CPU implementation
if (ret == -1 && m_cputag != nullptr)
{
// default irq vector is -1 for 68000 but 0 for z80 for example...
ret = owner()->subdevice<cpu_device>(m_cputag)->default_irq_vector();
LOGINT(" - failed to find an interrupt to ack, returning default IRQ vector: %02x\n", ret );
logerror("z80sio_irq_ack: failed to find an interrupt to ack!\n");
}
return ret;
} }

7
src/devices/machine/z80scc.h
View File

@ -661,6 +661,12 @@ public:
template <class Object> static devcb_base &set_out_rxdrqb_callback(device_t &device, Object &&cb) { return downcast<z80scc_device &>(device).m_out_rxdrqb_cb.set_callback(std::forward<Object>(cb)); } template <class Object> static devcb_base &set_out_rxdrqb_callback(device_t &device, Object &&cb) { return downcast<z80scc_device &>(device).m_out_rxdrqb_cb.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_out_txdrqb_callback(device_t &device, Object &&cb) { return downcast<z80scc_device &>(device).m_out_txdrqb_cb.set_callback(std::forward<Object>(cb)); } template <class Object> static devcb_base &set_out_txdrqb_callback(device_t &device, Object &&cb) { return downcast<z80scc_device &>(device).m_out_txdrqb_cb.set_callback(std::forward<Object>(cb)); }
static void static_set_cputag(device_t &device, const char *tag)
{
z80scc_device &dev = downcast<z80scc_device &>(device);
dev.m_cputag = tag;
}
static void configure_channels(device_t &device, int rxa, int txa, int rxb, int txb) static void configure_channels(device_t &device, int rxa, int txa, int rxb, int txb)
{ {
z80scc_device &dev = downcast<z80scc_device &>(device); z80scc_device &dev = downcast<z80scc_device &>(device);
@ -798,6 +804,7 @@ protected:
int const m_variant; int const m_variant;
uint8_t m_wr0_ptrbits; uint8_t m_wr0_ptrbits;
const char *m_cputag;
}; };
class scc8030_device : public z80scc_device class scc8030_device : public z80scc_device

19
src/devices/machine/z80sio.cpp
View File

@ -142,7 +142,7 @@ z80sio_device::z80sio_device(const machine_config &mconfig, device_type type, co
m_out_rxdrqb_cb(*this), m_out_rxdrqb_cb(*this),
m_out_txdrqb_cb(*this), m_out_txdrqb_cb(*this),
m_variant(variant), m_variant(variant),
m_cputag("maincpu") m_cputag(nullptr)
{ {
for (auto & elem : m_int_state) for (auto & elem : m_int_state)
elem = 0; elem = 0;
@ -245,8 +245,7 @@ int z80sio_device::z80daisy_irq_state()
//------------------------------------------------- //-------------------------------------------------
int z80sio_device::z80daisy_irq_ack() int z80sio_device::z80daisy_irq_ack()
{ {
// default irq vector is -1 for 68000 but 0 for z80 for example... int ret = -1; // Indicate default vector
int ret = owner()->subdevice<cpu_device>(m_cputag)->default_irq_vector();
LOGINT("%s %s \n",tag(), FUNCNAME); LOGINT("%s %s \n",tag(), FUNCNAME);
// loop over all interrupt sources // loop over all interrupt sources
@ -260,12 +259,18 @@ int z80sio_device::z80daisy_irq_ack()
LOGINT(" - Found an INT request, "); LOGINT(" - Found an INT request, ");
LOGINT("returning RR2: %02x\n", m_chanB->m_rr2 ); LOGINT("returning RR2: %02x\n", m_chanB->m_rr2 );
check_interrupts(); check_interrupts();
return m_chanB->m_rr2; ret = m_chanB->m_rr2;
break;
} }
} }
ret = m_chanB->m_rr2; // Did we not find a vector? Get the notion of a default vector from the CPU implementation
LOGINT(" - failed to find an interrupt to ack, returning default IRQ vector: %02x\n", ret ); if (ret == -1 && m_cputag != nullptr)
logerror("z80sio_irq_ack: failed to find an interrupt to ack!\n"); {
// default irq vector is -1 for 68000 but 0 for z80 for example...
ret = owner()->subdevice<cpu_device>(m_cputag)->default_irq_vector();
LOGINT(" - failed to find an interrupt to ack [%s], returning default IRQ vector: %02x\n", m_cputag, ret );
logerror("z80sio_irq_ack: failed to find an interrupt to ack!\n");
}
return ret; return ret;
} }