Skip to content

B5500, I701, I704, I7010, I7070, I7080, I7090: Remove single UNIT DISABLE #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
markpizz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

B5500, I701, I704, I7010, I7070, I7080, I7090: Remove single UNIT DISABLE #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions B5500/b5500_urec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
#include "sim_defs.h"
#include "sim_console.h"

#define UNIT_CDR UNIT_ATTABLE | UNIT_RO | UNIT_DISABLE | MODE_029
#define UNIT_CDP UNIT_ATTABLE | UNIT_SEQ | UNIT_DISABLE | MODE_029
#define UNIT_LPR UNIT_ATTABLE | UNIT_SEQ | UNIT_DISABLE
#define UNIT_CDR UNIT_ATTABLE | UNIT_RO | ((NUM_DEVS_CDR > 1) ? UNIT_DISABLE : 0) | MODE_029
#define UNIT_CDP UNIT_ATTABLE | UNIT_SEQ | ((NUM_DEVS_CDP > 1) ? UNIT_DISABLE : 0) | MODE_029
#define UNIT_LPR UNIT_ATTABLE | UNIT_SEQ | ((NUM_DEVS_LPR > 1) ? UNIT_DISABLE : 0)

#define TMR_RTC 0

Expand Down
2 changes: 1 addition & 1 deletion I7000/i7000_cdp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "sim_defs.h"
#ifdef NUM_DEVS_CDP

#define UNIT_CDP UNIT_ATTABLE | UNIT_DISABLE | UNIT_SEQ | MODE_026
#define UNIT_CDP UNIT_ATTABLE | ((NUM_DEVS_CDP > 1) ? UNIT_DISABLE : 0) | UNIT_SEQ | MODE_026


/* Flags for punch and reader. */
Expand Down
2 changes: 1 addition & 1 deletion I7000/i7000_cdr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "sim_defs.h"
#ifdef NUM_DEVS_CDR

#define UNIT_CDR UNIT_ATTABLE | UNIT_RO | UNIT_DISABLE | MODE_026
#define UNIT_CDR UNIT_ATTABLE | UNIT_RO | ((NUM_DEVS_CDR > 1) ? UNIT_DISABLE : 0) | MODE_026

/* Flags for punch and reader. */
#define ATTENA (1 << (UNIT_V_UF+7))
Expand Down
2 changes: 1 addition & 1 deletion I7000/i7000_chron.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#ifdef NUM_DEVS_CHRON
#define BUFFSIZE (12)

#define UNIT_MT(x) UNIT_DISABLE | UNIT_ROABLE | \
#define UNIT_MT(x) ((NUM_DEVS_CHRON > 1) ? UNIT_DISABLE : 0) | UNIT_ROABLE | \
UNIT_S_CHAN(x)

/* in u3 is device address */
Expand Down
2 changes: 1 addition & 1 deletion I7000/i7000_dsk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#include "i7000_defs.h"

#ifdef NUM_DEVS_DSK
#define UNIT_DSK UNIT_ATTABLE | UNIT_DISABLE | UNIT_FIX
#define UNIT_DSK UNIT_ATTABLE | ((NUM_DEVS_DSK > 1) ? UNIT_DISABLE : 0) | UNIT_FIX
#define FORMAT_OK (1 << (UNIT_V_LOCAL+0))
#define HA2_OK (1 << (UNIT_V_LOCAL+1))
#define CTSS_BOOT (1 << (UNIT_V_MODE))
Expand Down
2 changes: 1 addition & 1 deletion I7000/i7000_lpr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "sim_defs.h"
#ifdef NUM_DEVS_LPR

#define UNIT_LPR UNIT_ATTABLE | UNIT_DISABLE | UNIT_SEQ
#define UNIT_LPR UNIT_ATTABLE | ((NUM_DEVS_LPR > 1) ? UNIT_DISABLE : 0) | UNIT_SEQ


/* Flags for line printer. */
Expand Down
2 changes: 1 addition & 1 deletion I7000/i7000_mt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#if (NUM_DEVS_MT > 0) || defined(MT_CHANNEL_ZERO)

#define BUFFSIZE (MAXMEMSIZE * CHARSPERWORD)
#define UNIT_MT(x) UNIT_ATTABLE | UNIT_DISABLE | UNIT_ROABLE | \
#define UNIT_MT(x) UNIT_ATTABLE | ((NUM_DEVS_MT > 1) ? UNIT_DISABLE : 0) | UNIT_ROABLE | \
UNIT_S_CHAN(x)
#define MTUF_LDN (1 << MTUF_V_UF)
#define MTUF_ONLINE (1 << UNIT_V_UF_31)
Expand Down
4 changes: 2 additions & 2 deletions I7000/i701_chan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ DIB dly_dib =

