From d61409889bfe4f445bfcfb8460484bf63c3196b1 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Fri, 6 Sep 2013 08:31:33 -0700 Subject: [PATCH] PDP11: Added formatted register display for HK and RK devices --- PDP11/pdp11_hk.c | 18 +++++++++--------- PDP11/pdp11_rk.c | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/PDP11/pdp11_hk.c b/PDP11/pdp11_hk.c index cb82215e..8dd06584 100644 --- a/PDP11/pdp11_hk.c +++ b/PDP11/pdp11_hk.c @@ -610,15 +610,15 @@ UNIT hk_unit[] = { }; REG hk_reg[] = { - { GRDATAD (HKCS1, hkcs1, DEV_RDX, 16, 0, "control/status 1") }, - { GRDATAD (HKWC, hkwc, DEV_RDX, 16, 0, "word count") }, - { GRDATAD (HKBA, hkba, DEV_RDX, 16, 0, "bus address") }, - { GRDATAD (HKDA, hkda, DEV_RDX, 16, 0, "desired surface, sector") }, - { GRDATAD (HKCS2, hkcs2, DEV_RDX, 16, 0, "control/status 2") }, - { BRDATAD (HKDS, hkds, DEV_RDX, 16, HK_NUMDR, "drive status, drives 0 to 7") }, - { BRDATAD (HKER, hker, DEV_RDX, 16, HK_NUMDR, "drive errors, drives 0 to 7") }, - { BRDATAD (HKDB, hkdb, DEV_RDX, 16, 3, "data buffer silo") }, - { GRDATAD (HKDC, hkdc, DEV_RDX, 16, 0, "desired cylinder") }, + { GRDATADF (HKCS1, hkcs1, DEV_RDX, 16, 0, "control/status 1", hk_cs1_bits) }, + { GRDATADF (HKWC, hkwc, DEV_RDX, 16, 0, "word count", hk_wc_bits) }, + { GRDATADF (HKBA, hkba, DEV_RDX, 16, 0, "bus address", hk_ba_bits) }, + { GRDATADF (HKDA, hkda, DEV_RDX, 16, 0, "desired surface, sector", hk_da_bits) }, + { GRDATADF (HKCS2, hkcs2, DEV_RDX, 16, 0, "control/status 2", hk_cs2_bits) }, + { BRDATADF (HKDS, hkds, DEV_RDX, 16, HK_NUMDR, "drive status, drives 0 to 7", hk_ds_bits) }, + { BRDATADF (HKER, hker, DEV_RDX, 16, HK_NUMDR, "drive errors, drives 0 to 7", hk_er_bits) }, + { BRDATADF (HKDB, hkdb, DEV_RDX, 16, 3, "data buffer silo", hk_db_bits) }, + { GRDATADF (HKDC, hkdc, DEV_RDX, 16, 0, "desired cylinder", hk_dc_bits) }, { GRDATAD (HKOF, hkof, DEV_RDX, 8, 0, "offset") }, { GRDATAD (HKMR, hkmr, DEV_RDX, 16, 0, "maintenance register") }, { GRDATAD (HKMR2, hkmr2, DEV_RDX, 16, 0, "maintenance register 2"), REG_RO }, diff --git a/PDP11/pdp11_rk.c b/PDP11/pdp11_rk.c index 246a0844..74e2b3ad 100644 --- a/PDP11/pdp11_rk.c +++ b/PDP11/pdp11_rk.c @@ -358,12 +358,12 @@ UNIT rk_unit[] = { }; REG rk_reg[] = { - { ORDATAD (RKCS, rkcs, 16, "control/status") }, - { ORDATAD (RKDA, rkda, 16, "disk address") }, - { ORDATAD (RKBA, rkba, 16, "memory address") }, - { ORDATAD (RKWC, rkwc, 16, "word count") }, - { ORDATAD (RKDS, rkds, 16, "drive status") }, - { ORDATAD (RKER, rker, 16, "error status") }, + { ORDATADF (RKCS, rkcs, 16, "control/status", rk_cs_bits) }, + { ORDATADF (RKDA, rkda, 16, "disk address", rk_da_bits) }, + { ORDATADF (RKBA, rkba, 16, "memory address", rk_ba_bits) }, + { ORDATADF (RKWC, rkwc, 16, "word count", rk_wc_bits) }, + { ORDATADF (RKDS, rkds, 16, "drive status", rk_ds_bits) }, + { ORDATADF (RKER, rker, 16, "error status", rk_er_bits) }, { ORDATAD (INTQ, rkintq, 9, "interrupt queue") }, { ORDATAD (DRVN, last_drv, 3, "last r/w drive") }, { FLDATAD (INT, IREQ (RK), INT_V_RK, "interrupt pending flag") },