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

AltairZ80: fixes incorrect types used for t_stat return values in 88-2SIO device

Browse source
This commit is contained in:
Patrick Linstruth 2020-06-22 15:09:43 -07:00
parent f0798ba014
commit 2a18f0cfd9
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
AltairZ80/s100_2sio.c
View file

@ -399,7 +399,8 @@ static t_stat m2sio_reset(DEVICE *dptr, int32 (*routine)(const int32, const int3
static t_stat m2sio_svc(UNIT *uptr) static t_stat m2sio_svc(UNIT *uptr)
{ {
M2SIO_CTX *xptr; M2SIO_CTX *xptr;
int32 c,r,s,stb; int32 c,s,stb;
t_stat r;
xptr = uptr->dptr->ctxt; xptr = uptr->dptr->ctxt;
@ -497,13 +498,13 @@ static t_stat m2sio_svc(UNIT *uptr)
static t_stat m2sio_attach(UNIT *uptr, CONST char *cptr) static t_stat m2sio_attach(UNIT *uptr, CONST char *cptr)
{ {
M2SIO_CTX *xptr; M2SIO_CTX *xptr;
int32 status; t_stat r;
xptr = uptr->dptr->ctxt; xptr = uptr->dptr->ctxt;
sim_debug(VERBOSE_MSG, uptr->dptr, "attach (%s).\n", cptr); sim_debug(VERBOSE_MSG, uptr->dptr, "attach (%s).\n", cptr);
if ((status = tmxr_attach(xptr->tmxr, uptr, cptr)) == SCPE_OK) { if ((r = tmxr_attach(xptr->tmxr, uptr, cptr)) == SCPE_OK) {
xptr->tmln->rcve = 1; xptr->tmln->rcve = 1;
@ -512,7 +513,7 @@ static t_stat m2sio_attach(UNIT *uptr, CONST char *cptr)
sim_debug(VERBOSE_MSG, uptr->dptr, "activated service.\n"); sim_debug(VERBOSE_MSG, uptr->dptr, "activated service.\n");
} }
return (status); return r;
} }
@ -537,7 +538,8 @@ static t_stat m2sio_detach(UNIT *uptr)
static t_stat m2sio_set_baud(UNIT *uptr, int32 value, const char *cptr, void *desc) static t_stat m2sio_set_baud(UNIT *uptr, int32 value, const char *cptr, void *desc)
{ {
M2SIO_CTX *xptr; M2SIO_CTX *xptr;
int32 baud,r; int32 baud;
t_stat r = SCPE_ARG;
char config[20]; char config[20];
xptr = uptr->dptr->ctxt; xptr = uptr->dptr->ctxt;
@ -568,7 +570,7 @@ static t_stat m2sio_set_baud(UNIT *uptr, int32 value, const char *cptr, void *de
} }
} }
return SCPE_ARG; return r;
} }
static t_stat m2sio_show_baud(FILE *st, UNIT *uptr, int32 value, const void *desc) static t_stat m2sio_show_baud(FILE *st, UNIT *uptr, int32 value, const void *desc)
@ -589,7 +591,7 @@ static t_stat m2sio_config_line(UNIT *uptr)
M2SIO_CTX *xptr; M2SIO_CTX *xptr;
char config[20]; char config[20];
char *fmt; char *fmt;
int32 r; t_stat r = SCPE_IERR;
xptr = uptr->dptr->ctxt; xptr = uptr->dptr->ctxt;
@ -645,11 +647,9 @@ static t_stat m2sio_config_line(UNIT *uptr)
*/ */
xptr->tmln->txbps = 0; /* Get TMXR's timing out of our way */ xptr->tmln->txbps = 0; /* Get TMXR's timing out of our way */
xptr->tmln->rxbps = 0; /* Get TMXR's timing out of our way */ xptr->tmln->rxbps = 0; /* Get TMXR's timing out of our way */
return r;
} }
return SCPE_ARG; return r;
} }
static int32 m2sio0_io(int32 addr, int32 io, int32 data) static int32 m2sio0_io(int32 addr, int32 io, int32 data)