github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-01-11 23:52:58 +00:00
Code Releases Activity

PDP11 and VAXen: Remove unneeded management of NOAUTOSIZE from device code

Browse Source
This commit is contained in:
Mark Pizzolato 2022-07-28 14:48:44 -07:00
parent 81fd92e4ee
commit fd5fdcfaa6
10 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PDP11/pdp11_hk.c
View File

@ -95,7 +95,6 @@ static DRVTYP drv_tab[] = {
#define UNIT_V_DUMMY (DKUF_V_UF + 0) /* dummy flag */
#define UNIT_DUMMY (1 << UNIT_V_DUMMY)
#define UNIT_NOAUTO DKUF_NOAUTOSIZE
/* Parameters in the unit descriptor */
@ -632,15 +631,11 @@ REG hk_reg[] = {
MTAB hk_mod[] = {
{ MTAB_XTD|MTAB_VUN, 0, "write enabled", "WRITEENABLED",
&set_writelock, &show_writelock, NULL, "Write enable tape drive" },
&set_writelock, &show_writelock, NULL, "Write enable disk drive" },
{ MTAB_XTD|MTAB_VUN, 1, NULL, "LOCKED",
&set_writelock, NULL, NULL, "Write lock tape drive" },
&set_writelock, NULL, NULL, "Write lock disk drive" },
{ UNIT_DUMMY, 0, NULL, "BADBLOCK",
&hk_set_bad, NULL, NULL, "write bad block table on last track" },
{ UNIT_NOAUTO, 0, "autosize", "AUTOSIZE",
NULL, NULL, NULL, "Set type based on file size at attach" },
{ UNIT_NOAUTO, UNIT_NOAUTO, "noautosize", "NOAUTOSIZE",
NULL, NULL, NULL, "Disable disk autosize on attach" },
{ MTAB_XTD|MTAB_VUN|MTAB_VALR, 0, "FORMAT", "FORMAT={AUTO|SIMH|VHD|RAW}",
&sim_disk_set_fmt, &sim_disk_show_fmt, NULL, "Set/Display disk format" },
{ MTAB_XTD|MTAB_VDV|MTAB_VALR, 0040, "ADDRESS", "ADDRESS",

11
PDP11/pdp11_rc.c
View File

@ -78,7 +78,6 @@
#include <math.h>
#define UNIT_GETP(u) ((u)->capac / (RC_NUMWD * RC_NUMSC * RC_NUMCY))
#define UNIT_NOAUTO DKUF_NOAUTOSIZE
#define UNIT_PLAT (UNIT_M_PLAT << UNIT_V_PLAT)
/* Constants */
@ -227,10 +226,12 @@ static const REG rc_reg[] = {
static const MTAB rc_mod[] = {
{ MTAB_XTD|MTAB_VUN, 0, "PLATTERS", NULL,
NULL, &sim_disk_show_drive_type, NULL, "Display Platters" },
{ UNIT_NOAUTO, 0, "autosize", "AUTOSIZE",
NULL, NULL, NULL, "set platters based on file size at ATTACH" },
{ UNIT_NOAUTO, UNIT_NOAUTO, "noautosize", "NOAUTOSIZE",
NULL, NULL, NULL, "set platters based explicit platter setting" },
{ MTAB_XTD|MTAB_VUN, 1, NULL, "AUTOSIZE",
&sim_disk_set_autosize, NULL, NULL, "set platters based on file size at attach" },
{ MTAB_XTD|MTAB_VUN, 0, NULL, "NOAUTOSIZE",
&sim_disk_set_autosize, NULL, NULL, "set platters based explicit platter setting" },
{ MTAB_XTD|MTAB_VUN, 0, "AUTOSIZE", NULL,
NULL, &sim_disk_show_autosize, NULL, "Display disk autosize on attach setting" },
{ MTAB_XTD|MTAB_VDV|MTAB_VALR, 0020, "ADDRESS", "ADDRESS",
&set_addr, &show_addr, NULL, "Bus address" },
{ MTAB_XTD|MTAB_VDV|MTAB_VALR, 0, "VECTOR", "VECTOR",

5
PDP11/pdp11_rk.c
View File

@ -126,7 +126,6 @@ static DRVTYP drv_tab[] = {
#define UNIT_V_SWLK (DKUF_V_UF + 0) /* swre write lock */
#define UNIT_HWLK UNIT_WPRT
#define UNIT_SWLK (1u << UNIT_V_SWLK)
#define UNIT_NOAUTO DKUF_NOAUTOSIZE /* autosize disabled */
/* Parameters in the unit descriptor */
@ -405,10 +404,6 @@ MTAB rk_mod[] = {
&set_writelock, &show_writelock, NULL, "Write enable tape drive" },
{ MTAB_XTD|MTAB_VUN, 1, NULL, "LOCKED",
&set_writelock, NULL, NULL, "Write lock tape drive" },
{ UNIT_NOAUTO, 0, "autosize", "AUTOSIZE",
NULL, NULL, NULL, "Set type based on file size at attach" },
{ UNIT_NOAUTO, UNIT_NOAUTO, "noautosize", "NOAUTOSIZE",
NULL, NULL, NULL, "Disable disk autosize on attach" },
{ MTAB_XTD|MTAB_VUN|MTAB_VALR, 0, "FORMAT", "FORMAT={AUTO|SIMH|VHD|RAW}",
&sim_disk_set_fmt, &sim_disk_show_fmt, NULL, "Set/Display disk format" },
{ MTAB_XTD|MTAB_VDV|MTAB_VALR, 010, "ADDRESS", "ADDRESS",

5
PDP11/pdp11_rl.c
View File

@ -135,7 +135,6 @@ static DRVTYP drv_tab[] = {
#define UNIT_BRUSH (1u << UNIT_V_BRUSH)
#define UNIT_OFFL (1u << UNIT_V_OFFL)
#define UNIT_DUMMY (1u << UNIT_V_DUMMY)
#define UNIT_NOAUTO DKUF_NOAUTOSIZE /* autosize disable */
/* Parameters in the unit descriptor */
@ -359,10 +358,6 @@ static const MTAB rl_mod[] = {
&set_writelock, NULL, NULL, "Write lock disk drive" },
{ UNIT_DUMMY, 0, NULL, "BADBLOCK",
&rl_set_bad, NULL, NULL, "Write bad block table on last track" },
{ UNIT_NOAUTO, 0, "autosize", "AUTOSIZE",
NULL, NULL, NULL, "Set type based on file size at attach" },
{ UNIT_NOAUTO, UNIT_NOAUTO, "noautosize", "NOAUTOSIZE",
NULL, NULL, NULL, "Disable disk autosize on attach" },
{ MTAB_XTD|MTAB_VUN|MTAB_VALR, 0, "FORMAT", "FORMAT={AUTO|SIMH|VHD|RAW}",
&sim_disk_set_fmt, &sim_disk_show_fmt, NULL, "Set/Display disk format" },
{ MTAB_XTD|MTAB_VDV|MTAB_VALR, 010, "ADDRESS", "ADDRESS",

13
PDP11/pdp11_rq.c
View File

@ -159,7 +159,6 @@ extern int32 MMR2;
#define UNIT_V_ATP (UNIT_V_ONL + 1) /* attn pending */
#define UNIT_ONL (1 << UNIT_V_ONL)
#define UNIT_ATP (1 << UNIT_V_ATP)
#define UNIT_NOAUTO DKUF_NOAUTOSIZE /* noautosize */
#define cpkt us9 /* current packet */
#define pktq us10 /* packet queue */
#define uf buf /* settable unit flags */
@ -1017,7 +1016,7 @@ REG rq_reg[] = {
};
MTAB rq_mod[] = {
{ MTAB_XTD|MTAB_VUN, 0, "write enable", "WRITEENABLED",
{ MTAB_XTD|MTAB_VUN, 0, "writeenable", "WRITEENABLED",
&rq_set_wlk, &rq_show_wlk, NULL, "Write enable disk drive" },
{ MTAB_XTD|MTAB_VUN, 1, NULL, "LOCKED",
&rq_set_wlk, NULL, NULL, "Write lock disk drive" },
@ -1051,8 +1050,6 @@ MTAB rq_mod[] = {
&rq_set_plug, &rq_show_plug, NULL, "Set/Display Unit plug value" },
{ MTAB_XTD|MTAB_VDV|MTAB_VALR, 0, NULL, "DRIVES=val (4-254)",
&rq_set_drives, NULL, NULL, "Set Number of Drives" },
{ UNIT_NOAUTO, UNIT_NOAUTO, "noautosize", "NOAUTOSIZE", NULL, NULL, NULL, "Disable disk autosize on attach" },
{ UNIT_NOAUTO, 0, "autosize", "AUTOSIZE", NULL, NULL, NULL, "Enable disk autosize on attach" },
{ MTAB_XTD|MTAB_VUN|MTAB_VALR, 0, "FORMAT", "FORMAT={AUTO|SIMH|VHD|RAW}",
&sim_disk_set_fmt, &sim_disk_show_fmt, NULL, "Set/Display disk format" },
#if defined (VM_PDP11)
@ -2828,13 +2825,11 @@ t_stat rq_attach (UNIT *uptr, CONST char *cptr)
{
MSC *cp = rq_ctxmap[uptr->cnum];
t_stat r;
t_bool dontchangecapac = (uptr->flags & UNIT_NOAUTO);
if (uptr->drvtyp->flags & RQDF_RO) {
if (uptr->drvtyp->flags & RQDF_RO)
sim_switches |= SWMASK ('R');
dontchangecapac = FALSE;
}
r = sim_disk_attach_ex (uptr, cptr, RQ_NUMBY, sizeof (uint16), dontchangecapac, DBG_DSK,
r = sim_disk_attach_ex (uptr, cptr, RQ_NUMBY, sizeof (uint16),
((uptr->drvtyp->flags & RQDF_RO) != 0), DBG_DSK,
uptr->drvtyp->name, 0, 0, NULL);
if (r != SCPE_OK)
return r;

4
VAX/vax4xx_rd.c
View File

@ -218,8 +218,6 @@
#define RD54_MED 0x25644036
#define RD54_FLGS DRVFL_NORMV
#define UNIT_NOAUTO DKUF_NOAUTOSIZE
struct drvtyp {
int32 sect; /* sectors */
int32 surf; /* surfaces */
@ -338,8 +336,6 @@ MTAB rd_mod[] = {
&set_writelock, &show_writelock, NULL, "Write enable drive" },
{ MTAB_XTD|MTAB_VUN, 1, NULL, "LOCKED",
&set_writelock, NULL, NULL, "Write lock drive" },
{ UNIT_NOAUTO, UNIT_NOAUTO, "noautosize", "NOAUTOSIZE", NULL, NULL, NULL, "Disable disk autosize on attach" },
{ UNIT_NOAUTO, 0, "autosize", "AUTOSIZE", NULL, NULL, NULL, "Enable disk autosize on attach" },
{ MTAB_XTD|MTAB_VUN | MTAB_VALR, 0, "FORMAT", "FORMAT={SIMH|VHD|RAW}",
&sim_disk_set_fmt, &sim_disk_show_fmt, NULL, "Display disk format" },
{ 0 }

2
VAX/vax4xx_rz80.c
View File

@ -180,8 +180,6 @@ MTAB rz_mod[] = {
&scsi_set_wlk, &scsi_show_wlk, NULL, "Write enable drive" },
{ MTAB_XTD|MTAB_VUN, 1, NULL, "LOCKED",
&scsi_set_wlk, NULL, NULL, "Write lock drive" },
{ SCSI_NOAUTO, SCSI_NOAUTO, "noautosize", "NOAUTOSIZE", NULL, NULL, NULL, "Disables disk autosize on attach" },
{ SCSI_NOAUTO, 0, "autosize", "AUTOSIZE", NULL, NULL, NULL, "Enables disk autosize on attach" },
{ MTAB_XTD|MTAB_VUN, 0, "FORMAT", "FORMAT",
&scsi_set_fmt, &scsi_show_fmt, NULL, "Set/Display unit format" },
{ 0 }

2
VAX/vax4xx_rz94.c
View File

@ -136,8 +136,6 @@ MTAB rz_mod[] = {
&scsi_set_wlk, &scsi_show_wlk, NULL, "Write enable drive" },
{ MTAB_XTD|MTAB_VUN, 1, NULL, "LOCKED",
&scsi_set_wlk, NULL, NULL, "Write lock drive" },
{ SCSI_NOAUTO, SCSI_NOAUTO, "noautosize", "NOAUTOSIZE", NULL, NULL, NULL, "Disables disk autosize on attach" },
{ SCSI_NOAUTO, 0, "autosize", "AUTOSIZE", NULL, NULL, NULL, "Enables disk autosize on attach" },
{ MTAB_XTD|MTAB_VUN, 0, "FORMAT", "FORMAT",
&scsi_set_fmt, &scsi_show_fmt, NULL, "Set/Display unit format" },
{ 0 }

2
sim_scsi.c
View File

@ -1685,7 +1685,7 @@ if (uptr->drvtyp == NULL)
switch (uptr->drvtyp->devtype) {
case SCSI_DISK:
case SCSI_WORM:
return sim_disk_attach_ex (uptr, cptr, uptr->drvtyp->sectsize, sizeof (uint16), (uptr->flags & SCSI_NOAUTO), SCSI_DBG_DSK, uptr->drvtyp->name, 0, 0, drivetypes);
return sim_disk_attach_ex (uptr, cptr, uptr->drvtyp->sectsize, sizeof (uint16), 0, SCSI_DBG_DSK, uptr->drvtyp->name, 0, 0, drivetypes);
case SCSI_CDROM:
sim_switches |= SWMASK ('R'); /* Force Read Only Attach for CDROM */
return sim_disk_attach_ex (uptr, cptr, uptr->drvtyp->sectsize, sizeof (uint16), FALSE, SCSI_DBG_DSK, uptr->drvtyp->name, 0, 0, drivetypes);

3
sim_scsi.h
View File

@ -67,10 +67,7 @@
#define SCSI_DBG_DSK 0x08000000 /* disk activity */
#define SCSI_DBG_TAP 0x10000000 /* tape activity */
#define SCSI_V_NOAUTO ((DKUF_V_UF > MTUF_V_UF) ? DKUF_V_UF : MTUF_V_UF)/* noautosize */
#define SCSI_V_UF (SCSI_V_NOAUTO + 1)
#define SCSI_WLK (UNIT_WLK|UNIT_RO) /* hwre write lock */
#define SCSI_NOAUTO DKUF_NOAUTOSIZE
/* This structure has been obsoleted and its role is now provided by
the DRVTYP structure */