UNIT chan_unit[] = {
/* Puesdo channel for 701 devices */
{UDATA(NULL, UNIT_DISABLE | CHAN_SET |
{UDATA(NULL, CHAN_SET |
CHAN_S_TYPE(CHAN_PIO)|UNIT_S_CHAN(0), 0)},
};

Expand All @@ -85,7 +85,7 @@ DEVICE chan_dev = {
"CH", chan_unit, chan_reg, chan_mod,
NUM_CHAN, 8, 15, 1, 8, 36,
NULL, NULL, &chan_reset, NULL, NULL, NULL,
&dly_dib, DEV_DEBUG, 0, NULL,
&dly_dib, DEV_DISABLE | DEV_DEBUG, 0, NULL,
NULL, NULL, &chan_help, NULL, NULL, &chan_description
};

Expand Down
2 changes: 1 addition & 1 deletion I7000/i7080_drum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "i7080_defs.h"

#ifdef NUM_DEVS_DR
#define UNIT_DRM UNIT_ATTABLE | UNIT_DISABLE | UNIT_FIX | \
#define UNIT_DRM UNIT_ATTABLE | ((NUM_DEVS_DR > 1) ? UNIT_DISABLE : 0) | UNIT_FIX | \
UNIT_BUFABLE | UNIT_MUSTBUF

/* Device status information stored in u5 */
Expand Down
2 changes: 1 addition & 1 deletion I7000/i7090_cdp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "i7090_defs.h"
#include "sim_card.h"
#ifdef NUM_DEVS_CDP
#define UNIT_CDP UNIT_ATTABLE | UNIT_DISABLE | UNIT_SEQ
#define UNIT_CDP UNIT_ATTABLE | ((NUM_DEVS_CDP > 1) ? UNIT_DISABLE : 0) | UNIT_SEQ


/* std devices. data structures
Expand Down
2 changes: 1 addition & 1 deletion I7000/i7090_cdr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#ifdef NUM_DEVS_CDR

#define UNIT_CDR UNIT_ATTABLE | UNIT_RO | UNIT_DISABLE | MODE_026
#define UNIT_CDR UNIT_ATTABLE | UNIT_RO | ((NUM_DEVS_CDR > 1) ? UNIT_DISABLE : 0) | MODE_026


/* std devices. data structures
Expand Down
4 changes: 2 additions & 2 deletions I7000/i7090_chan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ DIB dly_dib =

UNIT chan_unit[] = {
/* Puesdo channel for 704 devices */
{UDATA(NULL, UNIT_DISABLE | CHAN_SET |
{UDATA(NULL, ((NUM_CHAN > 1) ? UNIT_DISABLE : 0) | CHAN_SET |
CHAN_S_TYPE(CHAN_PIO)|UNIT_S_CHAN(0), 0)},
/* Normal channels */
#if NUM_CHAN > 1
Expand Down Expand Up @@ -215,7 +215,7 @@ DEVICE chan_dev = {
"CH", chan_unit, chan_reg, chan_mod,
NUM_CHAN, 8, 15, 1, 8, 36,
NULL, NULL, &chan_reset, NULL, NULL, NULL,
&dly_dib, DEV_DEBUG, 0, chn_debug,
&dly_dib, DEV_DISABLE | DEV_DEBUG, 0, chn_debug,
NULL, NULL, &chan_help, NULL, NULL, &chan_description
};

Expand Down
2 changes: 1 addition & 1 deletion I7000/i7090_drum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "i7090_defs.h"

#ifdef NUM_DEVS_DR
#define UNIT_DRM UNIT_ATTABLE | UNIT_DISABLE | UNIT_FIX | \
#define UNIT_DRM UNIT_ATTABLE | ((NUM_DEVS_DR > 1) ? UNIT_DISABLE : 0) | UNIT_FIX | \
UNIT_BUFABLE | UNIT_MUSTBUF

/* Device status information stored in u5 */
Expand Down
2 changes: 1 addition & 1 deletion I7000/i7090_hdrum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "i7090_defs.h"

#ifdef NUM_DEVS_HD
#define UNIT_DRM UNIT_ATTABLE | UNIT_DISABLE | UNIT_FIX | \
#define UNIT_DRM UNIT_ATTABLE | ((NUM_DEVS_HD > 1) ? UNIT_DISABLE : 0) | UNIT_FIX | \
UNIT_BUFABLE | UNIT_MUSTBUF

/* Device status information stored in u5 */
Expand Down
2 changes: 1 addition & 1 deletion I7000/i7090_lpr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

#ifdef NUM_DEVS_LPR

#define UNIT_LPR UNIT_ATTABLE | UNIT_DISABLE | UNIT_SEQ
#define UNIT_LPR UNIT_ATTABLE | ((NUM_DEVS_LPR > 1) ? UNIT_DISABLE : 0) | UNIT_SEQ
#define ECHO (1 << UNIT_V_LOCAL)


Expand Down
2 changes: 1 addition & 1 deletion PDP10/ka10_pclk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ t_stat pclk_set_off(UNIT *uptr, int32 val, CONST char *cptr, void *desc)
t_stat pclk_show_on(FILE *st, UNIT *uptr, int32 val, CONST void *desc);

UNIT pclk_unit[] = {
{UDATA(pclk_srv, UNIT_IDLE|UNIT_DISABLE, 0)}, /* 0 */
{UDATA(pclk_srv, UNIT_IDLE, 0)}, /* 0 */
};
DIB pclk_dib = {PCLK_DEVNUM, 1, &pclk_devio, NULL};
MTAB pclk_mod[] = {
Expand Down
2 changes: 1 addition & 1 deletion PDP10/ka10_pd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ t_stat pd_set_off(UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat pd_show_on(FILE *st, UNIT *uptr, int32 val, CONST void *desc);

UNIT pd_unit[] = {
{UDATA(pd_srv, UNIT_IDLE|UNIT_DISABLE, 0)}, /* 0 */
{UDATA(pd_srv, UNIT_IDLE, 0)}, /* 0 */
};
DIB pd_dib = {PD_DEVNUM, 1, &pd_devio, NULL};

Expand Down
2 changes: 1 addition & 1 deletion PDP10/ka10_stk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static uint64 status = 0;
static int key_code = 0;

UNIT stk_unit[] = {
{UDATA(stk_svc, UNIT_DISABLE, 0)}, /* 0 */
{UDATA(stk_svc, 0, 0)}, /* 0 */
};
DIB stk_dib = {STK_DEVNUM, 1, &stk_devio, NULL};

Expand Down
2 changes: 1 addition & 1 deletion PDP10/ks10_dz.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ const char *dz_description (DEVICE *dptr);
DIB dz_dib = { 0760000, 077, 0340, 5, 3, &dz_read, &dz_write, 0, 0, 0 };

UNIT dz_unit = {
UDATA (&dz_svc, TT_MODE_7B+UNIT_IDLE+UNIT_DISABLE+UNIT_ATTABLE, 0), KBD_POLL_WAIT
UDATA (&dz_svc, TT_MODE_7B+UNIT_IDLE+UNIT_ATTABLE, 0), KBD_POLL_WAIT
};

REG dz_reg[] = {
Expand Down
2 changes: 1 addition & 1 deletion PDP10/ks10_tcu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ t_stat tcu_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag,
const char *tcu_description (DEVICE *dptr);
DIB tcu_dib = { 0760770, 07, 0, 0, 3, &tcu_read, &tcu_write, NULL, 0, 0 };

UNIT tcu_unit = {UDATA (NULL, UNIT_IDLE+UNIT_DISABLE, 0)};
UNIT tcu_unit = {UDATA (NULL, UNIT_IDLE, 0)};

MTAB tcu_mod[] = {
{MTAB_XTD|MTAB_VDV|MTAB_VALR, 0, "addr", "addr", &uba_set_addr, uba_show_addr,
Expand Down
2 changes: 1 addition & 1 deletion PDP10/kx10_cp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "sim_defs.h"
#if (NUM_DEVS_CP > 0)

#define UNIT_CDP UNIT_ATTABLE | UNIT_DISABLE | UNIT_SEQ | MODE_DEC29
#define UNIT_CDP UNIT_ATTABLE | UNIT_SEQ | MODE_DEC29

#define CP_DEVNUM 0110

Expand Down
2 changes: 1 addition & 1 deletion PDP10/kx10_cr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "sim_defs.h"
#if (NUM_DEVS_CR > 0)

#define UNIT_CDR UNIT_ATTABLE | UNIT_RO | UNIT_DISABLE | MODE_DEC29 | MODE_LOWER
#define UNIT_CDR UNIT_ATTABLE | UNIT_RO | MODE_DEC29 | MODE_LOWER

#define CR_DEVNUM 0150

Expand Down
2 changes: 1 addition & 1 deletion PDP10/kx10_dc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ const char *dc_description (DEVICE *dptr);
DIB dc_dib = { DC_DEVNUM, 1, &dc_devio, NULL };

UNIT dc_unit = {
UDATA (&dc_svc, TT_MODE_7B+UNIT_IDLE+UNIT_DISABLE+UNIT_ATTABLE, 0), KBD_POLL_WAIT
UDATA (&dc_svc, TT_MODE_7B+UNIT_IDLE+UNIT_ATTABLE, 0), KBD_POLL_WAIT
};

REG dc_reg[] = {
Expand Down