SCSI: Properly reference bits in UNIT->flags for disk and tape

This commit is contained in:
Mark Pizzolato 2020-05-22 10:11:11 -07:00
parent 6fdd917ee8
commit a4228438b5
2 changed files with 5 additions and 4 deletions

View file

@ -28,6 +28,8 @@
#define _SIM_SCSI_H_ 0 #define _SIM_SCSI_H_ 0
#include "sim_defs.h" #include "sim_defs.h"
#include "sim_disk.h"
#include "sim_tape.h"
/* SCSI device states */ /* SCSI device states */
@ -64,9 +66,9 @@
#define SCSI_DBG_BUS 0x04000000 /* bus activity */ #define SCSI_DBG_BUS 0x04000000 /* bus activity */
#define SCSI_DBG_DSK 0x08000000 /* disk activity */ #define SCSI_DBG_DSK 0x08000000 /* disk activity */
#define SCSI_V_WLK (UNIT_V_UF + 5) /* hwre write lock */ #define SCSI_V_WLK DKUF_V_WLK /* hwre write lock */
#define SCSI_V_NOAUTO (UNIT_V_UF + 6) /* noautosize */ #define SCSI_V_NOAUTO ((DKUF_V_UF > MTUF_V_UF) ? DKUF_V_UF : MTUF_V_UF)/* noautosize */
#define SCSI_V_UF (UNIT_V_UF + 7) #define SCSI_V_UF (SCSI_V_NOAUTO + 1)
#define SCSI_WLK (1 << SCSI_V_WLK) #define SCSI_WLK (1 << SCSI_V_WLK)
#define SCSI_NOAUTO (1 << SCSI_V_NOAUTO) #define SCSI_NOAUTO (1 << SCSI_V_NOAUTO)

View file

@ -91,7 +91,6 @@ typedef struct {
/* Unit flags */ /* Unit flags */
#define MTUF_V_WLK (UNIT_V_UF + 0) /* write locked */ #define MTUF_V_WLK (UNIT_V_UF + 0) /* write locked */
#define MTUF_V_FMT (UNIT_V_UF + 2) /* tape file format */
#define MTUF_F_STD 0 /* SIMH format */ #define MTUF_F_STD 0 /* SIMH format */
#define MTUF_F_E11 1 /* E11 format */ #define MTUF_F_E11 1 /* E11 format */
#define MTUF_F_TPC 2 /* TPC format */ #define MTUF_F_TPC 2 /* TPC format */