Set device flags indicating DEV_DISK, DEV_TAPE, DEV_MUX and DEV_ETHER for all simulator devices which use the sim_disk, sim_tape, sim_tmxr, and sim_ether libraries

This commit is contained in:
Mark Pizzolato 2013-01-07 12:47:24 -08:00
parent 7e1840eb5f
commit 7b6f7a9871
37 changed files with 48 additions and 48 deletions

View file

@ -324,7 +324,7 @@ DEVICE sio_dev = {
1, 10, 31, 1, 8, 8,
NULL, NULL, &sio_reset,
NULL, &sio_attach, &sio_detach,
NULL, DEV_DEBUG, 0,
NULL, DEV_DEBUG | DEV_MUX, 0,
generic_dt, NULL, "Serial Input Output SIO"
};

View file

@ -503,7 +503,7 @@ DEVICE baci_dev = {
&baci_attach, /* attach routine */
&baci_detach, /* detach routine */
&baci_dib, /* device information block */
DEV_DEBUG | DEV_DISABLE, /* device flags */
DEV_DEBUG | DEV_DISABLE | DEV_MUX, /* device flags */
0, /* debug control flags */
baci_deb, /* debug flag name table */
NULL, /* memory size change routine */

View file

@ -745,7 +745,7 @@ DEVICE mpx_dev = {
&mpx_attach, /* attach routine */
&mpx_detach, /* detach routine */
&mpx_dib, /* device information block */
DEV_DEBUG | DEV_DISABLE, /* device flags */
DEV_DEBUG | DEV_DISABLE | DEV_MUX, /* device flags */
0, /* debug control flags */
mpx_deb, /* debug flag name table */
NULL, /* memory size change routine */

View file

@ -375,7 +375,7 @@ DEVICE msc_dev = {
MS_NUMDR, 10, 31, 1, 8, 8,
NULL, NULL, &msc_reset,
&msc_boot, &msc_attach, &msc_detach,
&msc_dib, DEV_DISABLE | DEV_DEBUG,
&msc_dib, DEV_DISABLE | DEV_DEBUG | DEV_TAPE,
0, msc_deb, NULL, NULL
};

View file

@ -234,7 +234,7 @@ DEVICE mtc_dev = {
1, 10, 31, 1, 8, 8,
NULL, NULL, &mt_reset,
NULL, &mtc_attach, &mtc_detach,
&mtc_dib, DEV_DISABLE | DEV_DIS
&mtc_dib, DEV_DISABLE | DEV_DIS | DEV_TAPE
};

View file

@ -434,7 +434,7 @@ DEVICE muxl_dev = {
NULL, /* attach routine */
NULL, /* detach routine */
&muxl_dib, /* device information block */
DEV_DISABLE, /* device flags */
DEV_DISABLE | DEV_MUX, /* device flags */
0, /* debug control flags */
NULL, /* debug flag name table */
NULL, /* memory size change routine */

View file

@ -348,7 +348,7 @@ DEVICE com_dev = {
3, 10, 31, 1, 16, 8,
&tmxr_ex, &tmxr_dep, &com_reset,
NULL, &com_attach, &com_detach,
&com_dib, DEV_NET | DEV_DIS
&com_dib, DEV_MUX | DEV_DIS
};
/* COML data structures

View file

@ -368,7 +368,7 @@ DEVICE mt_dev[NUM_CHAN] = {
MT_NUMDR + 1, 10, 31, 1, 8, 8,
NULL, NULL, &mt_reset,
&mt_boot, &mt_attach, &sim_tape_detach,
&mt_dib, DEV_DEBUG
&mt_dib, DEV_DEBUG | DEV_TAPE
},
{
"MTB", mtb_unit, mtb_reg, mt_mod,

View file

@ -168,7 +168,7 @@ DEVICE mt_dev = {
MT_NUMDR, 10, 31, 1, 16, 8,
NULL, NULL, &mt_reset,
&mt_boot, &mt_attach, &mt_detach,
&mt_dib, DEV_DISABLE
&mt_dib, DEV_DISABLE | DEV_TAPE
};
/* Magtape: IO routine */

View file

@ -165,7 +165,7 @@ DEVICE pas_dev = {
1, 10, 31, 1, 16, 8,
&tmxr_ex, &tmxr_dep, &pas_reset,
NULL, &pas_attach, &pas_detach,
&pas_dib, DEV_NET | DEV_DISABLE
&pas_dib, DEV_MUX | DEV_DISABLE
};
/* PASL data structures

View file

@ -236,7 +236,7 @@ DEVICE mta_dev = {
MTA_NUMDR, 10, 31, 1, 8, 8,
NULL, NULL, &mta_reset,
&mta_boot, &mta_attach, &mta_detach,
&mta_dib, DEV_DISABLE
&mta_dib, DEV_DISABLE | DEV_TAPE
};
/* IOT routine */

View file

@ -193,7 +193,7 @@ DEVICE qty_dev =
1, 10, 31, 1, 8, 8,
NULL, NULL, &qty_reset,
NULL, &qty_attach, &qty_detach,
&qty_dib, (DEV_DISABLE | DEV_DIS | DEV_NET)
&qty_dib, (DEV_DISABLE | DEV_DIS | DEV_MUX)
};
#define DG_RETURN( status, data ) (int32)(((status) << IOT_V_REASON) | ((data) & 0x0FFFF) )

View file

@ -108,7 +108,7 @@ DEVICE tti1_dev = {
1, 10, 31, 1, 8, 8,
&tmxr_ex, &tmxr_dep, &tti1_reset,
NULL, &tti1_attach, &tti1_detach,
&tti1_dib, DEV_NET | DEV_DISABLE
&tti1_dib, DEV_MUX | DEV_DISABLE
};
/* TTO1 data structures
@ -148,7 +148,7 @@ DEVICE tto1_dev = {
1, 10, 31, 1, 8, 8,
NULL, NULL, &tto1_reset,
NULL, NULL, NULL,
&tto1_dib, DEV_DISABLE
&tto1_dib, DEV_DISABLE | DEV_MUX
};
/* Terminal input: IOT routine */

View file

@ -101,7 +101,7 @@ DEVICE dcs_dev = {
1, 10, 31, 1, 8, 8,
&tmxr_ex, &tmxr_dep, &dcs_reset,
NULL, &dcs_attach, &dcs_detach,
NULL, DEV_NET | DEV_DISABLE | DEV_DIS
NULL, DEV_MUX | DEV_DISABLE | DEV_DIS
};
/* DCSL data structures
@ -172,7 +172,7 @@ DEVICE dcsl_dev = {
DCS_LINES, 10, 31, 1, 8, 8,
NULL, NULL, &dcs_reset,
NULL, NULL, NULL,
NULL, DEV_DIS
NULL, DEV_DIS | DEV_MUX
};
/* DCS IOT routine */

View file

@ -415,7 +415,7 @@ DEVICE tu_dev = {
TU_NUMDR, 10, 31, 1, 8, 8,
NULL, NULL, &tu_reset,
&tu_boot, &tu_attach, &tu_detach,
&tu_dib, DEV_UBUS | DEV_DEBUG
&tu_dib, DEV_UBUS | DEV_DEBUG | DEV_TAPE
};
/* I/O dispatch routine, I/O addresses 17772440 - 17772472 */

View file

@ -193,7 +193,7 @@ DEVICE dci_dev = {
1, 10, 31, 1, 8, 8,
NULL, NULL, &dcx_reset,
NULL, &dcx_attach, &dcx_detach,
&dci_dib, DEV_UBUS | DEV_QBUS | DEV_DISABLE | DEV_DIS
&dci_dib, DEV_UBUS | DEV_QBUS | DEV_DISABLE | DEV_DIS | DEV_MUX
};
/* DCO data structures

View file

@ -219,7 +219,7 @@ DEVICE dlo_dev = {
DLX_LINES, 10, 31, 1, 8, 8,
NULL, NULL, &dlx_reset,
NULL, NULL, NULL,
NULL, DEV_UBUS | DEV_QBUS | DEV_DISABLE | DEV_DIS
NULL, DEV_UBUS | DEV_QBUS | DEV_DISABLE | DEV_DIS | DEV_MUX
};
/* Terminal input routines */

View file

@ -291,7 +291,7 @@ DEVICE dz_dev = {
1, DEV_RDX, 8, 1, DEV_RDX, 8,
&tmxr_ex, &tmxr_dep, &dz_reset,
NULL, &dz_attach, &dz_detach,
&dz_dib, DEV_DISABLE | DEV_UBUS | DEV_QBUS | DEV_DEBUG,
&dz_dib, DEV_DISABLE | DEV_UBUS | DEV_QBUS | DEV_DEBUG | DEV_MUX,
0, dz_debug
};

View file

@ -701,7 +701,7 @@ DEVICE rp_dev = {
RP_NUMDR, DEV_RDX, 30, 1, DEV_RDX, 16,
NULL, NULL, &rp_reset,
&rp_boot, &rp_attach, &rp_detach,
&rp_dib, DEV_DISABLE | DEV_UBUS | DEV_QBUS | DEV_MBUS | DEV_DEBUG,
&rp_dib, DEV_DISABLE | DEV_UBUS | DEV_QBUS | DEV_MBUS | DEV_DEBUG | DEV_DISK,
0, rp_debug
};

View file

@ -1008,7 +1008,7 @@ DEVICE rq_dev = {
RQ_NUMDR + 2, DEV_RDX, T_ADDR_W, 2, DEV_RDX, 16,
NULL, NULL, &rq_reset,
&rq_boot, &rq_attach, &rq_detach,
&rq_dib, DEV_DISABLE | DEV_UBUS | DEV_QBUS | DEV_DEBUG,
&rq_dib, DEV_DISABLE | DEV_UBUS | DEV_QBUS | DEV_DEBUG | DEV_DISK,
0, rq_debug
};
@ -1080,7 +1080,7 @@ DEVICE rqb_dev = {
RQ_NUMDR + 2, DEV_RDX, T_ADDR_W, 2, DEV_RDX, 16,
NULL, NULL, &rq_reset,
&rq_boot, &rq_attach, &rq_detach,
&rqb_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_QBUS | DEV_DEBUG,
&rqb_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_QBUS | DEV_DEBUG | DEV_DISK,
0, rq_debug
};
@ -1152,7 +1152,7 @@ DEVICE rqc_dev = {
RQ_NUMDR + 2, DEV_RDX, T_ADDR_W, 2, DEV_RDX, 16,
NULL, NULL, &rq_reset,
&rq_boot, &rq_attach, &rq_detach,
&rqc_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_QBUS | DEV_DEBUG,
&rqc_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_QBUS | DEV_DEBUG | DEV_DISK,
0, rq_debug
};
@ -1224,7 +1224,7 @@ DEVICE rqd_dev = {
RQ_NUMDR + 2, DEV_RDX, T_ADDR_W, 2, DEV_RDX, 16,
NULL, NULL, &rq_reset,
&rq_boot, &rq_attach, &rq_detach,
&rqd_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_QBUS | DEV_DEBUG,
&rqd_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_QBUS | DEV_DEBUG | DEV_DISK,
0, rq_debug
};

View file

@ -199,7 +199,7 @@ DEVICE ta_dev = {
TA_NUMDR, 10, 31, 1, 8, 8,
NULL, NULL, &ta_reset,
NULL, &ta_attach, &ta_detach,
&ta_dib, DEV_DISABLE | DEV_DIS | DEV_DEBUG
&ta_dib, DEV_DISABLE | DEV_DIS | DEV_DEBUG | DEV_TAPE
};
/* I/O dispatch routines, I/O addresses 17777500 - 17777503

View file

@ -246,7 +246,7 @@ DEVICE tm_dev = {
TM_NUMDR, 10, T_ADDR_W, 1, 8, 8,
NULL, NULL, &tm_reset,
&tm_boot, &tm_attach, &tm_detach,
&tm_dib, DEV_DISABLE | DEV_UBUS | DEV_Q18 | DEV_DEBUG
&tm_dib, DEV_DISABLE | DEV_UBUS | DEV_Q18 | DEV_DEBUG | DEV_TAPE
};
/* I/O dispatch routines, I/O addresses 17772520 - 17772532

View file

@ -541,7 +541,7 @@ DEVICE tq_dev = {
TQ_NUMDR + 2, 10, T_ADDR_W, 1, DEV_RDX, 8,
NULL, NULL, &tq_reset,
&tq_boot, &tq_attach, &tq_detach,
&tq_dib, DEV_DISABLE | DEV_UBUS | DEV_QBUS | DEV_DEBUG,
&tq_dib, DEV_DISABLE | DEV_UBUS | DEV_QBUS | DEV_DEBUG | DEV_TAPE,
0, tq_debug
};

View file

@ -366,7 +366,7 @@ DEVICE ts_dev = {
1, 10, T_ADDR_W, 1, DEV_RDX, 8,
NULL, NULL, &ts_reset,
&ts_boot, &ts_attach, &ts_detach,
&ts_dib, DEV_DISABLE | TS_DIS | DEV_UBUS | DEV_QBUS | DEV_DEBUG
&ts_dib, DEV_DISABLE | TS_DIS | DEV_UBUS | DEV_QBUS | DEV_DEBUG | DEV_TAPE
};
/* I/O dispatch routines, I/O addresses 17772520 - 17772522

View file

@ -323,7 +323,7 @@ DEVICE tu_dev = {
TU_NUMDR, 10, T_ADDR_W, 1, DEV_RDX, 8,
NULL, NULL, &tu_reset,
&tu_boot, &tu_attach, &tu_detach,
&tu_dib, DEV_MBUS|DEV_UBUS|DEV_QBUS|DEV_DEBUG|DEV_DISABLE|DEV_DIS_INIT|DEV_TM03
&tu_dib, DEV_MBUS|DEV_UBUS|DEV_QBUS|DEV_DEBUG|DEV_DISABLE|DEV_DIS_INIT|DEV_TM03|DEV_TAPE
};
/* Massbus register read */

View file

@ -426,7 +426,7 @@ DEVICE vh_dev = {
&vh_attach, /* attach routine */
&vh_detach, /* detach routine */
(void *)&vh_dib,/* context */
DEV_DISABLE | DEV_DIS | DEV_QBUS | DEV_UBUS | DEV_DEBUG, /* flags */
DEV_DISABLE | DEV_DIS | DEV_QBUS | DEV_UBUS | DEV_DEBUG | DEV_MUX, /* flags */
0, vh_debug
};

View file

@ -487,7 +487,7 @@ DEVICE xq_dev = {
2, XQ_RDX, 11, 1, XQ_RDX, 16,
&xq_ex, &xq_dep, &xq_reset,
NULL, &xq_attach, &xq_detach,
&xqa_dib, DEV_DISABLE | DEV_QBUS | DEV_DEBUG,
&xqa_dib, DEV_DISABLE | DEV_QBUS | DEV_DEBUG | DEV_ETHER,
0, xq_debug
};
@ -496,7 +496,7 @@ DEVICE xqb_dev = {
2, XQ_RDX, 11, 1, XQ_RDX, 16,
&xq_ex, &xq_dep, &xq_reset,
NULL, &xq_attach, &xq_detach,
&xqb_dib, DEV_DISABLE | DEV_DIS | DEV_QBUS | DEV_DEBUG,
&xqb_dib, DEV_DISABLE | DEV_DIS | DEV_QBUS | DEV_DEBUG | DEV_ETHER,
0, xq_debug
};

View file

@ -192,7 +192,7 @@ DEVICE xu_dev = {
2, XU_RDX, 8, 1, XU_RDX, 8,
&xu_ex, &xu_dep, &xu_reset,
NULL, &xu_attach, &xu_detach,
&xua_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_DEBUG,
&xua_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_DEBUG | DEV_ETHER,
0, xu_debug
};
@ -220,7 +220,7 @@ DEVICE xub_dev = {
1, XU_RDX, 8, 1, XU_RDX, 8,
&xu_ex, &xu_dep, &xu_reset,
NULL, &xu_attach, &xu_detach,
&xub_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_DEBUG,
&xub_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_DEBUG | DEV_ETHER,
0, xu_debug
};

View file

@ -199,7 +199,7 @@ DEVICE mt_dev = {
MT_NUMDR, 10, 31, 1, 8, 8,
NULL, NULL, &mt_reset,
NULL, &mt_attach, &mt_detach,
&mt_dib, DEV_DISABLE | DEV_DEBUG
&mt_dib, DEV_DISABLE | DEV_DEBUG | DEV_TAPE
};
/* IOT routine */

View file

@ -128,7 +128,7 @@ DEVICE tti1_dev = {
1, 10, 31, 1, 8, 8,
&tmxr_ex, &tmxr_dep, &ttx_reset,
NULL, &ttx_attach, &ttx_detach,
&ttix_dib, DEV_NET | DEV_DISABLE
&ttix_dib, DEV_MUX | DEV_DISABLE
};
/* TTOx data structures

View file

@ -226,7 +226,7 @@ DEVICE ct_dev = {
CT_NUMDR, 10, 31, 1, 8, 8,
NULL, NULL, &ct_reset,
&ct_boot, &ct_attach, &ct_detach,
&ct_dib, DEV_DISABLE | DEV_DIS | DEV_DEBUG
&ct_dib, DEV_DISABLE | DEV_DIS | DEV_DEBUG | DEV_TAPE
};
/* IOT routines */

View file

@ -217,7 +217,7 @@ DEVICE mt_dev = {
MT_NUMDR, 10, 31, 1, 8, 8,
NULL, NULL, &mt_reset,
NULL, &mt_attach, &mt_detach,
&mt_dib, DEV_DISABLE
&mt_dib, DEV_DISABLE | DEV_TAPE
};
/* IOT routines */

View file

@ -123,7 +123,7 @@ DEVICE ttix_dev = {
1, 10, 31, 1, 8, 8,
&tmxr_ex, &tmxr_dep, &ttix_reset,
NULL, &ttx_attach, &ttx_detach,
&ttix_dib, DEV_NET | DEV_DISABLE
&ttix_dib, DEV_MUX | DEV_DISABLE
};
/* TTOx data structures

View file

@ -168,7 +168,7 @@ DEVICE mt_dev = {
MT_NUMDR, 10, 31, 1, 8, 8,
NULL, NULL, &mt_reset,
&mt_boot, &mt_attach, NULL,
&mt_dib, DEV_DISABLE
&mt_dib, DEV_DISABLE | DEV_TAPE
};
/* Mag tape routine

View file

@ -169,7 +169,7 @@ DEVICE mux_dev = {
1, 10, 31, 1, 8, 8,
&tmxr_ex, &tmxr_dep, &mux_reset,
NULL, &mux_attach, &mux_detach,
&mux_dib, DEV_NET | DEV_DISABLE
&mux_dib, DEV_MUX | DEV_DISABLE
};
/* MUXL data structures

View file

@ -207,7 +207,7 @@ DEVICE mt_dev = {
MT_NUMDR * 2, 10, T_ADDR_W, 1, 16, 8,
NULL, NULL, &mt_reset,
&io_boot, &mt_attach, &mt_detach,
&mt_dib, DEV_DISABLE
&mt_dib, DEV_DISABLE | DEV_TAPE
};
/* Magtape: IO dispatch routine */

View file

@ -343,11 +343,11 @@ struct sim_device {
#define DEV_TYPEMASK (((1 << DEV_S_TYPE) - 1) << DEV_V_TYPE)
#define DEV_DISK (1 << DEV_S_TYPE) /* sim_disk Attach */
#define DEV_TAPE (2 << DEV_S_TYPE) /* sim_tape Attach */
#define DEV_MUX (3 << DEV_S_TYPE) /* sim_tmxr Attach */
#define DEV_ETHER (4 << DEV_S_TYPE) /* Ethernet Device */
#define DEV_DISPLAY (5 << DEV_S_TYPE) /* Display Device */
#define DEV_DISK (1 << DEV_V_TYPE) /* sim_disk Attach */
#define DEV_TAPE (2 << DEV_V_TYPE) /* sim_tape Attach */
#define DEV_MUX (3 << DEV_V_TYPE) /* sim_tmxr Attach */
#define DEV_ETHER (4 << DEV_V_TYPE) /* Ethernet Device */
#define DEV_DISPLAY (5 << DEV_V_TYPE) /* Display Device */
#define DEV_TYPE(dptr) ((dptr)->flags & DEV_TYPEMASK)
#define DEV_UFMASK_31 (((1u << DEV_V_RSV) - 1) & ~((1u << DEV_V_UF_31) - 1))