Merge branch 'ak-lemocfg-bug-fix' into 'master'

Bug fixes for configuring and reading debug signals See merge request !5

Merge branch 'ak-lemocfg-bug-fix' into 'master'
Bug fixes for configuring and reading debug signals See merge request !5
894e1f48 · John Gill · 8b124566 · 658e7551 · 894e1f48 · 894e1f48
Commit 894e1f48 authored Nov 23, 2021 by John Gill
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 6 deletions

board.c software/libwr2rf/board.c +4 -3

api.h software/libwr2rf/libwr2rf/api.h +2 -0

wr2rf.c software/libwr2rf/wr2rf.c +3 -3

No files found.
--- a/software/libwr2rf/board.c
+++ b/software/libwr2rf/board.c
@@ -1327,7 +1327,7 @@ libwr2rf_configure_lemo_debug(struct libwr2rf_dev *dev, unsigned lemo, unsigned
    unsigned baddr = WR2RF_VME_REGS_INIT;
    unsigned addr  = 0;

-    if (dbg > LIBWR2RF_LEMO_DBG_WRS_SOFTSTART)
+    if (dbg > LIBWR2RF_LEMO_DBG_NONE)
        return LIBWR2RF_ERROR_BAD_PARAM;

    switch (lemo) {
@@ -1352,8 +1352,9 @@ libwr2rf_configure_lemo_debug(struct libwr2rf_dev *dev, unsigned lemo, unsigned
    default:
        return LIBWR2RF_ERROR_BAD_ID;
    }
-
-    libwr2rf_write16(dev, baddr + addr, (1 << dbg));
+	
+	uint16_t val = (dbg == LIBWR2RF_LEMO_DBG_NONE) ? 0x0 : (1 << dbg);
+    libwr2rf_write16(dev, baddr + addr, val);
    return 0;
 }


--- a/software/libwr2rf/libwr2rf/api.h
+++ b/software/libwr2rf/libwr2rf/api.h
@@ -162,6 +162,8 @@ int libwr2rf_read_diag(struct libwr2rf_dev *dev, unsigned id,
 #define LIBWR2RF_LEMO_DBG_WRS_RF_RST             11
 #define LIBWR2RF_LEMO_DBG_WRS_SOFTSTOP           12
 #define LIBWR2RF_LEMO_DBG_WRS_SOFTSTART          13
+#define LIBWR2RF_LEMO_DBG_NONE                   14
+

 /* LEMO front panel debug selection */
 int libwr2rf_configure_lemo_debug(struct libwr2rf_dev *dev,

--- a/software/libwr2rf/wr2rf.c
+++ b/software/libwr2rf/wr2rf.c
@@ -2658,12 +2658,12 @@ lemo_disp_dbg(struct libwr2rf_dev *dev, struct strb *strb, unsigned lemo)
  val = libwr2rf_read16
    (dev, WR2RF_VME_REGS_INIT + WR2RF_INIT_REGS_TMGIO1 + lemo*2);
  strb_printf(strb, "out: ");
-  if (val == (1 << (LIBWR2RF_LEMO_DBG_WRS_SOFTSTOP - 1))) {
+  if (val == (1 << LIBWR2RF_LEMO_DBG_WRS_SOFTSTOP)) {
    unsigned vtu;

    strb_printf(strb, "softstop");

-    vtu = libwr2rf_read16(dev, WR2RF_VME_REGS_INIT + WR2RF_INIT_REGS_SOFTSTART);
+    vtu = libwr2rf_read16(dev, WR2RF_VME_REGS_INIT + WR2RF_INIT_REGS_SOFTSTOP);

    switch (vtu) {
    case LIBWR2RF_RF1T1_SOFTSTOP_SEL:
@@ -2683,7 +2683,7 @@ lemo_disp_dbg(struct libwr2rf_dev *dev, struct strb *strb, unsigned lemo)
      break;
    }
  }
-  else if (val == (1 << (LIBWR2RF_LEMO_DBG_WRS_SOFTSTART - 1))) {
+  else if (val == (1 << LIBWR2RF_LEMO_DBG_WRS_SOFTSTART)) {
    unsigned vtu;

    strb_printf(strb, "softstart");