github.com/rcornwell.sims
1
0
Fork 0
mirror of https://github.com/rcornwell/sims.git synced 2026-01-13 15:27:04 +00:00
Code Releases Activity

SEL32: Fix 'mt offline' crash in UTX.

Browse Source 
SEL32: Fix device address assignment for ethernet controller.
SEL32: Allow mag tape to be enabled/attached after system boot.
SEL32: Change delay after SIO to be applied for each unit.
SEL32: Create 1 tape backup of /usr for UTX.
SEL32: Fix test for device on system to use disabled flag.
SEL32: Correct wakeup status for 8-line support.
SEL32: Support -i -n flags options to attach command.
SEL32: Only support disk track replacement logic for diag tracks.
SEL32: Fix two Coverity warning errors from last update.
SEL32: Correct status flage setting for mag tape.
SEL32: Update SEL32 Documentation.
SEL32: Correct mkvmtape in taptools to 8 chars for owner and group names.
This commit is contained in:
AZBevier 2021-03-08 19:11:39 -07:00
parent 7cedaac678
commit 0babe9da3f
13 changed files with 693 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

254
SEL32/sel32_chan.c
View File

@ -86,7 +86,9 @@ extern uint32 CPUSTATUS; /* CPU status word */
extern uint32 INTS[]; /* Interrupt status flags */
extern uint32 TPSD[]; /* Temp save of PSD from memory 0&4 */
extern uint8 waitqcnt; /* # of instructions to xeq b4 int */
#ifdef REMOVE_03072021
extern uint8 waitrdyq; /* # of instructions to xeq b4 rdy */
#endif
extern uint32 inbusy;
extern uint32 outbusy;
@ -211,9 +213,11 @@ int32 RDYQ_Put(uint32 entry)
RDYQIN += 1; /* next entry */
RDYQIN %= RDYQ_SIZE; /* modulo RDYQ size */
irq_pend = 1; /* do a scan */
#ifdef REMOVE_03072021
//XXwaitrdyq = 10; /* UTX21A installs with this, but diags hang */
//XXwaitrdyq = 2;
waitrdyq = 1; /* wait at least 1 instruction */
#endif
return SCPE_OK; /* all OK */
}
@ -729,6 +733,9 @@ loop:
"load_ccw bad status chan %04x status %04x cmd %02x\n",
chan, chp->chan_status, chp->ccw_cmd);
RDYQ_Put(chp->chan_dev); /* queue us up */
#ifndef CHANGE_03072021
chp->chan_qwait = QWAIT; /* run 25 instructions before starting iocl */
#endif
sim_debug(DEBUG_EXP, &cpu_dev,
"load_ccw continue wait chsa %04x status %08x\n",
chp->chan_dev, chp->chan_status);
@ -773,21 +780,21 @@ int chan_read_byte(uint16 chsa, uint8 *data)
if (chp->ccw_count == 0) { /* see if more data required */
if ((chp->ccw_flags & FLAG_DC) == 0) { /* see if Data Chain */
chp->chan_byte = BUFF_CHNEND; /* buffer end too */
sim_debug(DEBUG_XIO, &cpu_dev,
"chan_read_byte no DC chan end, cnt %04x addr %06x chan %04x\n",
chp->ccw_count, chp->ccw_addr, chan);
sim_debug(DEBUG_EXP, &cpu_dev,
"chan_read_byte no DC chan end, cnt %04x addr %06x chsa %04x\n",
chp->ccw_count, chp->ccw_addr, chsa);
return 1; /* return error */
} else {
/* we have data chaining, process iocl */
if (load_ccw(chp, 1)) { /* process data chaining */
sim_debug(DEBUG_EXP, &cpu_dev,
"chan_read_byte with DC error, cnt %04x addr %06x chan %04x\n",
chp->ccw_count, chp->ccw_addr, chan);
"chan_read_byte with DC error, cnt %04x addr %06x chsa %04x\n",
chp->ccw_count, chp->ccw_addr, chsa);
return 1; /* return error */
}
sim_debug(DEBUG_EXP, &cpu_dev,
"chan_read_byte with DC IOCD loaded, cnt %04x addr %06x chan %04x\n",
chp->ccw_count, chp->ccw_addr, chan);
"chan_read_byte with DC IOCD loaded, cnt %04x addr %06x chsa %04x\n",
chp->ccw_count, chp->ccw_addr, chsa);
}
}
/* get the next byte from memory */
@ -1015,6 +1022,9 @@ void chan_end(uint16 chsa, uint16 flags) {
"chan_end set RDYQ %04x No CC BUFF_NEXT chp %p chan_byte %04x\n",
chsa, chp, chp->chan_byte);
RDYQ_Put(chsa); /* queue us up */
#ifndef CHANGE_03072021
chp->chan_qwait = QWAIT; /* run 25 instructions before starting iocl */
#endif
}
/* just return */
goto goout;
@ -1087,9 +1097,14 @@ void chan_end(uint16 chsa, uint16 flags) {
"$$$ CHEND SIO queued chsa %04x iocla %06x IOCD1 %08x IOCD2 %08x\n",
chsa, iocla, RMW(iocla), RMW(iocla+4));
#ifdef CHANGE_03072021
if (waitqcnt == 0) /* test for UTX delay */
waitqcnt = 25; /* tell cpu to wait 20 instructions before int */
//XX waitqcnt = 15; /* tell cpu to wait 20 instructions before int */
#else
/* this is the first IOCD for the SIO */
chp->chan_qwait = QWAIT; /* run 25 instructions before starting iocl */
#endif
}
}
}
@ -1208,17 +1223,24 @@ nothere:
chp->chan_int = inta; /* make sure it is set in channel */
dptr = get_dev(uptr); /* pointer to DEVICE structure */
/* check for the device being defined and attached in simh */
if ((uptr->flags & UNIT_ATTABLE) && ((uptr->flags & UNIT_ATT) == 0)) {
sim_debug(DEBUG_EXP, &cpu_dev,
"checkxio lchsa %04x rchsa %04x is not attached, CC3 return\n", lchsa, rchsa);
/* is device or unit marked disabled? */
dptr = get_dev(uptr);
if ((dptr->flags & DEV_DIS) || (uptr->flags & UNIT_DIS)) {
/* is device/unit disabled? */
/* UTX wants CC1 on "mt offline" call. If not, UTX loops forever */
if ((dptr != NULL) &&
(DEV_TYPE(dptr) == DEV_TAPE)) /* see if this is a tape */
(DEV_TYPE(dptr) == DEV_TAPE)) { /* see if this is a tape */
*status = CC1BIT; /* CCs = 1, not busy */
else
sim_debug(DEBUG_EXP, &cpu_dev,
"checkxio rchsa %04x device/unit not enabled, CC1 returned\n",
lchsa, rchsa);
} else {
*status = CC3BIT; /* not attached, so error CC3 */
return SCPE_OK; /* not found, CC3 */
sim_debug(DEBUG_EXP, &cpu_dev,
"checkxio rchsa %04x device/unit not enabled, CC3 returned\n",
lchsa, rchsa);
}
return SCPE_OK; /* Not found CC3/CC1 */
}
/* try this as MFP says it returns 0 on OK */
@ -1228,8 +1250,9 @@ nothere:
/* return CC1 for non iop/mfp devices */
//1003 *status = CC1BIT; /* CCs = 1, not busy */
*status = 0; /* CCs = 0, OK return */
sim_debug(DEBUG_DETAIL, &cpu_dev, "checkxio lchsa %04x rchsa %04x done CC status %08x\n",
lchsa, rchsa, *status);
sim_debug(DEBUG_DETAIL, &cpu_dev,
"checkxio lchsa %04x rchsa %04x done CC status %08x\n",
lchsa, rchsa, *status);
return SCPE_OK; /* No CC's all OK */
}
@ -1327,10 +1350,11 @@ missing:
chsa, chp, (uptr->flags & UNIT_ATTABLE)?1:0, (uptr->flags & UNIT_ATT)?1:0,
(uptr->flags & UNIT_DIS)?1:0);
/* is unit marked disabled? */
if ((uptr->flags & UNIT_DIS) == 1) {
/* is device or unit marked disabled? */
dptr = get_dev(uptr);
if ((dptr->flags & DEV_DIS) || (uptr->flags & UNIT_DIS)) {
sim_debug(DEBUG_EXP, &cpu_dev,
"startxio chsa %04x device disabled, CC3 returned flags %08x\n", chsa, uptr->flags);
"startxio chsa %04x device/unit disabled, CC3 returned flags %08x\n", chsa, uptr->flags);
*status = CC3BIT; /* not attached, so error CC3 */
return SCPE_OK; /* not found, CC3 */
}
@ -1345,7 +1369,7 @@ missing:
#endif
/* check for a Command or data chain operation in progresss */
if ((chp->chan_byte & BUFF_BUSY) && chp->chan_byte != BUFF_POST) {
if ((chp->chan_byte & BUFF_BUSY) && (chp->chan_byte != BUFF_POST)) {
uint16 tstat = chp->chan_status; /* save status */
uint16 tcnt = chp->ccw_count; /* save count */
DEVICE *dptr = get_dev(uptr);
@ -1444,7 +1468,7 @@ missing:
} else
/* check for a Command or data chain operation in progresss */
if ((chp->chan_byte & BUFF_BUSY) && chp->chan_byte != BUFF_POST) {
if ((chp->chan_byte & BUFF_BUSY) && (chp->chan_byte != BUFF_POST)) {
uint16 tstat = chp->chan_status; /* save status */
uint16 tcnt = chp->ccw_count; /* save count */
@ -1480,12 +1504,18 @@ missing:
"$$$ SIO queued chsa %04x iocla %06x IOCD1 %08x IOCD2 %08x\n",
chsa, iocla, RMW(iocla), RMW(iocla+4));
#ifdef CHANGE_03072021
/* a value < 25 gets error ioi: sio at 801 failed, cc2 in UTX 21B */
if (waitqcnt == 0) /* test for UTX delay */
// waitqcnt = 20; /* tell cpu to wait 20 instructions before int */
// waitqcnt = 35; /* tell cpu to wait 20 instructions before int */
//XX waitqcnt = 15; /* tell cpu to wait 20 instructions before int */
waitqcnt = 25; /* tell cpu to wait 20 instructions before int */
#else
chp->chan_qwait = QWAIT25; /* run 25 instructions before starting iocl */
// chp->chan_qwait = QWAIT20; /* run 25 instructions before starting iocl */
// chp->chan_qwait = QWAIT; /* run 25 instructions before starting iocl */
#endif
*status = CC1BIT; /* CCs = 1, SIO accepted & queued, no echo status */
sim_debug(DEBUG_XIO, &cpu_dev, "$$$ SIO done chsa %04x status %08x iocla %08x CC's %08x\n",
@ -1499,6 +1529,7 @@ t_stat testxio(uint16 lchsa, uint32 *status) { /* test XIO */
UNIT *uptr; /* pointer to unit in channel */
uint32 chan_icb; /* Interrupt level context block address */
CHANP *chp; /* Channel prog pointers */
DEVICE *dptr; /* Device ptr */
uint32 inta, incha, itva;
uint16 lchan = get_chan(lchsa); /* get the logical channel number */
uint32 spadent;
@ -1514,10 +1545,12 @@ t_stat testxio(uint16 lchsa, uint32 *status) { /* test XIO */
dibp = dib_chan[rchan]; /* get the DIB pointer */
chp = find_chanp_ptr(rchan << 8); /* find the device chanp pointer */
#ifdef CHANGE_03072021
if (waitqcnt != 0) { /* test for UTX delay */
waitqcnt = 0; /* tell cpu ok to int */
irq_pend = 1; /* flag to test for int condition */
}
#endif
if (dibp == 0 || chp == 0) { /* if no dib or channel ptr, CC3 return */
*status = CC3BIT; /* not found, so CC3 */
sim_debug(DEBUG_EXP, &cpu_dev,
@ -1526,11 +1559,13 @@ t_stat testxio(uint16 lchsa, uint32 *status) { /* test XIO */
}
uptr = chp->unitptr; /* get the unit 0 ptr */
/* is unit attached? */
if ((uptr->flags & UNIT_ATTABLE) && ((uptr->flags & UNIT_ATT) == 0)) {
*status = CC3BIT; /* not attached, so error CC3 */
/* is device or unit marked disabled? */
dptr = get_dev(uptr);
if ((dptr->flags & DEV_DIS) || (uptr->flags & UNIT_DIS)) {
/* is device/unit disabled? */
*status = CC3BIT; /* not enabled, so error CC3 */
sim_debug(DEBUG_EXP, &cpu_dev,
"TIO lchsa %04x rchsa %04x device not attached, CC3 returned\n", lchsa, rchsa);
"TIO rchsa %04x device/unit not enabled, CC3 returned\n", rchsa);
return SCPE_OK; /* Not found, CC3 */
}
@ -1594,6 +1629,7 @@ t_stat stopxio(uint16 lchsa, uint32 *status) { /* stop XIO */
uint32 chan_icb; /* Interrupt level context block address */
uint32 iocla, inta, itva; /* I/O channel IOCL address int ICB */
CHANP *chp; /* Channel prog pointers */
DEVICE *dptr; /* Device ptr */
uint16 lchan = get_chan(lchsa); /* get the logical channel number */
uint32 spadent;
uint16 rchan, rchsa; /* the real channel number, chsa */
@ -1615,11 +1651,14 @@ t_stat stopxio(uint16 lchsa, uint32 *status) { /* stop XIO */
}
uptr = chp->unitptr; /* get the unit ptr */
if ((uptr->flags & UNIT_ATTABLE) && ((uptr->flags & UNIT_ATT) == 0)) { /* is unit attached? */
*status = CC3BIT; /* not attached, so error CC3 */
/* is device or unit marked disabled? */
dptr = get_dev(uptr);
if ((dptr->flags & DEV_DIS) || (uptr->flags & UNIT_DIS)) {
/* is device/unit disabled? */
*status = CC3BIT; /* not enabled, so error CC3 */
sim_debug(DEBUG_EXP, &cpu_dev,
"STPIO test 2 rchsa %04x device not present, CC3 returned\n", rchsa);
return SCPE_OK; /* not found CC3 */
"STPIO rchsa %04x device/unit not enabled, CC3 returned\n", rchsa);
return SCPE_OK; /* Not found, CC3 */
}
/* the XIO opcode processing software has already checked for F class */
@ -1707,6 +1746,7 @@ t_stat rschnlxio(uint16 lchsa, uint32 *status) { /* reset channel XIO */
DIB *dibp; /* device information pointer */
UNIT *uptr; /* pointer to unit in channel */
CHANP *chp; /* Channel prog pointers */
DEVICE *dptr; /* Device ptr */
int i;
uint16 lchan = get_chan(lchsa); /* get the logical channel number */
uint32 inta;
@ -1731,12 +1771,14 @@ t_stat rschnlxio(uint16 lchsa, uint32 *status) { /* reset channel XIO */
}
uptr = chp->unitptr; /* get the unit ptr */
if ((uptr->flags & UNIT_ATTABLE) && ((uptr->flags & UNIT_ATT) == 0)) { /* is unit attached? */
*status = CC3BIT; /* not attached, so error CC3 */
/* is device or unit marked disabled? */
dptr = get_dev(uptr);
if ((dptr->flags & DEV_DIS) || (uptr->flags & UNIT_DIS)) {
/* is device/unit disabled? */
*status = CC3BIT; /* not enabled, so error CC3 */
sim_debug(DEBUG_EXP, &cpu_dev,
"rschnlxio test 2 lchsa %04x rchsa %04x device not present, CC3 returned\n",
lchsa, rchsa);
return SCPE_OK; /* not found CC3 */
"RSCHNL rchsa %04x device/unit not enabled, CC3 returned\n", rchsa);
return SCPE_OK; /* Not found, CC3 */
}
inta = ((~spadent)>>16)&0x7f; /* get channel interrupt level */
@ -1794,6 +1836,7 @@ t_stat haltxio(uint16 lchsa, uint32 *status) { /* halt XIO */
uint16 lchan = get_chan(lchsa);
uint16 rchan, rchsa;
CHANP *chp; /* Channel prog pointers */
DEVICE *dptr; /* DEVICE pointer */
/* get the device entry for the logical channel in SPAD */
spadent = SPAD[lchan]; /* get spad device entry for logical channel */
@ -1809,12 +1852,16 @@ t_stat haltxio(uint16 lchsa, uint32 *status) { /* halt XIO */
return SCPE_OK; /* not found, CC3 */
}
uptr = chp->unitptr; /* get the unit ptr */
if ((uptr->flags & UNIT_ATTABLE) && ((uptr->flags & UNIT_ATT) == 0)) { /* is unit attached? */
/* is device or unit marked disabled? */
dptr = get_dev(uptr);
if ((dptr->flags & DEV_DIS) || (uptr->flags & UNIT_DIS)) {
/* is device/unit disabled? */
*status = CC3BIT; /* not enabled, so error CC3 */
sim_debug(DEBUG_EXP, &cpu_dev,
"HIO lchsa %04x rchsa %04x device not attached, CC3 returned\n", lchsa, rchsa);
*status = CC3BIT; /* not attached, so error CC3 */
return SCPE_OK; /* not found, CC3 */
"HIO rchsa %04x device/unit not enabled, CC3 returned\n", rchsa);
return SCPE_OK; /* Not found, CC3 */
}
/* see if interrupt is setup in SPAD and determine IVL for channel */
sim_debug(DEBUG_XIO, &cpu_dev, "HIO dev spad %08x lchsa %04x rchsa %04x\n", spadent, lchsa, rchsa);
@ -1841,7 +1888,7 @@ t_stat haltxio(uint16 lchsa, uint32 *status) { /* halt XIO */
/* test for SCPE_IOERR */
if (tempa != 0) { /* sub channel has status ready */
/* The device I/O has been terminated and status stored. */
sim_debug(DEBUG_XIO, &cpu_dev,
sim_debug(DEBUG_EXP, &cpu_dev,
"HIO halt_io call return ERROR FIFO #%1x rchsa %04x retstat %08x cstat %08x\n",
FIFO_Num(rchsa), rchsa, tempa, chp->chan_status);
@ -1854,36 +1901,93 @@ t_stat haltxio(uint16 lchsa, uint32 *status) { /* halt XIO */
if (post_csw(chp, ((STATUS_PCI) << 16))) {
INTS[inta] &= ~INTS_REQ; /* clear any level request */
*status = CC2BIT; /* status stored */
sim_debug(DEBUG_CMD, &cpu_dev,
sim_debug(DEBUG_EXP, &cpu_dev,
"$$$ HIO END2 rchsa %04x cmd %02x ccw_flags %04x status %04x\n",
rchsa, chp->ccw_cmd, chp->ccw_flags, *status);
/* change status from BUFF_POST to BUFF_DONE */
if (chp->chan_byte == BUFF_POST) {
chp->chan_byte = BUFF_DONE; /* show done & not busy */
sim_debug(DEBUG_EXP, &cpu_dev,
"HIO BUFF_DONE1 chp %p chan_byte %04x\n", chp, chp->chan_byte);
"HIO BUFF_DONE1a chp %p chan_byte %04x\n", chp, chp->chan_byte);
}
return SCPE_OK; /* CC2 & all OK */
}
} else {
}
#ifndef OLD_WAY_MAY_GOOD
else {
chp->ccw_count = 0; /* zero the count */
/* The diags want the interrupt for the disk */
*status = CC1BIT; /* request accepted, no status, so CC1 */
sim_debug(DEBUG_CMD, &cpu_dev,
sim_debug(DEBUG_EXP, &cpu_dev,
"$$$ HIO END2 ECHO rchsa %04x cmd %02x ccw_flags %04x status %04x\n",
rchsa, chp->ccw_cmd, chp->ccw_flags, *status);
return SCPE_OK; /* CC1 & all OK */
}
#endif
}
/* the device is not busy, so cmd has not started */
/* see if waiting to start */
if (chp->chan_byte == BUFF_NEXT) {
sim_debug(DEBUG_EXP, &cpu_dev,
"HIO BUFF_NEXT chsa %04x cmd %02x ccw_flags %04x chan_byte %02x\n",
rchsa, chp->ccw_cmd, chp->ccw_flags, chp->chan_byte);
}
if (chp->chan_byte == BUFF_POST) {
sim_debug(DEBUG_EXP, &cpu_dev,
"HIO BUFF_POST chsa %04x cmd %02x ccw_flags %04x chan_byte %02x\n",
rchsa, chp->ccw_cmd, chp->ccw_flags, chp->chan_byte);
}
if (chp->chan_byte == BUFF_DONE) {
sim_debug(DEBUG_EXP, &cpu_dev,
"HIO BUFF_DONE chsa %04x cmd %02x ccw_flags %04x chan_byte %02x\n",
rchsa, chp->ccw_cmd, chp->ccw_flags, chp->chan_byte);
}
if (chp->chan_byte == BUFF_EMPTY) {
sim_debug(DEBUG_EXP, &cpu_dev,
"HIO BUFF_EMPTY chsa %04x cmd %02x ccw_flags %04x chan_byte %02x\n",
rchsa, chp->ccw_cmd, chp->ccw_flags, chp->chan_byte);
}
#ifdef OLD_WAY
/* see if waiting to start */
if (chp->chan_byte == BUFF_NEXT) {
sim_debug(DEBUG_EXP, &cpu_dev,
"HIO BUFF_DONE2a chp %p chan_byte %04x\n", chp, chp->chan_byte);
chp->chan_byte = BUFF_DONE; /* allow to be dropped from RDYQ */
*status = CC1BIT; /* request accepted, no status, so CC1 */
return SCPE_OK; /* all OK */
}
/* see if done */
if (chp->chan_byte == BUFF_POST) {
/* post status for UTX */
if (post_csw(chp, ((STATUS_PCI) << 16))) {
INTS[inta] &= ~INTS_REQ; /* clear any level request */
*status = CC2BIT; /* status stored */
sim_debug(DEBUG_EXP, &cpu_dev,
"$$$ HIO END2b rchsa %04x cmd %02x ccw_flags %04x status %04x\n",
rchsa, chp->ccw_cmd, chp->ccw_flags, *status);
/* change status from BUFF_POST to BUFF_DONE */
if (chp->chan_byte == BUFF_POST) {
chp->chan_byte = BUFF_DONE; /* show done & not busy */
sim_debug(DEBUG_EXP, &cpu_dev,
"HIO BUFF_DONE1b chp %p chan_byte %04x\n", chp, chp->chan_byte);
}
return SCPE_OK; /* CC2 & all OK */
}
sim_debug(DEBUG_EXP, &cpu_dev,
"HIO BUFF_DONE2c chp %p chan_byte %04x\n", chp, chp->chan_byte);
/* allow status to be posted */
*status = CC1BIT; /* request accepted, no status, so CC1 */
return SCPE_OK; /* all OK */
}
#endif
/* the device is not busy, so cmd is completed */
sim_debug(DEBUG_EXP, &cpu_dev,
"HIO BUFF_DONE2 chp %p chan_byte %04x\n", chp, chp->chan_byte);
"HIO BUFF_DONE2d chp %p chan_byte %04x\n", chp, chp->chan_byte);
/* the channel is not busy, so return OK */
*status = CC1BIT; /* request accepted, no status, so CC1 */
sim_debug(DEBUG_CMD, &cpu_dev,
"$$$ HIO END3 rchsa %04x cmd %02x ccw_flags %04x status %04x\n",
rchsa, chp->ccw_cmd, chp->ccw_flags, *status);
#ifndef GIVE_INT_ON_NOT_BUSY_121420
#ifndef GIVE_INT_ON_NOT_BUSY_121420_03082021
chp->chan_byte = BUFF_DONE; /* we are done */
sim_debug(DEBUG_EXP, &cpu_dev,
"haltxio BUFF_DONE2 chp %p chan_byte %04x\n", chp, chp->chan_byte);
@ -1902,7 +2006,7 @@ t_stat haltxio(uint16 lchsa, uint32 *status) { /* halt XIO */
if ((chp->chan_byte & BUFF_BUSY) == 0) {
/* the channel is not busy, so return OK */
*status = CC1BIT; /* request accepted, no status, so CC1 */
sim_debug(DEBUG_CMD, &cpu_dev,
sim_debug(DEBUG_EXP, &cpu_dev,
"$$$ HIO END1 not busy return rchsa %04x cmd %02x ccw_flags %04x status %04x\n",
rchsa, chp->ccw_cmd, chp->ccw_flags, *status);
#ifndef MAYBE_NOT
@ -1922,7 +2026,8 @@ t_stat haltxio(uint16 lchsa, uint32 *status) { /* halt XIO */
/* a haltxio entry should be provided for a device so busy can be cleared */
/* check for a Command or data chain operation in progresss */
if (chp->chan_byte & BUFF_BUSY) {
sim_debug(DEBUG_XIO, &cpu_dev, "HIO device busy lchsa %04x rchsa %04x\n", lchsa, rchsa);
sim_debug(DEBUG_EXP, &cpu_dev,
"HIO device busy lchsa %04x rchsa %04x\n", lchsa, rchsa);
/* reset the DC or CC bits to force completion */
chp->ccw_flags &= ~(FLAG_DC|FLAG_CC); /* reset chaining bits */
@ -1937,7 +2042,7 @@ t_stat haltxio(uint16 lchsa, uint32 *status) { /* halt XIO */
if (post_csw(chp, ((STATUS_PCI) << 16))) {
INTS[inta] &= ~INTS_REQ; /* clear any level request */
*status = CC2BIT; /* status stored from SIO, so CC2 */
sim_debug(DEBUG_CMD, &cpu_dev,
sim_debug(DEBUG_EXP, &cpu_dev,
"$$$ HIO END4 rchsa %04x cmd %02x ccw_flags %04x status %04x\n",
rchsa, chp->ccw_cmd, chp->ccw_flags, *status);
/* change status from BUFF_POST to BUFF_DONE */
@ -1950,7 +2055,7 @@ t_stat haltxio(uint16 lchsa, uint32 *status) { /* halt XIO */
chp->chan_byte = BUFF_DONE; /* chan prog done */
/* the channel is not busy, so return OK */
*status = CC1BIT; /* request accepted, no status, so CC1 */
sim_debug(DEBUG_CMD, &cpu_dev,
sim_debug(DEBUG_EXP, &cpu_dev,
"$$$ HIO END5 rchsa %04x cmd %02x ccw_flags %04x status %04x\n",
rchsa, chp->ccw_cmd, chp->ccw_flags, *status);
return SCPE_OK; /* No CC's all OK */
@ -1962,6 +2067,7 @@ t_stat grabxio(uint16 lchsa, uint32 *status) { /* grab controller XIO n/u *
DIB *dibp; /* device information pointer */
UNIT *uptr; /* pointer to unit in channel */
CHANP *chp;
DEVICE *dptr; /* Device ptr */
uint16 lchan = get_chan(lchsa); /* get the logical channel number */
uint32 spadent;
uint16 rchan, rchsa; /* the real channel number, chsa */
@ -1983,11 +2089,14 @@ t_stat grabxio(uint16 lchsa, uint32 *status) { /* grab controller XIO n/u *
}
uptr = chp->unitptr; /* get the unit ptr */
if ((uptr->flags & UNIT_ATTABLE) && ((uptr->flags & UNIT_ATT) == 0)) { /* is unit attached? */
*status = CC3BIT; /* not attached, so error CC3 */
/* is device or unit marked disabled? */
dptr = get_dev(uptr);
if ((dptr->flags & DEV_DIS) || (uptr->flags & UNIT_DIS)) {
/* is device/unit disabled? */
*status = CC3BIT; /* not enabled, so error CC3 */
sim_debug(DEBUG_EXP, &cpu_dev,
"GRIO test 2 lchsa %04x rchsa %04x device not present, CC3 returned\n", lchsa, rchsa);
return SCPE_OK; /* not found CC3 */
"GRIO rchsa %04x device/unit not enabled, CC3 returned\n", rchsa);
return SCPE_OK; /* Not found, CC3 */
}
/* check for a Command or data chain operation in progresss */
@ -2037,12 +2146,17 @@ t_stat rsctlxio(uint16 lchsa, uint32 *status) { /* reset controller XIO */
*status = CC3BIT; /* not found, so CC3 */
return SCPE_OK; /* not found, CC3 */
}
sim_debug(DEBUG_CMD, &cpu_dev, "rsctlxio 2 chan %04x, spad %08x\r\n", chsa, spadent);
if ((uptr->flags & UNIT_ATTABLE) && ((uptr->flags & UNIT_ATT) == 0)) { /* is unit attached? */
*status = CC3BIT; /* not attached, so error CC3 */
return SCPE_OK; /* not found, CC3 */
}
sim_debug(DEBUG_CMD, &cpu_dev, "rsctlxio 2 chan %04x spad %08x\r\n", chsa, spadent);
/* is device or unit marked disabled? */
dptr = get_dev(uptr); /* get device ptr */
// if ((uptr->flags & UNIT_ATTABLE) && ((uptr->flags & UNIT_ATT) == 0)) { /* is unit attached? */
if ((dptr->flags & DEV_DIS) || (uptr->flags & UNIT_DIS)) {
/* is device/unit disabled? */
*status = CC3BIT; /* not enabled, so error CC3 */
sim_debug(DEBUG_EXP, &cpu_dev,
"RSCTL rchsa %04x device/unit not enabled, CC3 returned\n", chsa);
return SCPE_OK; /* Not found, CC3 */
}
lev = find_int_lev(chan); /* get our int level */
INTS[lev] &= ~INTS_ACT; /* clear level active */
SPAD[lev+0x80] &= ~SINT_ACT; /* clear spad too */
@ -2176,7 +2290,7 @@ uint32 cont_chan(uint16 chsa)
int32 stat; /* return status 0/1 from loadccw */
CHANP *chp = find_chanp_ptr(chsa); /* channel program */
sim_debug(DEBUG_EXP, &cpu_dev,
sim_debug(DEBUG_XIO, &cpu_dev,
"cont_chan entry chp %p chan_byte %02x chsa %04x addr %06x\n",
chp, chp->chan_byte, chsa, chp->ccw_addr);
/* we have entries, continue channel program */
@ -2189,7 +2303,7 @@ uint32 cont_chan(uint16 chsa)
}
if (chp->chan_byte == BUFF_NEXT) {
uint32 chan = get_chan(chsa);
sim_debug(DEBUG_EXP, &cpu_dev,
sim_debug(DEBUG_XIO, &cpu_dev,
"cont_chan resume chan prog chsa %04x iocla %06x\n",
chsa, chp->chan_caw);
@ -2222,13 +2336,13 @@ uint32 cont_chan(uint16 chsa)
}
/* we get here when the start cmd has been processed without error */
/* go wait for the cmd to finish */
sim_debug(DEBUG_EXP, &cpu_dev,
sim_debug(DEBUG_XIO, &cpu_dev,
"cont_chan continue wait chsa %04x status %08x iocla %06x byte %02x\n",
chsa, chp->chan_status, chp->chan_caw, chp->chan_byte);
return SCPE_OK; /* done, status stored */
}
/* must be more IOCBs, wait for them */
sim_debug(DEBUG_EXP, &cpu_dev,
sim_debug(DEBUG_XIO, &cpu_dev,
"cont_chan continue not next chsa %04x status %08x iocla %06x\n",
chsa, chp->chan_status, chp->chan_caw);
return SCPE_OK;
@ -2286,11 +2400,13 @@ uint32 scan_chan(uint32 *ilev) {
return 0; /* not ready, return */
}
#ifdef TEMP_REMOVE_03072021
/* see if we are able to look for ints */
if (irq_pend == 0) /* pending int? */
return 0; /* no, done */
if (CPUSTATUS & BIT24) /* interrupts blocked? */
return 0; /* yes, done */
#endif
/* ints not blocked, so look for highest requesting interrupt */
for (i=0; i<112; i++) {
@ -2321,6 +2437,7 @@ uint32 scan_chan(uint32 *ilev) {
}
}
#ifdef TEMP_REMOVE_03072021
/* cannot make anyone active if ints are blocked */
if ((CPUSTATUS & BIT24) || (waitqcnt)) { /* interrupts blocked? */
if (waitqcnt) /* doing wait delay? */
@ -2329,6 +2446,14 @@ uint32 scan_chan(uint32 *ilev) {
sim_debug(DEBUG_DETAIL, &cpu_dev, "scan_chan INTS blocked!\n");
goto tryme; /* needed for MPX */
}
#else
/* cannot make anyone active if ints are blocked */
/* irq_pend will be set again when interrupts are unblocked */
if (CPUSTATUS & BIT24) { /* interrupts blocked? */
sim_debug(DEBUG_DETAIL, &cpu_dev, "scan_chan INTS blocked!\n");
goto tryme; /* needed for MPX */
}
#endif
/* now go process the highest requesting interrupt */
for (i=0; i<112; i++) {
@ -2628,7 +2753,8 @@ t_stat set_dev_addr(UNIT *uptr, int32 val, CONST char *cptr, void *desc) {
//printf("Got old chsa %04x\r\n", ochsa);
dib_unit[ochsa] = NULL; /* clear sa dib pointer */
dib_unit[ochsa&0x7f00] = NULL; /* clear the channel dib address */
if (dptr->flags & DEV_CHAN) { /* Is this a channel device IOP/MFP */
// if (dptr->flags & DEV_CHAN) { /* Is this a channel device IOP/MFP */
if (ochsa & 0xf0) { /* Is this a channel device IOP/MFP */
chan &= 0x7ff0; /* clean channel sub-address */
chsa = chan | (ochsa & 0xf); /* merge new channel with old sa */
} else {

8
SEL32/sel32_clk.c
View File

@ -119,12 +119,16 @@ t_stat rtc_srv (UNIT *uptr)
(SPAD[rtc_lvl+0x80] & SINT_ENAB)) && /* in spad too */
(((INTS[rtc_lvl] & INTS_ACT) == 0) || /* and not active */
((SPAD[rtc_lvl+0x80] & SINT_ACT) == 0))) { /* in spad too */
#if 0
/* HACK for console I/O stopping */
/* This reduces the number of console I/O stopping errors */
/* need to find real cause of I/O stopping on clock interrupt */
if ((outbusy==0) && (inbusy==0)) /* skip interrupt if con I/O in busy wait */
INTS[rtc_lvl] |= INTS_REQ; /* request the interrupt */
irq_pend = 1; /* make sure we scan for int */
INTS[rtc_lvl] |= INTS_REQ; /* request the interrupt */
#else
INTS[rtc_lvl] |= INTS_REQ; /* request the interrupt */
#endif
irq_pend = 1; /* make sure we scan for int */
}
sim_debug(DEBUG_CMD, &rtc_dev,
"RT Clock int INTS[%02x] %08x SPAD[%02x] %08x\n",

97
SEL32/sel32_com.c
View File

@ -96,6 +96,49 @@ TMXR com_desc = { COM_LINES_DFLT, 0, 0, com_ldsc }; /* com descr */
#define COM_READ 0x2000 /* Read mode selected */
/* ACE data kept in u4 */
/* ACE information in u4 */
#if 0
/* ACE byte 0 Modem Control/Operation status */
/* stored in u4 bytes 0-3 */
#define SNS_HALFD 0x80000000 /* Half-duplix operation set */
#define SNS_MRINGE 0x40000000 /* Modem ring enabled */
#define SNS_ACEFP 0x20000000 /* Forced parity 0=odd, 1=even */
#define SNS_ACEP 0x10000000 /* Parity 0=odd, 1=even */
#define SNS_ACEPE 0x08000000 /* Parity enable 0=dis, 1=enb */
#define SNS_ACESTOP 0x04000000 /* Stop bit 0=1, 1=1.5 or 2 */
#define SNS_ACECLEN 0x02000000 /* Character length 00=5, 01=6, 11=7, 11=8 */
#define SNS_ACECL2 0x01000000 /* 2nd bit for above */
/* ACE byte 1 Baud rate */
#define SNS_NUB50 0x00800000 /* Zero N/U */
#define SNS_NUB51 0x00400000 /* Zero N/U */
#define SNS_RINGCR 0x00200000 /* Ring or wakeup character recognition 0=enb, 1=dis */
#define SNS_DIAGL 0x00100000 /* Set diagnostic loopback */
#define SNS_BAUD 0x000F0000 /* Baud rate bits 4-7 */
#define BAUD50 0x00000000 /* 50 baud */
#define BAUD75 0x00010000 /* 75 baud */
#define BAUD110 0x00020000 /* 110 baud */
#define BAUD114 0x00030000 /* 134 baud */
#define BAUD150 0x00040000 /* 150 baud */
#define BAUD300 0x00050000 /* 300 baud */
#define BAUD600 0x00060000 /* 600 baud */
#define BAUD1200 0x00070000 /* 1200 baud */
#define BAUD1800 0x00080000 /* 1800 baud */
#define BAUD2000 0x00090000 /* 2000 baud */
#define BAUD2400 0x000A0000 /* 2400 baud */
#define BAUD3600 0x000B0000 /* 3600 baud */
#define BAUD4800 0x000C0000 /* 4800 baud */
#define BAUD7200 0x000D0000 /* 7200 baud */
#define BAUD9600 0x000E0000 /* 9600 baud */
#define BAUD19200 0x000F0000 /* 19200 baud */
/* ACE byte 2 Wake-up character */
#define ACE_WAKE 0x0000FF00 /* 8 bit wake-up character */
#endif
#define ACE_WAKE 0x0000FF00 /* 8 bit wake-up character in byte 2 of ACE */
/* in u5 packs sense byte 0,1 and 3 */
/* sense byte 3 */
/* in u5 packs sense byte 0, 1, 2 and 3 */
/* Sense byte 0 */
@ -126,6 +169,9 @@ TMXR com_desc = { COM_LINES_DFLT, 0, 0, com_ldsc }; /* com descr */
#define SNS_DELDSR 0x00000200 /* Delta data set ready interrupt */
#define SNS_DELCLR 0x00000100 /* Ring character interrupt */
/* Sense byte 3 Modem Control/Operation status */
#define SNS_RDY 0x80 /* device ready */
#define SNS_ONLN 0x40 /* device online */
//#define SNS_DSR 0x04 /* data set ready */
#define SNS_HALFD 0x00000080 /* Half-duplix operation set */
#define SNS_MRINGE 0x00000040 /* Modem ring enabled (1) */
#define SNS_ACEDEF 0x00000020 /* ACE parameters defined */
@ -170,18 +216,6 @@ TMXR com_desc = { COM_LINES_DFLT, 0, 0, com_ldsc }; /* com descr */
/* Sense byte 7 Firmware ID, Revision Level */
#define SNS_REV 0x0000004f /* ID part 2 plus 4 bit rev # */
/* ACE information in u4 */
#define ACE_WAKE 0x0000FF00 /* 8 bit wake-up character */
/* in u5 packs sense byte 0,1 and 3 */
/* Sense byte 0 */
#define SNS_CMDREJ 0x80000000 /* Command reject */
#define SNS_INTVENT 0x40000000 /* Unit intervention required */
/* sense byte 3 */
#define SNS_RDY 0x80 /* device ready */
#define SNS_ONLN 0x40 /* device online */
#define SNS_DSR 0x04 /* data set ready */
/* u6 */
/* forward definitions */
@ -416,7 +450,7 @@ uint16 com_preio(UNIT *uptr, uint16 chan) {
uint16 chsa = GET_UADDR(uptr->u3); /* get channel/sub-addr */
// int cmd = uptr->u3 & 0xff;
#ifdef WAIT_FOR_TESTING
#ifndef WAIT_FOR_TESTING
sim_debug(DEBUG_CMD, dptr, "com_preio CMD %08x unit %02x chsa %04x\n",
uptr->u3, unit, chsa);
if ((uptr->u3 & COM_MSK) != 0) { /* just return if busy */
@ -435,6 +469,7 @@ uint16 com_startcmd(UNIT *uptr, uint16 chan, uint8 cmd)
{
DEVICE *dptr = get_dev(uptr);
int unit = (uptr - dptr->units);
uint16 chsa = (((uptr->u3 & LMASK) >> 16) | (chan << 8));
uint8 ch;
if ((uptr->u3 & COM_MSK) != 0) { /* is unit busy */
@ -476,6 +511,7 @@ uint16 com_startcmd(UNIT *uptr, uint16 chan, uint8 cmd)
/* bit 3 P=1 Purge input buffer */
case COM_RD: /* 0x02 */ /* Read command */
case COM_RDECHO: /* 0x06 */ /* Read command w/ECHO */
case 0x32: /* 0x32 */ /* Read command ASCII & Purge input */
case 0x46: /* 0x46 */ /* Read command w/ECHO & ASCII */
case 0x56: /* 0x56 */ /* Read command w/ECHO & ASCII & Purge input */
/* if bit 0 set for COM_RDFC, use DTR for flow, else use RTS for flow control */
@ -549,12 +585,17 @@ uint16 com_startcmd(UNIT *uptr, uint16 chan, uint8 cmd)
case COM_DEFSC: /* 0x0B */ /* Define special char */
sim_debug(DEBUG_CMD, dptr,
"com_startcmd %04x: Cmd %02x DEFSC\n", chan, cmd);
"com_startcmd %04x: Cmd %02x DEFSC\n", chsa, cmd);
if (chan_read_byte(GET_UADDR(uptr->u3), &ch)) { /* read char from memory */
/* nothing to read, error */
return SNS_CHNEND|SNS_DEVEND|SNS_UNITCHK; /* good return */
}
uptr->u4 &= ~ACE_WAKE; /* clear out old wake char */
uptr->u4 |= ((uint32)ch << 8); /* insert special char */
uptr->u5 = ~SNS_RTS; /* Request to send not ready */
sim_debug(DEBUG_CMD, dptr,
"com_startcmd %04x: Cmd %02x DEFSC char %02x ACE %08x\n",
chsa, cmd, ch, uptr->u4);
return SNS_CHNEND|SNS_DEVEND; /* good return */
break;
@ -603,7 +644,7 @@ uint16 com_startcmd(UNIT *uptr, uint16 chan, uint8 cmd)
#define SNS_ACEP 0x10000000 /* Parity 0=odd, 1=even */
#define SNS_ACEPE 0x08000000 /* Parity enable 0=dis, 1=enb */
#define SNS_ACESTOP 0x04000000 /* Stop bit 0=1, 1=1.5 or 2 */
#define SNS_ACECLEN 0x02000000 /* Character length 00=5, 01=6, 11=7, 11=8 */
#define SNS_ACECLEN 0x02000000 /* Character length 00=5, 01=6, 10=7, 11=8 */
#define SNS_ACECL2 0x01000000 /* 2nd bit for above */
/* ACE byte 1 Baud rate */
@ -635,25 +676,38 @@ uint16 com_startcmd(UNIT *uptr, uint16 chan, uint8 cmd)
case COM_SACE: /* 0xff */ /* Set ACE parameters (3 chars) */
sim_debug(DEBUG_CMD, dptr,
"com_startcmd %04x: Cmd %02x SACE\n", chan, cmd);
"com_startcmd %04x: Cmd %02x SACE\n", chsa, cmd);
if (chan_read_byte(GET_UADDR(uptr->u3), &ch)) { /* read char 0 */
/* nothing to read, error */
return SNS_CHNEND|SNS_DEVEND|SNS_UNITCHK; /* good return */
}
uptr->u4 = ((uint32)ch)<<24; /* byte 0 of ACE data */
sim_debug(DEBUG_CMD, dptr,
"com_startcmd %04x: Cmd %02x ACE byte 0 %02x\n",
chsa, cmd, ch);
if (chan_read_byte(GET_UADDR(uptr->u3), &ch)) { /* read char 1 */
/* nothing to read, error */
return SNS_CHNEND|SNS_DEVEND|SNS_UNITCHK; /* good return */
}
uptr->u4 |= ((uint32)ch)<<16; /* byte 1 of ACE data */
sim_debug(DEBUG_CMD, dptr,
"com_startcmd %04x: Cmd %02x ACE byte 1 %02x\n",
chsa, cmd, ch);
if (chan_read_byte(GET_UADDR(uptr->u3), &ch)) { /* read char 2 */
/* nothing to read, error */
return SNS_CHNEND|SNS_DEVEND|SNS_UNITCHK; /* good return */
}
uptr->u4 |= ((uint32)ch)<<8; /* byte 2 of ACE data */
sim_debug(DEBUG_CMD, dptr,
"com_startcmd %04x: Cmd %02x ACE byte 2 %02x\n",
chsa, cmd, ch);
sim_debug(DEBUG_CMD, dptr,
"com_startcmd %04x: Cmd %02x ACE bytes %08x\n",
chan, cmd, uptr->u4);
return SNS_CHNEND|SNS_DEVEND; /* good return */
break;
@ -719,6 +773,9 @@ t_stat comi_srv(UNIT *uptr)
com_sta[newln] &= ~COML_REP; /* clr pending */
/* send attention to OS here for this channel */
/* need to get chsa here for the channel */
sim_debug(DEBUG_CMD, &com_dev,
"comi_srv wakeup on chsa %04x line %02x cmd %02x ACE %08x\n",
chsa, ln, cmd, uptr->u4);
set_devwake(chsa, SNS_ATTN|SNS_DEVEND|SNS_CHNEND); /* tell user */
}
/* poll all devices for input */
@ -762,14 +819,19 @@ t_stat comi_srv(UNIT *uptr)
/* send attention to OS here for this channel */
/* need to get chsa here for the channel */
/* tell user */
sim_debug(DEBUG_CMD, &com_dev,
"comi_srv user wakeup on chsa %04x line %02x cmd %02x ACE %08x\n",
chsa, ln, cmd, uptr->u4);
set_devwake(chsa, SNS_ATTN|SNS_DEVEND|SNS_CHNEND);
}
}
} /* end else char */
} /* end if char */
} /* end if conn */
else
else {
com_sta[ln] &= ~COML_RBP; /* disconnected */
com_sta[ln] |= COML_REP; /* set pending */
}
} /* end for */
return sim_clock_coschedule(uptr, 200); /* continue poll */
}
@ -920,6 +982,7 @@ void com_reset_ln (int32 ln)
{
sim_cancel(&coml_unit[ln]);
com_sta[ln] = 0;
com_sta[ln] |= COML_REP; /* set pending */
com_rbuf[ln] = 0; /* clear read buffer */
com_xbuf[ln] = 0; /* clear write buffer */
com_ldsc[ln].rcve = 0;

62
SEL32/sel32_cpu.c
View File

@ -158,7 +158,9 @@ uint32 RDYQIN; /* fifo input index */
uint32 RDYQOUT; /* fifo output index */
uint32 RDYQ[128]; /* channel ready queue */
uint8 waitqcnt = 0; /* # instructions before start */
#ifdef REMOVE_03072021
uint8 waitrdyq = 0; /* # instructions before post interrupt */
#endif
struct InstHistory
{
@ -1453,7 +1455,7 @@ t_stat RealAddr(uint32 addr, uint32 *realaddr, uint32 *prot, uint32 access)
if (CPU_MODEL >= MODEL_V6) {
/* map is not valid, so we have map fault */
sim_debug(DEBUG_EXP, &cpu_dev,
"AddrMa %06x RealAddr %06x Map0 HIT %04x, TLB[%3x] %08x MAPC[%03x] %08x\n",
"AddrMa %06x RealAddr %06x Map0 MISS %04x, TLB[%3x] %08x MAPC[%03x] %08x\n",
addr, word, map, nix, TLB[nix], nix/2, MAPC[nix/2]);
/* do a demand page request for the required page */
pfault = nix; /* save page number */
@ -1674,7 +1676,7 @@ t_stat Mem_read(uint32 addr, uint32 *data)
else
TRAPSTATUS |= BIT10; /* set bit 10 of trap status */
}
sim_debug(DEBUG_EXP, &cpu_dev, "Mem_read error %02x @ %06x TRAPSTATUS %08x\n",
sim_debug(DEBUG_EXP, &cpu_dev, "Mem_read MISS %02x @ %06x TRAPSTATUS %08x\n",
status, addr, TRAPSTATUS);
}
return status; /* return ALLOK or ERROR status */
@ -1943,9 +1945,11 @@ wait_loop:
uint32 chsa; /* channel/sub adddress */
int32 stat; /* return status 0/1 from loadccw */
#ifdef REMOVE_03072021
if (waitrdyq > 0) { /* see if we are waiting to start */
waitrdyq--;
} else
#endif
/* we have entries, continue channel program */
if (RDYQ_Get(&chsa) == SCPE_OK) { /* get chsa for program */
sim_debug(DEBUG_XIO, &cpu_dev,
@ -2071,32 +2075,68 @@ wait_loop:
}
}
#ifndef CHANGE_03072021
/* loop through the IOCL ready Q and decrement wait counts */
if ((int32c = RDYQ_Num())) {
int32 i, rqo = RDYQOUT;
for (i=0; i<int32c; i++) {
uint32 chsa; /* channel/sub adddress */
CHANP *chp; /* get channel prog pointer */
if (rqo == RDYQIN)
break; /* done with queue */
chsa = RDYQ[rqo]; /* get the next entry */
chp = find_chanp_ptr(chsa); /* get channel prog pointer */
if (chp->chan_qwait > 0) /* still waiting? */
chp->chan_qwait--; /* decrement count */
rqo++; /* next queue entry */
rqo %= RDYQ_SIZE; /* don't overrun end */
}
}
#endif
/* process IOCL entries that are waiting */
if (RDYQ_Num()) {
uint32 chsa; /* channel/sub adddress */
CHANP *chp; /* get channel prog pointer */
chsa = RDYQ[RDYQOUT]; /* get the next entry */
chp = find_chanp_ptr(chsa); /* get channel prog pointer */
if (chp->chan_byte != BUFF_NEXT) {
/* chan_byte is not BUFF_NEXT */
sim_debug(DEBUG_XIO, &cpu_dev,
"scan_chan Bad CPU RDYQ entry for chsa %04x chan_byte %02x\n",
chsa, chp->chan_byte);
}
#ifdef CHANGE_03072021
if (chp->chan_byte == BUFF_NEXT) {
#else
/* checking BUFF_NEXT hangs diag n keyboard termination */
if ((chp->chan_qwait == 0) || (chp->chan_byte != BUFF_NEXT)) {
// if ((chp->chan_qwait == 0) && (chp->chan_byte == BUFF_NEXT)) {
// if (chp->chan_qwait == 0) {
#endif
#ifdef REMOVE_03072021
/* we have entries, continue channel program */
if (waitrdyq > 0) {
waitrdyq--;
} else
#endif
if (RDYQ_Get(&chsa) == SCPE_OK) { /* get chsa for program */
int32 stat;
CHANP *chp = find_chanp_ptr(chsa); /* get channel prog pointer */
sim_debug(DEBUG_XIO, &cpu_dev,
"scan_chan CPU RDYQ entry for chsa %04x starting byte %02x\n",
chsa, chp->chan_byte);
stat = cont_chan(chsa); /* resume the channel program */
if (stat == SCPE_OK)
sim_debug(DEBUG_XIO, &cpu_dev,
"scan_chan CPU RDYQ entry for chsa %04x processed byte %04x\n",
chsa, chp->chan_byte);
else
sim_debug(DEBUG_XIO, &cpu_dev,
"scan_chan CPU RDYQ entry for chsa %04x processed w/error byte %04x\n",
chsa, chp->chan_byte);
/* if not BUFF_NEXT, channel has been stopped, just continue */
if (chp->chan_byte == BUFF_NEXT) {
stat = cont_chan(chsa); /* resume the channel program */
if (stat == SCPE_OK)
sim_debug(DEBUG_XIO, &cpu_dev,
"scan_chan CPU RDYQ entry for chsa %04x processed byte %04x\n",
chsa, chp->chan_byte);
else
sim_debug(DEBUG_XIO, &cpu_dev,
"scan_chan CPU RDYQ entry for chsa %04x processed w/error byte %04x\n",
chsa, chp->chan_byte);
}
}
}
}

14
SEL32/sel32_defs.h
View File

@ -212,12 +212,26 @@ typedef struct chp {
uint16 ccw_flags; /* Channel flags */
uint16 chan_status; /* Channel status */
uint16 chan_dev; /* Device on channel */
#ifndef CHANGE_03072021
uint16 chan_qwait; /* Instr to xeq before iocl proccessing */
#endif
uint8 ccw_cmd; /* Channel command and flags */
uint8 chan_byte; /* Current byte, empty/full */
uint8 chan_int; /* channel interrupt level */
uint8 chan_info; /* misc flags for channel */
} CHANP;
#define QWAIT0 0
#define QWAIT5 5
#define QWAIT10 10
#define QWAIT15 15
#define QWAIT20 20
#define QWAIT25 25
#define QWAIT30 30
#define QWAIT35 35
#define QWAIT40 40
#define QWAIT QWAIT0
/* Device information block */
#define FIFO_SIZE 256 /* fifo to hold 128 double words of status */
extern int32 FIFO_Put(uint16 chsa, uint32 entry);

63
SEL32/sel32_disk.c
View File

@ -587,14 +587,20 @@ uint32 get_dmatrk(UNIT *uptr, uint32 star, uint8 buf[])
int unit = (uptr - dptr->units); /* get the UNIT number */
int len, i, cn, found = -1;
/* zero the Track Label Buffer */
for (i = 0; i < 30; i++)
buf[i] = 0;
#ifdef SPEEDUP
int ds = ((CYL(type) - 3) * HDS(type)) * SPT(type); /* diag start */
/* get file offset in sectors */
tstart = STAR2SEC(star, SPT(type), SPC(type));
/* convert sector number back to chs value to sync disk for diags */
nstar = disksec2star(tstart, type);
if (ds >= tstart)
return nstar; /* not in diag track, return */
#else
/* get file offset in sectors */
tstart = STAR2SEC(star, SPT(type), SPC(type));
/* convert sector number back to chs value to sync disk for diags */
nstar = disksec2star(tstart, type);
#endif
cyl = (nstar >> 16) & 0xffff; /* get the cylinder */
trk = (nstar >> 8) & 0xff; /* get the track */
@ -610,6 +616,10 @@ uint32 get_dmatrk(UNIT *uptr, uint32 star, uint8 buf[])
/* calc offset in file to track label */
offset = CAPB(type) + (tstart * 30);
/* zero the Track Label Buffer */
for (i = 0; i < 30; i++)
buf[i] = 0;
/* see if track label is in cache */
for (cn=0; cn<TRK_CACHE; cn++) {
if (offset == tkl_label[unit].tkl[cn].track) {
@ -932,6 +942,9 @@ loop:
sim_debug(DEBUG_EXP, dptr,
"disk_iocl continue wait chsa %04x status %08x\n",
chp->chan_dev, chp->chan_status);
#ifndef CHANGE_03072021
chp->chan_qwait = QWAIT; /* run 25 instructions before starting iocl */
#endif
}
} else
@ -2951,6 +2964,7 @@ int disk_format(UNIT *uptr) {
uint32 cylv = cyl; /* number of cylinders */
uint8 *buff;
int32 i;
t_stat oldsw = sim_switches; /* save switches */
/* last sector address of disk (cyl * hds * spt) - 1 */
uint32 laddr = CAP(type) - 1; /* last sector of disk */
@ -2996,9 +3010,16 @@ int disk_format(UNIT *uptr) {
0x9a000000 | ltaddr, 0xf4000000};
#endif
/* see if user wants to initialize the disk */
if (!get_yn("Initialize disk? [Y] ", TRUE)) {
return 1;
/* see if -i or -n specified on attach command */
if (!(sim_switches & SWMASK('N')) && !(sim_switches & SWMASK('I'))) {
sim_switches = 0; /* simh tests 'N' & 'Y' switches */
/* see if user wants to initialize the disk */
if (!get_yn("Initialize disk? [Y] ", TRUE)) {
// printf("disk_format init question is false\r\n");
sim_switches = oldsw;
return 1;
}
sim_switches = oldsw; /* restore switches */
}
/* VDT 249264 (819/18/0) 0x3cdb0 for 9346 - 823/19/16 vaddr */
@ -3177,6 +3198,15 @@ t_stat disk_attach(UNIT *uptr, CONST char *file)
return SCPE_FMT; /* error */
}
if (dptr->flags & DEV_DIS) {
fprintf(sim_deb,
"ERROR===ERROR\nDisk device %s disabled on system, aborting\r\n",
dptr->name);
printf("ERROR===ERROR\nDisk device %s disabled on system, aborting\r\n",
dptr->name);
return SCPE_UDIS; /* device disabled */
}
/* have simulator attach the file to the unit */
if ((r = attach_unit(uptr, file)) != SCPE_OK)
return r;
@ -3194,6 +3224,11 @@ t_stat disk_attach(UNIT *uptr, CONST char *file)
disk_type[type].name, disk_type[type].cyl, disk_type[type].nhds,
disk_type[type].spt, ssize, uptr->capac); /* disk capacity */
/* see if -i or -n specified on attach command */
if ((sim_switches & SWMASK('N')) || (sim_switches & SWMASK('I'))) {
goto fmt; /* user wants new disk */
}
/* seek to end of disk */
if ((sim_fseek(uptr->fileref, 0, SEEK_END)) != 0) {
sim_debug(DEBUG_CMD, dptr, "UDP Disk attach SEEK end failed\n");
@ -3207,8 +3242,8 @@ t_stat disk_attach(UNIT *uptr, CONST char *file)
printf("Disk attach ftell failed s=%06d\r\n", s);
goto fmt; /* not setup, go format */
}
// sim_debug(DEBUG_CMD, dptr, "UDP Disk attach ftell value s=%06d b=%06d CAP %06d\n", s/ssize, s, CAP(type));
// printf("Disk attach ftell value s=%06d b=%06d CAP %06d\r\n", s/ssize, s, CAP(type));
sim_debug(DEBUG_CMD, dptr, "UDP Disk attach ftell value s=%06d b=%06d CAP %06d\n", s/ssize, s, CAP(type));
printf("Disk attach ftell value s=%06d b=%06d CAP %06d\r\n", s/ssize, s, CAP(type));
if (((int)s/(int)ssize) < ((int)CAP(type))) { /* full sized disk? */
j = (CAP(type) - (s/ssize)); /* get # sectors to write */
@ -3301,6 +3336,8 @@ fmt:
ldone:
/* see if disk has labels already, seek to sector past end of disk */
if ((sim_fseek(uptr->fileref, CAP(type)*ssize, SEEK_SET)) != 0) { /* seek end */
sim_debug(DEBUG_CMD, dptr, "UDP Disk attach SEEK last sector @ldone failed\n");
printf("UDP Disk attach SEEK last sector @ldone failed\r\n");
detach_unit(uptr); /* detach if error */
return SCPE_FMT; /* error */
}
@ -3398,12 +3435,20 @@ t_stat disk_boot(int32 unit_num, DEVICE *dptr) {
sim_debug(DEBUG_CMD, dptr,
"Disk Boot dev/unit %x\n", GET_UADDR(uptr->CMD));
/* see if device disabled */
if (dptr->flags & DEV_DIS) {
printf("ERROR===ERROR\r\nDisk device %s disabled on system, aborting\r\n",
dptr->name);
return SCPE_UDIS; /* device disabled */
}
if ((uptr->flags & UNIT_ATT) == 0) {
sim_debug(DEBUG_EXP, dptr,
"Disk Boot attach error dev/unit %04x\n",
GET_UADDR(uptr->CMD));
return SCPE_UNATT; /* attached? */
}
SPAD[0xf4] = GET_UADDR(uptr->CMD); /* put boot device chan/sa into spad */
SPAD[0xf8] = 0xF000; /* show as F class device */

30
SEL32/sel32_ec.c
View File

@ -259,6 +259,8 @@ UNIT ec_unit[] = {
{UDATA(ec_srv, UNIT_IDLE|UNIT_DIS|UNIT_SUBCHAN, 0), 0, UNIT_ADDR(0xE05)}, /* 5 */
{UDATA(ec_srv, UNIT_IDLE|UNIT_DIS|UNIT_SUBCHAN, 0), 0, UNIT_ADDR(0xE06)}, /* 6 */
{UDATA(ec_srv, UNIT_IDLE|UNIT_DIS|UNIT_SUBCHAN, 0), 0, UNIT_ADDR(0xE07)}, /* 7 */
{UDATA(ec_srv, UNIT_IDLE|UNIT_DIS|UNIT_SUBCHAN, 0), 0, UNIT_ADDR(0xE08)}, /* 8 */
{UDATA(ec_srv, UNIT_IDLE|UNIT_DIS|UNIT_SUBCHAN, 0), 0, UNIT_ADDR(0xE09)}, /* 9 */
#else
{UDATA(ec_srv, UNIT_IDLE|UNIT_SUBCHAN, 0), 0, UNIT_ADDR(0xE01)}, /* 1 */
{UDATA(ec_srv, UNIT_IDLE|UNIT_SUBCHAN, 0), 0, UNIT_ADDR(0xE02)}, /* 2 */
@ -539,9 +541,6 @@ loop:
}
}
// if (chp->ccw_cmd == EC_READ) /* Force SLI on READ */
// chp->ccw_flags |= FLAG_SLI;
chp->chan_byte = BUFF_BUSY; /* busy & no bytes transferred yet */
sim_debug(DEBUG_XIO, dptr,
@ -589,6 +588,9 @@ loop:
sim_debug(DEBUG_EXP, dptr,
"ec_iocl continue wait chsa %04x status %08x\n",
chp->chan_dev, chp->chan_status);
#ifndef CHANGE_03072021
chp->chan_qwait = QWAIT; /* run 25 instructions before starting iocl */
#endif
}
} else
@ -1155,8 +1157,9 @@ wr_end:
}
len = ec_data.rec_buff[ec_data.xtr_ptr].len;
/*JB*/ ec_data.rec_buff[ec_data.xtr_ptr].len = 0; /* clear old count */
// if (ec_data.xtr_ptr == ec_data.rec_ptr)
// len = 0;
// len = 0;
sim_debug(DEBUG_DETAIL, &ec_dev, "ec_srv SNS %d %d\n", ec_data.xtr_ptr,
ec_data.rec_ptr);
ch = (uptr->SNS >> 24) & 0xfc;
@ -1185,7 +1188,7 @@ wr_end:
break;
}
uptr->SNS &= ~(SNS_CMDREJ|SNS_EQUCHK); /* clear old status */
/*JB*/ uptr->SNS &= 0xffff0000; /* clear last count */
chan_end(chsa, SNS_CHNEND|SNS_DEVEND); /* done */
break;
@ -1221,12 +1224,12 @@ uint16 ec_haltio(UNIT *uptr) {
sim_debug(DEBUG_CMD, dptr,
"ec_haltio HIO chsa %04x cmd = %02x ccw_count %02x\n", chsa, cmd, chp->ccw_count);
// stop any I/O and post status and return error status */
chp->chan_byte = BUFF_EMPTY; /* there is no data to read/store */
chp->ccw_count = 0; /* zero the count */
chp->ccw_flags &= ~(FLAG_DC|FLAG_CC); /* stop any chaining */
uptr->CMD &= LMASK; /* make non-busy */
uptr->SNS = SNS_RCV_RDY; /* status is online & ready */
sim_cancel(uptr); /* clear the input timer */
if (chsa & 0x0f) /* no cancel for 0 */
sim_cancel(uptr); /* clear the input timer */
sim_debug(DEBUG_CMD, dptr,
"ec_haltio HIO I/O stop chsa %04x cmd = %02x\n", chsa, cmd);
chan_end(chsa, SNS_CHNEND|SNS_DEVEND); /* force end */
@ -1254,12 +1257,18 @@ void ec_ini(UNIT *uptr, t_bool f)
ec_data.xtr_ptr = 0;
ec_data.drop_cnt = 0;
ec_data.amc = 0;
if (ec_master_uptr->flags & UNIT_ATT)
if (ec_master_uptr->flags & UNIT_ATT) {
/* multicast on means promiscous is too */
eth_filter (&ec_data.etherface, ec_data.macs_n + 2, ec_data.macs,
ec_data.amc, ec_data.macs[0][0] & 1);
sim_debug(DEBUG_EXP, dptr,
"EC init device %s on unit EC%04X\n", dptr->name, GET_UADDR(uptr->CMD));
sim_debug(DEBUG_EXP, dptr,
"EC init device %s is attached on unit EC%04X\n",
dptr->name, GET_UADDR(uptr->CMD));
} else {
sim_debug(DEBUG_EXP, dptr,
"EC init device %s not attached on unit EC%04X\n",
dptr->name, GET_UADDR(uptr->CMD));
}
}
#ifdef FOR_TEST
@ -1572,6 +1581,7 @@ t_stat ec_attach(UNIT* uptr, CONST char* cptr)
/* init read queue (first time only) */
status = ethq_init(&ec_data.ReadQ, 8);
// status = ethq_init(&ec_data.ReadQ, 16); /* try 16 per device */
if (status != SCPE_OK) {
eth_close(&ec_data.etherface);
uptr->filename = NULL;

55
SEL32/sel32_hsdp.c
View File

@ -1066,6 +1066,9 @@ loop:
sim_debug(DEBUG_EXP, dptr,
"hsdp_iocl continue wait chsa %04x status %08x\n",
chp->chan_dev, chp->chan_status);
#ifndef CHANGE_03072021
chp->chan_qwait = QWAIT; /* run 25 instructions before starting iocl */
#endif
}
} else
@ -1202,7 +1205,6 @@ uint16 hsdp_haltio(UNIT *uptr) {
sim_debug(DEBUG_CMD, dptr,
"hsdp_haltio HIO chsa %04x cmd = %02x ccw_count %02x\n", chsa, cmd, chp->ccw_count);
/* stop any I/O and post status and return error status */
// chp->chan_byte = BUFF_EMPTY; /* there is no data to read/store */
chp->ccw_count = 0; /* zero the count */
chp->chan_caw = 0; /* zero iocd address for diags */
chp->ccw_flags &= ~(FLAG_DC|FLAG_CC);/* stop any chaining */
@ -3296,7 +3298,8 @@ int hsdp_format(UNIT *uptr) {
uint32 cylv = cyl; /* number of cylinders */
uint8 *buff;
int i;
int use_st_format = 1;
int use_st_format = 1; /* assume we use s/t replacement */
t_stat oldsw = sim_switches; /* save switches */
/* last sector address of disk (cyl * hds * spt) - 1 */
uint32 laddr = CAP(type) - 1; /* last sector of disk */
@ -3359,14 +3362,20 @@ int hsdp_format(UNIT *uptr) {
0x9a000000 | loglta, 0xf4000000};
#endif
/* see if user wants to initialize the disk */
if (!get_yn("Initialize disk? [Y] ", TRUE)) {
return 1;
/* see if -i or -n specified on attach command */
if (!(sim_switches & SWMASK('N')) && !(sim_switches & SWMASK('I'))) {
sim_switches = 0; /* simh tests 'N' & 'Y' switches */
/* see if user wants to initialize the disk */
if (!get_yn("Initialize disk? [Y] ", TRUE)) {
// printf("disk_format init question is false\r\n");
sim_switches = oldsw;
return 1;
}
}
if (!get_yn("Use Sector/Track replacement format? [Y] ", TRUE)) {
use_st_format = 0;
if (!get_yn("Use Sector/Track replacement format? [N] ", FALSE)) {
use_st_format = 0; /* do not use s/t replacement */
}
sim_switches = oldsw; /* restore switches */
/* get physical sector address of media defect table */
/* VDT 286965 (819/9/0) 0x460f5 for 8887 - 823/10/35 */
@ -3579,6 +3588,15 @@ t_stat hsdp_attach(UNIT *uptr, CONST char *file)
return SCPE_FMT; /* error */
}
if (dptr->flags & DEV_DIS) {
fprintf(sim_deb,
"ERROR===ERROR\nHSDP device %s disabled on system, aborting\r\n",
dptr->name);
printf("ERROR===ERROR\nHSDP device %s disabled on system, aborting\r\n",
dptr->name);
return SCPE_UDIS; /* device disabled */
}
/* have simulator attach the file to the unit */
if ((r = attach_unit(uptr, file)) != SCPE_OK)
return r;
@ -3597,6 +3615,11 @@ t_stat hsdp_attach(UNIT *uptr, CONST char *file)
hsdp_type[type].name, hsdp_type[type].cyl, hsdp_type[type].nhds,
hsdp_type[type].spt, ssize, uptr->capac); /* hsdp capacity */
/* see if -i or -n specified on attach command */
if ((sim_switches & SWMASK('N')) || (sim_switches & SWMASK('I'))) {
goto fmt; /* user wants new disk */
}
/* seek to end of disk */
if ((sim_fseek(uptr->fileref, 0, SEEK_END)) != 0) {
sim_debug(DEBUG_CMD, dptr, "HSDP Disk attach SEEK end failed\n");
@ -3798,11 +3821,15 @@ ldone:
return SCPE_FMT; /* error */
}
info = (buff[0]<<24) | (buff[1]<<16) | (buff[2]<<8) | buff[3];
good = (0x4e<<24) | (0x55<<16) | (0x4d<<8) | 0x50; /* NUMP */
good = 0x4e554d50; /* NUMP */
// printf("info %8x good %8x cnt %x\r\n", info, good, buff[35]);
if (info == good) {
/* we have a UTX umap, so fixup the data */
i = (16*8) + (buff[35]*3*4) - 1; /* byte offset to where to put 0xf4 */
if (buff[35] <= SPT(type))
// i = (16*8) + (buff[35]*3*4) - 1; /* byte offset to where to put 0xf4 */
i = (127) + (buff[35]*12); /* byte offset to where to put 0xf4 */
else
i = 127; /* only 1 track of replacement */
// printf("Fixing umap i %x info %8x good %8x buff[%x] %02x\r\n", i, info, good, i, buff[i]);
buff[i] = 0xf4; /* set stop for UTX search */
if ((sim_fseek(uptr->fileref, umapaddr*ssize, SEEK_SET)) != 0) { /* seek umap */
@ -3879,9 +3906,17 @@ t_stat hsdp_boot(int32 unit_num, DEVICE * dptr) {
sim_debug(DEBUG_CMD, dptr, "HSDP Boot dev/unit %x\n", GET_UADDR(uptr->CMD));
/* see if device disabled */
if (dptr->flags & DEV_DIS) {
printf("ERROR===ERROR\r\nHSDP device %s disabled on system, aborting\r\n",
dptr->name);
return SCPE_UDIS; /* device disabled */
}
if ((uptr->flags & UNIT_ATT) == 0) {
sim_debug(DEBUG_EXP, dptr, "HSDP Boot attach error dev/unit %04x\n",
GET_UADDR(uptr->CMD));
printf("HSDP Boot attach error dev/unit %04x\n", GET_UADDR(uptr->CMD));
return SCPE_UNATT; /* attached? */
}
SPAD[0xf4] = GET_UADDR(uptr->CMD); /* put boot device chan/sa into spad */

212
SEL32/sel32_mt.c
View File

@ -45,6 +45,8 @@
#define UNIT_MT UNIT_ATTABLE | UNIT_DISABLE | UNIT_ROABLE
#define DEV_BUF_NUM(x) (((x) & 07) << DEV_V_UF2)
#define GET_DEV_BUF(x) (((x) >> DEV_V_UF2) & 07)
//#define MTUF_V_WLK (UNIT_V_UF + 0) /* write lock */
//#define MTUF_WLK (1u << MTUF_V_WLK)
#define CMD u3
/* BTP tape commands */
@ -116,15 +118,17 @@
#define SNS_DATAWR 0x020000 /* Data written */
#define SNS_SPARE3 0x010000 /* Spare */
/* Sense byte 2 mode bits */
#define SNS_MREG0 0x8000 /* Mode register bit 0 */
#define SNS_MREG1 0x4000 /* Mode register bit 1 */
#define SNS_MREG2 0x2000 /* Mode register bit 2 */
#define SNS_MREG3 0x1000 /* Mode register bit 3 */
#define SNS_MREG4 0x0800 /* Mode register bit 4 */
#define SNS_MREG5 0x0400 /* Mode register bit 5 */
#define SNS_MREG6 0x0200 /* Mode register bit 6 */
#define SNS_MREG7 0x0100 /* Mode register bit 7 */
/* Sense byte 2 mode register bits */
#define SNS_MREG0 0x8000 /* 0 - Auto retry on read error */
/* 1 - Ignore read errors */
#define SNS_MREG1 0x4000 /* 0 - NRZI */
/* 1 - PE */
#define SNS_MREG2 0x2000 /* Mode register bit 2 N/U */
#define SNS_MREG3 0x1000 /* Mode register bit 3 N/U */
#define SNS_MREG4 0x0800 /* Mode register bit 4 N/U */
#define SNS_MREG5 0x0400 /* Mode register bit 5 N/U */
#define SNS_MREG6 0x0200 /* Mode register bit 6 N/U */
#define SNS_MREG7 0x0100 /* 1 - HSDP scatter/gather mode */
/* Sense byte 3 */
/* data returned for SENSE cnd (0x04) */
@ -319,8 +323,8 @@ DEVICE mta_dev = {
NUM_UNITS_MT, 16, 24, 4, 16, 32,
NULL, NULL, &mt_reset, &mt_boot, &mt_attach, &mt_detach,
/* ctxt is the DIB pointer */
// &mta_dib, DEV_BUF_NUM(0)|DEV_DIS|DEV_DISABLE|DEV_DEBUG|DEV_TAPE, 0, dev_debug,
&mta_dib, DEV_BUF_NUM(0)|DEV_DISABLE|DEV_DEBUG|DEV_TAPE, 0, dev_debug,
&mta_dib, DEV_BUF_NUM(0)|DEV_DIS|DEV_DISABLE|DEV_DEBUG|DEV_TAPE, 0, dev_debug,
// &mta_dib, DEV_BUF_NUM(0)|DEV_DISABLE|DEV_DEBUG|DEV_TAPE, 0, dev_debug,
NULL, NULL, &mt_help, NULL, NULL, &mt_description
};
@ -366,7 +370,8 @@ DEVICE mtb_dev = {
"MTB", mtb_unit, NULL, mt_mod,
NUM_UNITS_MT, 8, 15, 1, 8, 8,
NULL, NULL, &mt_reset, &mt_boot, &mt_attach, &mt_detach,
&mtb_dib, DEV_BUF_NUM(1)|DEV_DISABLE|DEV_DEBUG|DEV_TAPE, 0, dev_debug
&mtb_dib, DEV_BUF_NUM(0)|DEV_DIS|DEV_DISABLE|DEV_DEBUG|DEV_TAPE, 0, dev_debug,
// &mtb_dib, DEV_BUF_NUM(1)|DEV_DISABLE|DEV_DEBUG|DEV_TAPE, 0, dev_debug
NULL, NULL, &mt_help, NULL, NULL, &mt_description
};
#endif
@ -385,13 +390,15 @@ uint16 mt_preio(UNIT *uptr, uint16 chan) {
return SNS_BSY;
}
if ((uptr->flags & UNIT_ATT) == 0) { /* unit attached status */
/* set status */
uptr->SNS |= SNS_INTVENT; /* unit intervention required */
uptr->SNS &= ~(SNS_RDY|SNS_ONLN); /* unit not online or rdy */
uptr->SNS &= ~SNS_LOAD; /* reset BOT detected */
return SNS_BSY;
return SCPE_OK; /* good to go */
// return SNS_BSY;
}
sim_debug(DEBUG_CMD, dptr, "mt_preio unit %02x chsa %04xOK\n", unit, chsa);
sim_debug(DEBUG_CMD, dptr, "mt_preio unit %02x chsa %04x OK\n", unit, chsa);
return SCPE_OK; /* good to go */
}
@ -448,16 +455,27 @@ uint16 mt_startcmd(UNIT *uptr, uint16 chan, uint8 cmd)
sim_debug(DEBUG_EXP, dptr,
"mt_startcmd READ chan %04x addr %06x cnt %04x\n",
chan, chp->ccw_addr, chp->ccw_count);
if (cmd != 0x03) /* if this is a nop do not zero status */
if (cmd != 0x03) { /* if this is a nop do not zero status */
uptr->SNS = (uptr->SNS & 0x0000ff00); /* clear all but byte 2 */
uptr->SNS |= (SNS_RDY|SNS_ONLN); /* set ready status */
/* Fall through */
if (sim_tape_wrp(uptr))
uptr->SNS |= (SNS_WRP); /* write protected */
if (sim_tape_bot(uptr))
uptr->SNS |= (SNS_LOAD); /* tape at load point */
if (sim_tape_eot(uptr))
uptr->SNS |= (SNS_EOT); /* tape at EOM */
// uptr->SNS |= (SNS_RDY|SNS_ONLN); /* set ready status */
}
if ((uptr->flags & UNIT_ATT) == 0) { /* unit attached status */
uptr->SNS |= SNS_INTVENT; /* unit intervention required */
uptr->SNS &= ~(SNS_RDY|SNS_ONLN); /* unit not online or rdy */
uptr->SNS &= ~SNS_LOAD; /* reset BOT detected */
sim_debug(DEBUG_CMD, dptr, "mt_startcmd detached sense %08x chan %04x cmd %02x\n",
uptr->SNS, chan, cmd);
} else {
uptr->SNS |= (SNS_RDY|SNS_ONLN); /* set ready status */
if (sim_tape_wrp(uptr))
uptr->SNS |= (SNS_WRP); /* write protected */
if (sim_tape_bot(uptr))
uptr->SNS |= (SNS_LOAD); /* tape at load point */
if (sim_tape_eot(uptr))
uptr->SNS |= (SNS_EOT); /* tape at EOM */
sim_debug(DEBUG_CMD, dptr, "mt_startcmd attached sense %08x chan %04x cmd %02x\n",
uptr->SNS, chan, cmd);
}
/* Fall through */
case 0x04: /* Sense */
@ -466,10 +484,10 @@ uint16 mt_startcmd(UNIT *uptr, uint16 chan, uint8 cmd)
CLR_BUF(uptr); /* buffer is empty */
uptr->POS = 0; /* reset buffer position pointer */
mt_busy[GET_DEV_BUF(dptr->flags)] = 1; /* show we are busy */
sim_debug(DEBUG_EXP, dptr, "mt_startcmd sense %08x return 0 chan %04x cmd %02x\n",
sim_debug(DEBUG_EXP, dptr, "mt_startcmd sense %08x return OK chan %04x cmd %02x\n",
uptr->SNS, chan, cmd);
sim_activate(uptr, 100); /* Start unit off */
return 0;
return SCPE_OK; /* good to go */
default: /* invalid command */
sim_debug(DEBUG_EXP, dptr, "mt_startcmd CMDREJ return chan %04x cmd %02x\n",
@ -560,18 +578,8 @@ t_stat mt_srv(UNIT *uptr)
uint8 ch;
// uint8 buf[1024];
sim_debug(DEBUG_DETAIL, dptr, "mt_srv unit %04x cmd %02x\n", unit, cmd);
if ((uptr->flags & UNIT_ATT) == 0) { /* unit attached status */
uptr->SNS |= SNS_INTVENT; /* unit intervention required */
uptr->SNS &= ~(SNS_RDY|SNS_ONLN); /* unit not online or rdy */
uptr->SNS &= ~SNS_LOAD; /* reset BOT detected */
mt_busy[bufnum] &= ~1; /* make our buffer not busy */
if (cmd != MT_SENSE) { /* we are completed with unit check status */
uptr->CMD &= ~MT_CMDMSK; /* clear the cmd */
chan_end(chsa, SNS_CHNEND|SNS_DEVEND|SNS_UNITCHK);
return SCPE_OK;
}
}
// sim_debug(DEBUG_DETAIL, dptr, "mt_srv unit %04x cmd %02x\n", unit, cmd);
sim_debug(DEBUG_CMD, dptr, "mt_srv unit %04x cmd %02x\n", unit, cmd);
switch (cmd) {
case MT_CMDMSK: /* 0x0ff for inch 0x00 */ /* INCH is for channel, nothing for us */
@ -582,24 +590,13 @@ t_stat mt_srv(UNIT *uptr)
mema, chsa, chp->ccw_addr, chp->ccw_count);
if (len == 0) {
/* we have invalid count, error, bail out */
uptr->CMD &= ~(0xffff); /* remove old status bits & cmd */
uptr->SNS |= SNS_CMDREJ|SNS_EQUCHK;
chan_end(chsa, SNS_CHNEND|SNS_DEVEND|SNS_UNITCHK);
break;
/* we have invalid count, error, bail out */
uptr->CMD &= ~(0xffff); /* remove old status bits & cmd */
uptr->SNS |= SNS_CMDREJ|SNS_EQUCHK;
chan_end(chsa, SNS_CHNEND|SNS_DEVEND|SNS_UNITCHK);
return SCPE_OK;
}
#ifdef DIAG_WANTS_COUNT
for (i=0; i < len; i++) {
if (chan_read_byte(chsa, &buf[i])) {
/* we have error, bail out */
uptr->CMD &= ~(0xffff); /* remove old status bits & cmd */
uptr->SNS |= SNS_CMDREJ|SNS_EQUCHK;
chan_end(chsa, SNS_CHNEND|SNS_DEVEND|SNS_UNITCHK);
break;
}
/* just dump data */
}
#endif
/* the chp->ccw_addr location contains the inch address */
/* call set_inch() to setup inch buffer */
i = set_inch(uptr, mema); /* new address */
@ -609,7 +606,7 @@ t_stat mt_srv(UNIT *uptr)
uptr->CMD &= ~(0xffff); /* remove old status bits & cmd */
uptr->SNS |= SNS_CMDREJ|SNS_EQUCHK;
chan_end(chsa, SNS_CHNEND|SNS_DEVEND|SNS_UNITCHK);
break;
return SCPE_OK;
}
/* set halfwords 16 & 17 to 5 as default retry count in inch data */
/* UTX uses this value to see if the device is a buffered tape processor */
@ -622,7 +619,7 @@ t_stat mt_srv(UNIT *uptr)
uptr->CMD &= ~MT_CMDMSK; /* clear the cmd */
mt_busy[bufnum] &= ~1; /* make our buffer not busy */
chan_end(chsa, SNS_CHNEND|SNS_DEVEND); /* we are done dev|chan end */
break;
return SCPE_OK;
case 0x80: /* other? */ /* default to NOP */
sim_debug(DEBUG_CMD, dptr, "mt_srv cmd 80 DIAG unit=%04x SNS %08x\n", unit, uptr->SNS);
@ -655,13 +652,13 @@ t_stat mt_srv(UNIT *uptr)
sim_debug(DEBUG_CMD, dptr, "mt_srv DIAG SNS %08x char complete unit=%02x\n",
uptr->SNS, unit);
chan_end(chsa, SNS_CHNEND|SNS_DEVEND); /* we are done dev|chan end */
break;
return SCPE_OK;
case MT_NOP: /* 0x03 */ /* NOP motion command */
uptr->CMD &= ~MT_CMDMSK; /* clear the cmd */
mt_busy[bufnum] &= ~1; /* make our buffer not busy */
chan_end(chsa, SNS_CHNEND|SNS_DEVEND); /* we are done dev|chan end */
break;
return SCPE_OK;
case MT_SENSE: /* 0x04 */ /* get sense data */
/* write requested status */
@ -677,15 +674,57 @@ t_stat mt_srv(UNIT *uptr)
uptr->CMD &= ~MT_CMDMSK; /* clear the cmd */
mt_busy[bufnum] &= ~1; /* make our buffer not busy */
uptr->SNS = (uptr->SNS & 0x0000ff00); /* clear all but byte 2 */
if ((uptr->flags & UNIT_ATT) == 0) /* unit attached status */
if (!(uptr->flags & UNIT_ATT)) /* unit attached status */
uptr->SNS |= SNS_INTVENT; /* unit intervention required */
else
uptr->SNS &= ~(SNS_RDY|SNS_ONLN); /* unit not online or rdy */
uptr->SNS |= (SNS_RDY|SNS_ONLN); /* unit not online or rdy */
sim_debug(DEBUG_CMD, dptr, "mt_srv SENSE %08x char complete unit=%02x\n",
uptr->SNS, unit);
chan_end(chsa, SNS_CHNEND|SNS_DEVEND); /* we are done dev|chan end */
break;
return SCPE_OK;
case MT_SETM: /* 0x83 */ /* set mode byte */
sim_debug(DEBUG_CMD, dptr, "mt_srv cmd 0x83 SETM unit=%02x\n", unit);
/* Grab data until channel has no more */
if (chan_read_byte(chsa, &ch)) {
if (uptr->POS > 0) { /* Only if data in record */
reclen = uptr->hwmark; /* set record length */
ch = mt_buffer[bufnum][0]; /* get the first byte read */
sim_debug(DEBUG_CMD, dptr,
"Write mode data done unit %02x chars %02x mode %02x\n", unit, reclen, ch);
/* put mode bits into byte 2 of SNS */
uptr->SNS = (uptr->SNS & 0xffff00ff) | (ch << 8);
uptr->POS = 0; /* no bytes anymore */
uptr->CMD &= ~MT_CMDMSK; /* no cmd to do */
mt_busy[bufnum] &= ~1; /* set not busy */
chan_end(chsa, SNS_CHNEND|SNS_DEVEND); /* return end status */
}
} else {
mt_buffer[bufnum][uptr->POS++] = ch; /* save the character read in */
sim_debug(DEBUG_CMD, dptr, "Write mode data in unit %02x POS %04x mode %02x\n",
unit, uptr->POS, ch);
uptr->hwmark = uptr->POS; /* set high water mark */
sim_activate(uptr, 40); /* wait time */
}
return SCPE_OK;
default:
break;
}
/* only run these commands if we have a tape attached */
if ((uptr->flags & UNIT_ATT) == 0) { /* unit attached status */
uptr->SNS |= SNS_INTVENT; /* unit intervention required */
uptr->SNS &= ~(SNS_RDY|SNS_ONLN); /* unit not online or rdy */
uptr->SNS &= ~SNS_LOAD; /* reset BOT detected */
mt_busy[bufnum] &= ~1; /* make our buffer not busy */
/* we are completed with unit check status */
uptr->CMD &= ~MT_CMDMSK; /* clear the cmd */
chan_end(chsa, SNS_CHNEND|SNS_DEVEND|SNS_UNITCHK);
return SCPE_OK;
}
// uptr->SNS |= (SNS_RDY|SNS_ONLN); /* set ready status */
switch (cmd) {
case MT_READ: /* 0x02 */ /* read a record from the device */
sim_debug(DEBUG_DETAIL, dptr, "mt_srv cmd 2 READ unit=%02x\n", unit);
if (uptr->CMD & MT_READDONE) { /* is the read complete */
@ -759,31 +798,6 @@ t_stat mt_srv(UNIT *uptr)
}
break;
case MT_SETM: /* 0x83 */ /* set mode byte */
sim_debug(DEBUG_CMD, dptr, "mt_srv cmd 0x83 SETM unit=%02x\n", unit);
/* Grab data until channel has no more */
if (chan_read_byte(chsa, &ch)) {
if (uptr->POS > 0) { /* Only if data in record */
reclen = uptr->hwmark; /* set record length */
ch = mt_buffer[bufnum][0]; /* get the first byte read */
sim_debug(DEBUG_CMD, dptr,
"Write mode data done unit %02x chars %02x mode %02x\n", unit, reclen, ch);
/* put mode bits into byte 2 of SNS */
uptr->SNS = (uptr->SNS & 0xffff00ff) | (ch << 8);
uptr->POS = 0; /* no bytes anymore */
uptr->CMD &= ~MT_CMDMSK; /* no cmd to do */
mt_busy[bufnum] &= ~1; /* set not busy */
chan_end(chsa, SNS_CHNEND|SNS_DEVEND); /* return end status */
}
} else {
mt_buffer[bufnum][uptr->POS++] = ch; /* save the character read in */
sim_debug(DEBUG_CMD, dptr, "Write mode data in unit %02x POS %04x mode %02x\n",
unit, uptr->POS, ch);
uptr->hwmark = uptr->POS; /* set high water mark */
sim_activate(uptr, 40); /* wait time */
}
break;
case MT_WRITE: /* 0x01 */ /* write record */
/* Check if write protected */
if (sim_tape_wrp(uptr)) {
@ -1150,7 +1164,7 @@ void mt_ini(UNIT *uptr, t_bool f)
uptr->CMD &= ~0xffff; /* clear out the flags but leave ch/sa */
uptr->SNS = 0; /* clear sense data */
uptr->SNS |= (SNS_RDY|SNS_ONLN|SNS_LOAD); /* set initial status */
uptr->SNS |= (SNS_RDY|SNS_ONLN); /* set initial status */
mt_busy[GET_DEV_BUF(dptr->flags)] = 0; /* set not busy */
sim_cancel(uptr); /* cancel any timers */
sim_debug(DEBUG_EXP, dptr, "MT init device %s unit %02x\n",
@ -1185,9 +1199,17 @@ t_stat mt_attach(UNIT *uptr, CONST char *file)
t_stat r;
DIB *dibp = 0;
if (dptr->flags & DEV_DIS) {
fprintf(sim_deb, "ERROR===ERROR\nMT device %s disabled on system, aborting\r\n",
dptr->name);
printf("ERROR===ERROR\nMT device %s disabled on system, aborting\r\n",
dptr->name);
return SCPE_UDIS; /* device disabled */
}
/* mount the specified file to the MT */
if ((r = sim_tape_attach(uptr, file)) != SCPE_OK) {
sim_debug(DEBUG_EXP, dptr, "mt_attach ERROR filename %s status %08x\n", file, r);
fprintf(sim_deb, "mt_attach ERROR filename %s status %08x\r\n", file, r);
return r; /* report any error */
}
sim_debug(DEBUG_EXP, dptr, "mt_attach complete filename %s\n", file);
@ -1203,7 +1225,9 @@ t_stat mt_attach(UNIT *uptr, CONST char *file)
sim_debug(DEBUG_CMD, dptr,
"ERROR===ERROR\nMT device %s not configured on system, aborting\n",
dptr->name);
printf("ERROR===ERROR\nMT device %s not configured on system, aborting\n",
printf("ERROR===ERROR\nMT device %s not configured on system, aborting\r\n",
dptr->name);
fprintf(sim_deb, "ERROR===ERROR\nMT device %s not configured on system, aborting\r\n",
dptr->name);
detach_unit(uptr); /* detach if error */
return SCPE_UNATT; /* error */
@ -1220,6 +1244,8 @@ t_stat mt_detach(UNIT *uptr)
uptr->CMD &= ~0xffff; /* clear out the flags but leave ch/sa */
uptr->POS = 0; /* clear position data */
uptr->SNS = 0; /* clear sense data */
uptr->flags &= ~MTUF_WRP; /* clear write protect */
uptr->flags &= ~UNIT_RO; /* clear read only */
return sim_tape_detach(uptr);
}
@ -1228,10 +1254,18 @@ t_stat mt_boot(int32 unit_num, DEVICE *dptr)
{
UNIT *uptr = &dptr->units[unit_num]; /* find tape unit pointer */
/* see if device disabled */
if (dptr->flags & DEV_DIS) {
printf("ERROR===ERROR\r\nMT device %s disabled on system, aborting\r\n",
dptr->name);
return SCPE_UDIS; /* device disabled */
}
sim_debug(DEBUG_EXP, dptr, "MT Boot dev/unit %04x\n", GET_UADDR(uptr->CMD));
printf("MT Boot dev/unit %04x\r\n", GET_UADDR(uptr->CMD));
if ((uptr->flags & UNIT_ATT) == 0) { /* Is MT device already attached? */
sim_debug(DEBUG_EXP, dptr,
"MT Boot attach error dev/unit %04x\n", GET_UADDR(uptr->CMD));
printf("MT Boot attach error dev/unit %04x\r\n", GET_UADDR(uptr->CMD));
return SCPE_UNATT; /* not attached, return error */
}
SPAD[0xf4] = GET_UADDR(uptr->CMD); /* put boot device chan/sa into spad */

43
SEL32/sel32_scfi.c
View File

@ -640,6 +640,9 @@ loop:
sim_debug(DEBUG_EXP, dptr,
"scfi_iocl continue wait chsa %04x status %08x\n",
chp->chan_dev, chp->chan_status);
#ifndef CHANGE_03072021
chp->chan_qwait = QWAIT; /* run 25 instructions before starting iocl */
#endif
}
} else
@ -1528,6 +1531,7 @@ int scfi_format(UNIT *uptr) {
uint32 cylv = cyl; /* number of cylinders */
uint8 *buff;
int32 i;
t_stat oldsw = sim_switches; /* save switches */
/* last sector address of disk (cyl * hds * spt) - 1 */
uint32 laddr = CAP(type) - 1; /* last sector of disk */
@ -1537,9 +1541,16 @@ int scfi_format(UNIT *uptr) {
0x9a000000 | (cap-1), 0xf4000000};
/* see if user wants to initialize the disk */
if (!get_yn("Initialize disk? [Y] ", TRUE)) {
return 1;
/* see if -i or -n specified on attach command */
if (!(sim_switches & SWMASK('N')) && !(sim_switches & SWMASK('I'))) {
sim_switches = 0; /* simh tests 'N' & 'Y' switches */
/* see if user wants to initialize the disk */
if (!get_yn("Initialize disk? [Y] ", TRUE)) {
// printf("disk_format init question is false\r\n");
sim_switches = oldsw;
return 1;
}
sim_switches = oldsw; /* restore switches */
}
/* seek to sector 0 */
@ -1641,6 +1652,15 @@ t_stat scfi_attach(UNIT *uptr, CONST char *file)
return SCPE_FMT; /* error */
}
if (dptr->flags & DEV_DIS) {
fprintf(sim_deb,
"ERROR===ERROR\nSCFI Disk device %s disabled on system, aborting\r\n",
dptr->name);
printf("ERROR===ERROR\nSCFI Disk device %s disabled on system, aborting\r\n",
dptr->name);
return SCPE_UDIS; /* device disabled */
}
/* have simulator attach the file to the unit */
if ((r = attach_unit(uptr, file)) != SCPE_OK)
return r;
@ -1658,6 +1678,11 @@ t_stat scfi_attach(UNIT *uptr, CONST char *file)
scfi_type[type].name, scfi_type[type].cyl, scfi_type[type].nhds,
scfi_type[type].spt, ssize, uptr->capac); /* disk capacity */
/* see if -i or -n specified on attach command */
if ((sim_switches & SWMASK('N')) || (sim_switches & SWMASK('I'))) {
goto fmt; /* user wants new disk */
}
/* seek to end of disk */
if ((sim_fseek(uptr->fileref, 0, SEEK_END)) != 0) {
sim_debug(DEBUG_CMD, dptr, "SCFI Disk attach SEEK end failed\n");
@ -1824,10 +1849,18 @@ t_stat scfi_boot(int32 unit_num, DEVICE *dptr) {
sim_debug(DEBUG_CMD, dptr,
"SCFI Disk Boot dev/unit %x\n", GET_UADDR(uptr->CMD));
/* see if device disabled */
if (dptr->flags & DEV_DIS) {
printf("ERROR===ERROR\r\nSCFI Disk device %s disabled on system, aborting\r\n",
dptr->name);
return SCPE_UDIS; /* device disabled */
}
if ((uptr->flags & UNIT_ATT) == 0) {
sim_debug(DEBUG_EXP, dptr,
"SCFI Disk Boot attach error dev/unit %04x\n",
GET_UADDR(uptr->CMD));
"SCFI Disk Boot attach error dev/unit %04x\n", GET_UADDR(uptr->CMD));
printf("SCFI Disk Boot attach error dev/unit %04x\n", GET_UADDR(uptr->CMD));
return SCPE_UNATT; /* attached? */
}
SPAD[0xf4] = GET_UADDR(uptr->CMD); /* put boot device chan/sa into spad */

35
SEL32/sel32_scsi.c
View File

@ -1355,6 +1355,7 @@ int scsi_format(UNIT *uptr) {
uint32 cylv = cyl; /* number of cylinders */
uint8 *buff;
int i;
t_stat oldsw = sim_switches; /* save switches */
/* last sector address of disk (cyl * hds * spt) - 1 */
uint32 laddr = CAP(type) - 1; /* last sector of disk */
@ -1403,6 +1404,18 @@ int scsi_format(UNIT *uptr) {
uint32 fmap[4] = {0xf0000000 | (cap-1), 0x8a000000 | daddr,
0x9a000000 | ltaddr, 0xf4000000};
/* see if -i or -n specified on attach command */
if (!(sim_switches & SWMASK('N')) && !(sim_switches & SWMASK('I'))) {
sim_switches = 0; /* simh tests 'N' & 'Y' switches */
/* see if user wants to initialize the disk */
if (!get_yn("Initialize disk? [Y] ", TRUE)) {
// printf("disk_format init question is false\r\n");
sim_switches = oldsw;
return 1;
}
sim_switches = oldsw; /* restore switches */
}
/* see if user wants to initialize the disk */
if (!get_yn("Initialize disk? [Y] ", TRUE)) {
return 1;
@ -1587,6 +1600,15 @@ t_stat scsi_attach(UNIT *uptr, CONST char *file) {
return SCPE_FMT; /* error */
}
if (dptr->flags & DEV_DIS) {
fprintf(sim_deb,
"ERROR===ERROR\nSCSI Disk device %s disabled on system, aborting\r\n",
dptr->name);
printf("ERROR===ERROR\nSCSI Disk device %s disabled on system, aborting\r\n",
dptr->name);
return SCPE_UDIS; /* device disabled */
}
/* have simulator attach the file to the unit */
if ((r = attach_unit(uptr, file)) != SCPE_OK)
return r;
@ -1603,6 +1625,11 @@ t_stat scsi_attach(UNIT *uptr, CONST char *file) {
scsi_type[type].name, chsa, scsi_type[type].cyl, scsi_type[type].nhds,
scsi_type[type].spt, ssize, uptr->capac); /* disk capacity */
/* see if -i or -n specified on attach command */
if ((sim_switches & SWMASK('N')) || (sim_switches & SWMASK('I'))) {
goto fmt; /* user wants new disk */
}
/* seek to end of disk */
if ((sim_fseek(uptr->fileref, 0, SEEK_END)) != 0) {
sim_debug(DEBUG_CMD, dptr, "SCSI Disk attach SEEK end failed\n");
@ -1766,9 +1793,17 @@ t_stat scsi_boot(int32 unit_num, DEVICE *dptr) {
sim_debug(DEBUG_CMD, dptr, "SCSI Disk Boot dev/unit %04x\n", GET_UADDR(uptr->CMD));
/* see if device disabled */
if (dptr->flags & DEV_DIS) {
printf("ERROR===ERROR\r\nSCSI Disk device %s disabled on system, aborting\r\n",
dptr->name);
return SCPE_UDIS; /* device disabled */
}
if ((uptr->flags & UNIT_ATT) == 0) {
sim_debug(DEBUG_EXP, dptr, "SCSI Disk Boot attach error dev/unit %04x\n",
GET_UADDR(uptr->CMD));
printf("SCSI Disk Boot attach error dev/unit %04x\n", GET_UADDR(uptr->CMD));
return SCPE_UNATT; /* attached? */
}

52
SEL32/taptools/mkvmtape.c
View File

@ -193,8 +193,10 @@ char *argv[];
int32_t filen; /* file number */
// u_int32_t *dirp = dir; /* directory entry pointer */
// u_int32_t *volp = vol; /* volume entry pointer */
char *dirp = dirname; /* directory entry pointer */
char *volp = volname; /* volume entry pointer */
/// char *dirp = dirname; /* directory entry pointer */
/// char *volp = volname; /* volume entry pointer */
char *dirp = sysname; /* directory entry pointer */
char *volp = sysname; /* volume entry pointer */
int32_t totent; /* total smd entries */
char j_vfmt[] = {"!VOLSYST!DIRSYST!FIL J.VFMT "};
char j_mount[] = {"!VOLSYST!DIRSYST!FIL J.MOUNT "};
@ -747,14 +749,17 @@ printf("image file %s n1 %x (%d) n2 %x (%d) blks %x (%d)\n",
resdes[13]= dirlist[n+11];
/* 16 word resource create block */
resdes[14] = dirlist[n+8]; /* owner, system */
resdes[15] = dirlist[n+9];
resdes[16]= dirlist[n+10];
resdes[17]= dirlist[n+11];
resdes[18] = dirlist[n+8]; /* group, system */
resdes[19] = dirlist[n+9];
resdes[20]= dirlist[n+10];
resdes[21]= dirlist[n+11];
resdes[15] = dirlist[n+9]; /* only 8 bytes */
// resdes[16]= dirlist[n+10];
// resdes[17]= dirlist[n+11];
/// resdes[18] = dirlist[n+8]; /* group, system */
/// resdes[19] = dirlist[n+9]; /* only 8 bytes */
resdes[16] = dirlist[n+8]; /* group, system */
resdes[17] = dirlist[n+9]; /* only 8 bytes */
// resdes[20]= dirlist[n+10];
// resdes[21]= dirlist[n+11];
n += 12;
#ifdef OLDOLD
resdes[22]=flip(0x80f00000); /* owner rights */
resdes[23]=flip(0x80b00000); /* group rights */
resdes[24]=flip(0x80800000); /* other rights */
@ -766,6 +771,19 @@ printf("image file %s n1 %x (%d) n2 %x (%d) blks %x (%d)\n",
resdes[29]=flip(size); /* org file size */
resdes[31]=flip(1000); /* file starting address n/u */
resdes[33]=flip(0x00fbfeef); /* option flags */
#else
resdes[18]=flip(0x80f00000); /* owner rights */
resdes[19]=flip(0x80b00000); /* group rights */
resdes[20]=flip(0x80800000); /* other rights */
if (typ == 0xca)
resdes[21]=flip(0x00040110); /* res mgmt flags */
else
resdes[21]=flip(0x00040110); /* res mgmt flags */
// resdes[21]=flip(0x0004011c); /* res mgmt flags */
resdes[25]=flip(size); /* org file size */
resdes[27]=flip(1000); /* file starting address n/u */
resdes[29]=flip(0x00fbfeef); /* option flags */
#endif
/* reset of block is zero */
/* second block is resosurce descriptor from disk */
@ -794,8 +812,8 @@ printf("image file %s n1 %x (%d) n2 %x (%d) blks %x (%d)\n",
//210
//211
resdes[212] = dirlist[n+8]; /* ownername last changer, system */
resdes[213] = dirlist[n+9];
/// resdes[212] = dirlist[n+8]; /* ownername last changer, system */
/// resdes[213] = dirlist[n+9];
resdes[214] = dirlist[n+8]; /* ownername creator, system */
resdes[215] = dirlist[n+9];
@ -826,14 +844,18 @@ printf("image file %s n1 %x (%d) n2 %x (%d) blks %x (%d)\n",
else
if (typ == 0x00)
resdes[256]=flip(0x001000f1); /* space definition flags */
resdes[257]=flip(0x00000018); /* max extends */
resdes[258]=flip(0x00000008); /* min incr */
// resdes[257]=flip(0x00000018); /* max extends */
resdes[257]=flip(0x00000040); /* max extends */
// resdes[258]=flip(0x00000008); /* min incr */
resdes[258]=flip(0x00000010); /* min incr */
//259
// resdes[260]=flip(size-1); /* eof */
// resdes[261]=flip(size); /* eom */
resdes[260]=flip(size); /* eof */
resdes[261]=flip(size+1); /* eom */
/// resdes[260]=flip(size); /* eof */
/// resdes[261]=flip(size+1); /* eom */
resdes[260]=0; /* eof */
resdes[261]=flip(size); /* eom */
resdes[262]=flip(0x00000001); /* segment */
//263

BIN
doc/sel32_doc.doc
View File

Binary file not shown.