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

sigma: DP device fixes

Browse source 
- TIO status routine always returns DVS_AUTO instead of proper status.
- DP_SEEK definition is off by 1.
- reset does not properly initialize controller, seek threads.
This commit is contained in:
Ken Rector 2022-06-29 08:07:10 -10:00 • committed by Mark Pizzolato
parent 0caa2e7ed5
commit 254057289f
2 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sigma/sigma_bugs.txt
View file

@ -111,6 +111,9 @@
105. RAD: write check was reading words off disk instead of bytes. 105. RAD: write check was reading words off disk instead of bytes.
106. RAD: end of transfer routine checking for address error incorrectly. 106. RAD: end of transfer routine checking for address error incorrectly.
107. DK: end of transfer routine checking for address error incorrectly. 107. DK: end of transfer routine checking for address error incorrectly.
108. DP: TIO status routine always returns DVS_AUTO instead of proper status.
109. DP: DP_SEEK definition is off by 1.
110. DP: reset does not properly initialize controller, seek threads.
Diagnostic Notes Diagnostic Notes

28
sigma/sigma_dp.c
View file

@ -25,6 +25,9 @@
dp moving head disk pack controller dp moving head disk pack controller
28-Jun-22 RMS Fixed off-by-1 error in DP_SEEK definition (Ken Rector)
07-Jun-22 RMS Removed unused variables (V4)
06-Jun-22 RMS Fixed incorrect return in TIO status (Ken Rector)
06-Jun-22 RMS Fixed missing loop increment in TDV (Ken Rector) 06-Jun-22 RMS Fixed missing loop increment in TDV (Ken Rector)
13-Mar-17 RMS Fixed bug in selecting 3281 unit F (COVERITY) 13-Mar-17 RMS Fixed bug in selecting 3281 unit F (COVERITY)
@ -73,7 +76,7 @@
#define DP_WDSC 256 /* words/sector */ #define DP_WDSC 256 /* words/sector */
#define DP_BYHD 8 /* byte/header */ #define DP_BYHD 8 /* byte/header */
#define DP_NUMDR ((uint32) ((DP_Q10B (ctx->dp_ctype))? DP_NUMDR_10B: DP_NUMDR_16B)) #define DP_NUMDR ((uint32) ((DP_Q10B (ctx->dp_ctype))? DP_NUMDR_10B: DP_NUMDR_16B))
#define DP_SEEK (DP_CONT) /* offset to seek units */ #define DP_SEEK (DP_CONT + 1) /* offset to seek units */
/* Address bytes */ /* Address bytes */
@ -971,7 +974,7 @@ for (i = 0; i < DP_NUMDR; i++) {
if (sim_is_active (&dp_unit[un]) || if (sim_is_active (&dp_unit[un]) ||
sim_is_active (&dp_unit[un + DP_SEEK])) sim_is_active (&dp_unit[un + DP_SEEK]))
stat |= (DVS_DBUSY | (CC2 << DVT_V_CC)); stat |= (DVS_DBUSY | (CC2 << DVT_V_CC));
return DVS_AUTO; return stat;
} }
uint32 dp_tdv_status (uint32 cidx, uint32 un) uint32 dp_tdv_status (uint32 cidx, uint32 un)
@ -1194,7 +1197,16 @@ else if (chan_chk_chi (dp_dib[cidx].dva) < 0) /* any int? */
return; return;
} }
/* Reset routine */ /* Reset routines */
void dp_reset_unit (UNIT *uptr, uint32 cidx)
{
sim_cancel (uptr); /* stop dev thread */
uptr->UDA = 0;
uptr->UCMD = 0;
uptr->UCTX = cidx;
return;
}
t_stat dp_reset (DEVICE *dptr) t_stat dp_reset (DEVICE *dptr)
{ {
@ -1207,12 +1219,10 @@ if (cidx >= DP_NUMCTL)
return SCPE_IERR; return SCPE_IERR;
dp_unit = dptr->units; dp_unit = dptr->units;
ctx = &dp_ctx[cidx]; ctx = &dp_ctx[cidx];
for (i = 0; i < DP_NUMDR_16B; i++) { dp_reset_unit (&dp_unit[DP_CONT], cidx); /* reset controller */
sim_cancel (&dp_unit[i]); /* stop dev thread */ for (i = 0; i < DP_NUMDR_16B; i++) { /* reset drives */
sim_cancel (&dp_unit[i + DP_SEEK]); /* stop seek thread */ dp_reset_unit (&dp_unit[i], cidx);
dp_unit[i].UDA = 0; dp_reset_unit (&dp_unit[i + DP_SEEK], cidx); /* reset seek thread */
dp_unit[i].UCMD = 0;
dp_unit[i].UCTX = cidx;
} }
ctx->dp_flags = 0; ctx->dp_flags = 0;
ctx->dp_ski = 0; ctx->dp_ski = 0;