github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-01-30 13:27:50 +00:00
Code Releases Activity

ALL: Standardize writelock behavior adding global UNIT_WLK & UNIT_WPRT

Browse Source 
Historically this functionality was reimplemented within each
DEVICE simulator often with slightly different implementations
and inconsistencies.  Solving this globally within SCP required
changes in many places, but should henceforth be reasonably
managed.

As discussed in #1034
This commit is contained in:
Mark Pizzolato
2021-04-19 10:58:51 -07:00
parent 587b81bed4
commit a015e44c10
81 changed files with 413 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CDC1700/cdc1700_defs.h
View File

@@ -110,14 +110,12 @@
* Private unit flags
*/
#define UNIT_V_7TRACK (MTUF_V_UF + 0) /* 7-track tape transport */
#define UNIT_V_WPROT (MTUF_V_UF + 1) /* Write protected */
#define UNIT_V_854 (UNIT_V_UF + 0) /* 854 vs. 853 disk pack drive */
#define UNIT_V_856_4 (UNIT_V_UF + 0) /* 856_4 vs. 856_2 drive */
#define UNIT_V_DRMSIZE (UNIT_V_UF + 0) /* 1752 drum memory assignment */
#define UNIT_7TRACK (1 << UNIT_V_7TRACK)
#define UNIT_WPROT (1 << UNIT_V_WPROT)
#define UNIT_854 (1 << UNIT_V_854)
#define UNIT_856_4 (1 << UNIT_V_856_4)
#define UNIT_DRMSIZE (1 << UNIT_V_DRMSIZE)

30
CDC1700/cdc1700_mt.c
View File

@@ -291,7 +291,6 @@ t_stat mt_reset(DEVICE *);
t_stat mt_boot(int32, DEVICE *);
t_stat mt_attach(UNIT *, CONST char *);
t_stat mt_detach(UNIT *);
t_stat mt_vlock(UNIT *, int32 val, CONST char *cptr, void *desc);
void MTstate(const char *, DEVICE *, IO_DEVICE *);
void MTclear(DEVICE *);
@@ -483,10 +482,10 @@ MTAB mt_mod[] = {
&mt_set_type, &mt_show_type, NULL, "Set/Display magtape controller type" },
{ MTAB_XTD|MTAB_VDV, 0, "EQUIPMENT", "EQUIPMENT=hexAddress",
&set_equipment, &show_addr, NULL, "Set/Display equipment address" },
{ MTUF_WLK, 0, "write enabled", "WRITEENABLED",
&mt_vlock, NULL, NULL, "Mark transport as write enabled" },
{ MTUF_WLK, MTUF_WLK, "write locked", "LOCKED",
&mt_vlock, NULL, NULL, "Mark transport as writed locked" },
{ MTAB_XTD|MTAB_VUN, 0, "write enabled", "WRITEENABLED",
&set_writelock, &show_writelock, NULL, "Write enable tape drive" },
{ MTAB_XTD|MTAB_VUN, 1, NULL, "LOCKED",
&set_writelock, NULL, NULL, "Write enable tape drive" },
{ MTAB_XTD|MTAB_VUN, 0, "FORMAT", "FORMAT",
&sim_tape_set_fmt, &sim_tape_show_fmt, NULL, "Define tape format" },
{ MTAB_XTD|MTAB_VUN, 0, "CAPACITY", "CAPACITY",
@@ -1490,9 +1489,9 @@ t_stat mt_attach(UNIT *uptr, CONST char *cptr)
if (r != SCPE_OK)
return r;
uptr->flags &= ~UNIT_WPROT;
uptr->flags &= ~UNIT_WPRT;
if (sim_switches & SWMASK('R'))
uptr->flags |= UNIT_WPROT;
uptr->flags |= UNIT_WPRT;
uptr->DENS = IO_ST2_800;
@@ -1501,7 +1500,7 @@ t_stat mt_attach(UNIT *uptr, CONST char *cptr)
*/
if (MTdev.iod_unit == uptr) {
MTdev.STATUS2 = uptr->DENS & (IO_ST2_556 | IO_ST2_800);
if ((uptr->flags & UNIT_WPROT) != 0)
if ((uptr->flags & UNIT_WPRT) != 0)
MTdev.STATUS2 &= ~IO_ST2_WENABLE;
else MTdev.STATUS2 |= IO_ST2_WENABLE;
if ((uptr->flags & UNIT_7TRACK) != 0)
@@ -1531,17 +1530,6 @@ t_stat mt_detach(UNIT *uptr)
return st;
}
/* Write lock/enable routine */
t_stat mt_vlock(UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
if (((uptr->flags & UNIT_ATT) != 0) && (val || sim_tape_wrp(uptr)))
uptr->flags |= UNIT_WPROT;
else uptr->flags &= ~UNIT_WPROT;
return SCPE_OK;
}
/*
* Perform a "Clear Controller" operation. Basically this is similar to a
* device reset except it does not forget the currently selected transport.
@@ -1564,7 +1552,7 @@ void MTclear(DEVICE *dptr)
fw_setForced(&MTdev, IO_ST_READY);
MTdev.STATUS2 = uptr->DENS & (IO_ST2_556 | IO_ST2_800);
if ((uptr->flags & UNIT_WPROT) != 0)
if ((uptr->flags & UNIT_WPRT) != 0)
MTdev.STATUS2 &= ~IO_ST2_WENABLE;
else MTdev.STATUS2 |= IO_ST2_WENABLE;
if ((uptr->flags & UNIT_7TRACK) != 0)
@@ -1999,7 +1987,7 @@ enum IOstatus MTout(IO_DEVICE *iod, uint8 reg)
* Make sure STATUS2 values are consistent with actual drive status.
*/
MTdev.STATUS2 = uptr->DENS & (IO_ST2_556 | IO_ST2_800);
if ((uptr->flags & UNIT_WPROT) != 0)
if ((uptr->flags & UNIT_WPRT) != 0)
MTdev.STATUS2 &= ~IO_ST2_WENABLE;
else MTdev.STATUS2 |= IO_ST2_WENABLE;
if ((uptr->flags & UNIT_7TRACK) != 0)