diff --git a/HP2100/hp2100_mux.c b/HP2100/hp2100_mux.c index 6641a6ed..e5eb268a 100644 --- a/HP2100/hp2100_mux.c +++ b/HP2100/hp2100_mux.c @@ -669,7 +669,7 @@ static REG muxl_reg [] = { { BRDATA (XBUF, mux_xbuf, 8, 16, SEND_CHAN_COUNT), REG_A }, { BRDATA (RCHP, mux_rchp, 8, 1, RECV_CHAN_COUNT) }, { BRDATA (XDON, mux_xdon, 8, 1, SEND_CHAN_COUNT) }, - { BRDATA (BDFR, mux_defer, 8, 1, TERM_COUNT) }, + { BRDATA (BDFR, mux_defer, 8, 1, sizeof (mux_defer)) }, { URDATA (TIME, muxl_unit[0].wait, 10, 24, 0, TERM_COUNT, REG_NZ | PV_LEFT) }, DIB_REGS (muxl_dib), diff --git a/I1401/i1401_cd.c b/I1401/i1401_cd.c index c277a252..18fa3ec6 100644 --- a/I1401/i1401_cd.c +++ b/I1401/i1401_cd.c @@ -138,7 +138,7 @@ REG cdr_reg[] = { { FLDATA (S2, s2sel, 0) }, { DRDATA (POS, cdr_unit.pos, T_ADDR_W), PV_LEFT }, { DRDATA (TIME, cdr_unit.wait, 24), PV_LEFT }, - { BRDATA (BUF, cdr_buf, 8, 8, CDR_WIDTH * 2) }, + { BRDATA (BUF, cdr_buf, 8, 8, sizeof (cdr_buf)) }, { NULL } }; diff --git a/I7094/i7094_mt.c b/I7094/i7094_mt.c index be1e0eb0..809fe56a 100644 --- a/I7094/i7094_mt.c +++ b/I7094/i7094_mt.c @@ -125,7 +125,7 @@ REG mta_reg[] = { { FLDATA (CHOBV, mt_chob_v[0], 0) }, { DRDATA (BPTR, mt_bptr[0], 16), PV_LEFT }, { DRDATA (BLNT, mt_blnt[0], 16), PV_LEFT }, - { BRDATA (BUF, mtxb[0], 8, 7, MT_MAXFR) }, + { BRDATA (BUF, mtxb[0], 8, 7, sizeof (mtxb[0])) }, { DRDATA (TWEF, mt_twef, 24), REG_NZ + PV_LEFT }, { DRDATA (TSHORT, mt_tshort, 24), REG_NZ + PV_LEFT }, { DRDATA (TSTART, mt_tstart, 24), REG_NZ + PV_LEFT }, @@ -157,7 +157,7 @@ REG mtb_reg[] = { { FLDATA (CHOBV, mt_chob_v[1], 0) }, { DRDATA (BPTR, mt_bptr[1], 16), PV_LEFT }, { DRDATA (BLNT, mt_blnt[1], 16), PV_LEFT }, - { BRDATA (BUF, mtxb[1], 8, 7, MT_MAXFR) }, + { BRDATA (BUF, mtxb[1], 8, 7, sizeof (mtxb[1])) }, { DRDATA (TWEF, mt_twef, 24), REG_NZ + PV_LEFT }, { DRDATA (TSHORT, mt_tshort, 24), REG_NZ + PV_LEFT }, { DRDATA (TSTART, mt_tstart, 24), REG_NZ + PV_LEFT }, @@ -189,7 +189,7 @@ REG mtc_reg[] = { { FLDATA (CHOBV, mt_chob_v[2], 0) }, { DRDATA (BPTR, mt_bptr[2], 16), PV_LEFT }, { DRDATA (BLNT, mt_blnt[2], 16), PV_LEFT }, - { BRDATA (BUF, mtxb[2], 8, 7, MT_MAXFR) }, + { BRDATA (BUF, mtxb[2], 8, 7, sizeof (mtxb[2])) }, { DRDATA (TWEF, mt_twef, 24), REG_NZ + PV_LEFT }, { DRDATA (TSHORT, mt_tshort, 24), REG_NZ + PV_LEFT }, { DRDATA (TSTART, mt_tstart, 24), REG_NZ + PV_LEFT }, @@ -221,7 +221,7 @@ REG mtd_reg[] = { { FLDATA (CHOBV, mt_chob_v[3], 0) }, { DRDATA (BPTR, mt_bptr[3], 16), PV_LEFT }, { DRDATA (BLNT, mt_blnt[3], 16), PV_LEFT }, - { BRDATA (BUF, mtxb[3], 8, 7, MT_MAXFR) }, + { BRDATA (BUF, mtxb[3], 8, 7, sizeof (mtxb[3])) }, { DRDATA (TWEF, mt_twef, 24), REG_NZ + PV_LEFT }, { DRDATA (TSHORT, mt_tshort, 24), REG_NZ + PV_LEFT }, { DRDATA (TSTART, mt_tstart, 24), REG_NZ + PV_LEFT }, @@ -253,7 +253,7 @@ REG mte_reg[] = { { FLDATA (CHOBV, mt_chob_v[4], 0) }, { DRDATA (BPTR, mt_bptr[4], 16), PV_LEFT }, { DRDATA (BLNT, mt_blnt[4], 16), PV_LEFT }, - { BRDATA (BUF, mtxb[4], 8, 7, MT_MAXFR) }, + { BRDATA (BUF, mtxb[4], 8, 7, sizeof (mtxb[4])) }, { DRDATA (TWEF, mt_twef, 24), REG_NZ + PV_LEFT }, { DRDATA (TSHORT, mt_tshort, 24), REG_NZ + PV_LEFT }, { DRDATA (TSTART, mt_tstart, 24), REG_NZ + PV_LEFT }, @@ -285,7 +285,7 @@ REG mtf_reg[] = { { FLDATA (CHOBV, mt_chob_v[5], 0) }, { DRDATA (BPTR, mt_bptr[5], 16), PV_LEFT }, { DRDATA (BLNT, mt_blnt[5], 16), PV_LEFT }, - { BRDATA (BUF, mtxb[5], 8, 7, MT_MAXFR) }, + { BRDATA (BUF, mtxb[5], 8, 7, sizeof (mtxb[5])) }, { DRDATA (TWEF, mt_twef, 24), REG_NZ + PV_LEFT }, { DRDATA (TSHORT, mt_tshort, 24), REG_NZ + PV_LEFT }, { DRDATA (TSTART, mt_tstart, 24), REG_NZ + PV_LEFT }, @@ -317,7 +317,7 @@ REG mtg_reg[] = { { FLDATA (CHOBV, mt_chob_v[6], 0) }, { DRDATA (BPTR, mt_bptr[6], 16), PV_LEFT }, { DRDATA (BLNT, mt_blnt[6], 16), PV_LEFT }, - { BRDATA (BUF, mtxb[6], 8, 7, MT_MAXFR) }, + { BRDATA (BUF, mtxb[6], 8, 7, sizeof (mtxb[6])) }, { DRDATA (TWEF, mt_twef, 24), REG_NZ + PV_LEFT }, { DRDATA (TSHORT, mt_tshort, 24), REG_NZ + PV_LEFT }, { DRDATA (TSTART, mt_tstart, 24), REG_NZ + PV_LEFT }, @@ -349,7 +349,7 @@ REG mth_reg[] = { { FLDATA (CHOBV, mt_chob_v[7], 0) }, { DRDATA (BPTR, mt_bptr[7], 16), PV_LEFT }, { DRDATA (BLNT, mt_blnt[7], 16), PV_LEFT }, - { BRDATA (BUF, mtxb[7], 8, 7, MT_MAXFR) }, + { BRDATA (BUF, mtxb[7], 8, 7, sizeof (mtxb[7])) }, { DRDATA (TWEF, mt_twef, 24), REG_NZ + PV_LEFT }, { DRDATA (TSHORT, mt_tshort, 24), REG_NZ + PV_LEFT }, { DRDATA (TSTART, mt_tstart, 24), REG_NZ + PV_LEFT }, diff --git a/Interdata/id16_cpu.c b/Interdata/id16_cpu.c index f8b6e110..ff63be20 100644 --- a/Interdata/id16_cpu.c +++ b/Interdata/id16_cpu.c @@ -501,8 +501,8 @@ REG cpu_reg[] = { { FLDATA (DRMOD, drmod, 0) }, { FLDATA (SRPOS, srpos, 0) }, { HRDATA (DRPOS, drpos, 3) }, - { BRDATA (IRQ, int_req, 16, 32, 8) }, - { BRDATA (IEN, int_enb, 16, 32, 8) }, + { BRDATA (IRQ, int_req, 16, 32, 4) }, + { BRDATA (IEN, int_enb, 16, 32, 4) }, { HRDATA (QEVENT, qevent, 4), REG_HRO }, { FLDATA (STOP_INST, stop_inst, 0) }, { FLDATA (STOP_WAIT, stop_inst, 0) }, diff --git a/Interdata/id_lp.c b/Interdata/id_lp.c index 687f57bd..8fa1b44e 100644 --- a/Interdata/id_lp.c +++ b/Interdata/id_lp.c @@ -89,7 +89,7 @@ UNIT lpt_unit = { UDATA (&lpt_svc, UNIT_SEQ+UNIT_ATTABLE+UNIT_UC+UNIT_TEXT, 0) } REG lpt_reg[] = { { HRDATA (STA, lpt_sta, 8) }, { HRDATA (BUF, lpt_unit.buf, 7) }, - { BRDATA (DBUF, lpxb, 16, 7, LPT_WIDTH) }, + { BRDATA (DBUF, lpxb, 16, 7, sizeof (lpxb)) }, { HRDATA (DBPTR, lpt_bptr, 8) }, { HRDATA (VFUP, lpt_vfup, 8) }, { HRDATA (VFUL, lpt_vful, 8) }, diff --git a/S3/s3_cd.c b/S3/s3_cd.c index c930cd86..5f9ba252 100644 --- a/S3/s3_cd.c +++ b/S3/s3_cd.c @@ -83,7 +83,7 @@ REG cdr_reg[] = { { FLDATA (S2, s2sel, 0) }, { DRDATA (POS, cdr_unit.pos, T_ADDR_W), PV_LEFT }, { DRDATA (TIME, cdr_unit.wait, 24), PV_LEFT }, - { BRDATA (BUF, rbuf, 8, 8, CDR_WIDTH) }, + { BRDATA (BUF, rbuf, 8, 8, sizeof (rbuf)) }, { NULL } };