folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

2SIO: add support for interrupts.

Browse source 
Add vectored interrupt support for the Altair 2SIO card.
This commit is contained in:
Howard M. Harte 2021-10-09 20:25:48 -07:00
parent 81afea160c
commit 08a0ad2d88
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
AltairZ80/s100_2sio.c
View file

@ -157,6 +157,8 @@ typedef struct {
int32 ctb; /* Control Buffer */ int32 ctb; /* Control Buffer */
int32 rie; /* Rx Int Enable */ int32 rie; /* Rx Int Enable */
int32 tie; /* Tx Int Enable */ int32 tie; /* Tx Int Enable */
uint8 intenable; /* Interrupt Enable */
uint8 intvector; /* Interrupt Vector */
} M2SIO_CTX; } M2SIO_CTX;
extern uint32 getClockFrequency(void); extern uint32 getClockFrequency(void);
@ -183,6 +185,8 @@ static int32 m2sio_io(DEVICE *dptr, int32 addr, int32 io, int32 data);
static int32 m2sio_stat(DEVICE *dptr, int32 io, int32 data); static int32 m2sio_stat(DEVICE *dptr, int32 io, int32 data);
static int32 m2sio_data(DEVICE *dptr, int32 io, int32 data); static int32 m2sio_data(DEVICE *dptr, int32 io, int32 data);
extern int32 vectorInterrupt; /* Vector Interrupt bits */
/* Debug Flags */ /* Debug Flags */
static DEBTAB m2sio_dt[] = { static DEBTAB m2sio_dt[] = {
{ "STATUS", STATUS_MSG, "Status messages" }, { "STATUS", STATUS_MSG, "Status messages" },
@ -267,6 +271,8 @@ static REG m2sio0_reg[] = {
{ FLDATAD (M2CTS0, m2sio0_ctx.stb, 3, "2SIO port 0 CTS status (active low)"), }, { FLDATAD (M2CTS0, m2sio0_ctx.stb, 3, "2SIO port 0 CTS status (active low)"), },
{ FLDATAD (M2OVRN0, m2sio0_ctx.stb, 4, "2SIO port 0 OVRN status"), }, { FLDATAD (M2OVRN0, m2sio0_ctx.stb, 4, "2SIO port 0 OVRN status"), },
{ DRDATAD (M2WAIT0, m2sio0_unit[0].wait, 32, "2SIO port 0 wait cycles"), }, { DRDATAD (M2WAIT0, m2sio0_unit[0].wait, 32, "2SIO port 0 wait cycles"), },
{ FLDATAD (M2INTEN0, m2sio0_ctx.intenable, 1, "2SIO port 0 Global vectored interrupt enable"), },
{ DRDATAD (M2VEC0, m2sio0_ctx.intvector, 8, "2SIO port 0 interrupt vector"), },
{ NULL } { NULL }
}; };
static REG m2sio1_reg[] = { static REG m2sio1_reg[] = {
@ -285,6 +291,8 @@ static REG m2sio1_reg[] = {
{ FLDATAD (M2CTS1, m2sio1_ctx.stb, 3, "2SIO port 1 CTS status (active low)"), }, { FLDATAD (M2CTS1, m2sio1_ctx.stb, 3, "2SIO port 1 CTS status (active low)"), },
{ FLDATAD (M2OVRN1, m2sio1_ctx.stb, 4, "2SIO port 1 OVRN status"), }, { FLDATAD (M2OVRN1, m2sio1_ctx.stb, 4, "2SIO port 1 OVRN status"), },
{ DRDATAD (M2WAIT1, m2sio1_unit[0].wait, 32, "2SIO port 1 wait cycles"), }, { DRDATAD (M2WAIT1, m2sio1_unit[0].wait, 32, "2SIO port 1 wait cycles"), },
{ FLDATAD (M2INTEN1, m2sio1_ctx.intenable, 1, "2SIO port 1 Global vectored interrupt enable"), },
{ DRDATAD (M2VEC1, m2sio1_ctx.intvector, 8, "2SIO port 1 interrupt vector"), },
{ NULL } { NULL }
}; };
@ -400,6 +408,7 @@ static t_stat m2sio_reset(DEVICE *dptr, int32 (*routine)(const int32, const int3
return SCPE_OK; return SCPE_OK;
} }
static t_stat m2sio_svc(UNIT *uptr) static t_stat m2sio_svc(UNIT *uptr)
{ {
M2SIO_CTX *xptr; M2SIO_CTX *xptr;
@ -481,6 +490,7 @@ static t_stat m2sio_svc(UNIT *uptr)
xptr->rxb = c & 0xff; xptr->rxb = c & 0xff;
xptr->stb |= M2SIO_RDRF; xptr->stb |= M2SIO_RDRF;
xptr->stb &= ~(M2SIO_FE | M2SIO_OVRN | M2SIO_PE); xptr->stb &= ~(M2SIO_FE | M2SIO_OVRN | M2SIO_PE);
if ((xptr->rie) && (xptr->intenable)) vectorInterrupt |= (1 << xptr->intvector);
} }
} }
@ -738,12 +748,13 @@ static int32 m2sio_stat(DEVICE *dptr, int32 io, int32 data)
xptr->stb &= (M2SIO_CTS | M2SIO_DCD); /* Reset status register */ xptr->stb &= (M2SIO_CTS | M2SIO_DCD); /* Reset status register */
xptr->rxb = 0; xptr->rxb = 0;
xptr->txp = 0; xptr->txp = 0;
xptr->tie = 1;
xptr->rie = 1;
m2sio_config_rts(dptr, 1); /* disable RTS */ m2sio_config_rts(dptr, 1); /* disable RTS */
} else if (dptr->units[0].flags & UNIT_ATT) { } else {
/* Interrupt Enable */ /* Interrupt Enable */
xptr->tie = (data & M2SIO_RIE) == M2SIO_RIE; /* Receive enable */ xptr->rie = (data & M2SIO_RIE) == M2SIO_RIE; /* Receive enable */
xptr->rie = (data & M2SIO_RTSMSK) == M2SIO_RTSLTIE; /* Transmit enable */ xptr->tie = (data & M2SIO_RTSMSK) == M2SIO_RTSLTIE; /* Transmit enable */
switch (data & M2SIO_RTSMSK) { switch (data & M2SIO_RTSMSK) {
case M2SIO_RTSLTIE: case M2SIO_RTSLTIE:
case M2SIO_RTSLTID: case M2SIO_RTSLTID: