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

Bug fix for configuring LEMO's debug signals See merge request !4

Merge branch 'ak-lemocfg-bug-fix' into 'master'
Bug fix for configuring LEMO's debug signals See merge request !4
f7d5829f · John Gill · 56ab09ff · b6622135 · f7d5829f · f7d5829f
Commit f7d5829f authored Nov 19, 2021 by John Gill
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

board.c software/libwr2rf/board.c +1 -1

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

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 < 1 || dbg > 9)
+    if (dbg > LIBWR2RF_LEMO_DBG_WRS_SOFTSTART)
        return LIBWR2RF_ERROR_BAD_PARAM;

    switch (lemo) {

--- a/software/libwr2rf/libwr2rf/api.h
+++ b/software/libwr2rf/libwr2rf/api.h
@@ -148,6 +148,7 @@ int libwr2rf_read_diag(struct libwr2rf_dev *dev, unsigned id,
 #define LIBWR2RF_LEMO_TMGCLK2 6

 /* Debug names */
+#define LIBWR2RF_LEMO_DBG_NONE					 0
 #define LIBWR2RF_LEMO_DBG_NCO_RESET              1
 #define LIBWR2RF_LEMO_DBG_RF1_NCO_RESET_CDELAYED 2
 #define LIBWR2RF_LEMO_DBG_RF2_NCO_RESET_CDELAYED 3