Commit 1acfc3d5 authored by John Gill's avatar John Gill

Merge branch 'ak-devel' into 'master'

NONE selector for softstart and softstop debug signals

See merge request !6
parents 62af4949 49936774
......@@ -1364,6 +1364,8 @@ libwr2rf_configure_softstart_sel(struct libwr2rf_dev *dev, unsigned sel)
unsigned addr = WR2RF_VME_REGS_INIT + WR2RF_INIT_REGS_SOFTSTART;
switch (sel) {
case LIBWR2RF_SOFTSTART_NONE_SEL:
break;
case LIBWR2RF_RF1T1_SOFTSTART_SEL:
break;
case LIBWR2RF_RF1T2_SOFTSTART_SEL:
......@@ -1386,6 +1388,8 @@ libwr2rf_configure_softstop_sel(struct libwr2rf_dev *dev, unsigned sel)
unsigned addr = WR2RF_VME_REGS_INIT + WR2RF_INIT_REGS_SOFTSTOP;
switch (sel) {
case LIBWR2RF_SOFTSTOP_NONE_SEL:
break;
case LIBWR2RF_RF1T1_SOFTSTOP_SEL:
break;
case LIBWR2RF_RF1T2_SOFTSTOP_SEL:
......
......@@ -170,10 +170,14 @@ int libwr2rf_configure_lemo_debug(struct libwr2rf_dev *dev,
unsigned lemo, unsigned dbg);
/* Configuration for soft stop + start output to front panel */
#define LIBWR2RF_SOFTSTOP_NONE_SEL 0x0
#define LIBWR2RF_RF1T1_SOFTSTOP_SEL 0x1
#define LIBWR2RF_RF1T2_SOFTSTOP_SEL 0x2
#define LIBWR2RF_RF2T1_SOFTSTOP_SEL 0x4
#define LIBWR2RF_RF2T2_SOFTSTOP_SEL 0x8
#define LIBWR2RF_SOFTSTART_NONE_SEL 0x0
#define LIBWR2RF_RF1T1_SOFTSTART_SEL 0x1
#define LIBWR2RF_RF1T2_SOFTSTART_SEL 0x2
#define LIBWR2RF_RF2T1_SOFTSTART_SEL 0x4
......
......@@ -2678,6 +2678,9 @@ lemo_disp_dbg(struct libwr2rf_dev *dev, struct strb *strb, unsigned lemo)
case LIBWR2RF_RF2T2_SOFTSTOP_SEL:
strb_printf(strb, "(2.2)");
break;
case LIBWR2RF_SOFTSTOP_NONE_SEL:
strb_printf(strb, "(none)");
break;
default:
strb_printf(strb, "(bad)");
break;
......@@ -2703,6 +2706,9 @@ lemo_disp_dbg(struct libwr2rf_dev *dev, struct strb *strb, unsigned lemo)
case LIBWR2RF_RF2T2_SOFTSTART_SEL:
strb_printf(strb, "(2.2)");
break;
case LIBWR2RF_SOFTSTART_NONE_SEL:
strb_printf(strb, "(none)");
break;
default:
strb_printf(strb, "(bad)");
break;
......@@ -3286,8 +3292,10 @@ api_softstop_sel (struct libwr2rf_dev *dev, int argc, char **argv)
sel = LIBWR2RF_RF2T1_SOFTSTOP_SEL;
else if (strcmp(argv[1],"2.2") == 0)
sel = LIBWR2RF_RF2T2_SOFTSTOP_SEL;
else if (strcmp(argv[1],"none") == 0)
sel = LIBWR2RF_SOFTSTOP_NONE_SEL;
else {
printf("Usage: %s [RF.TU]\n", argv[0]);
printf("Usage: %s [RF.TU] or none\n", argv[0]);
return;
}
}
......@@ -3309,8 +3317,10 @@ api_softstart_sel (struct libwr2rf_dev *dev, int argc, char **argv)
sel = LIBWR2RF_RF2T1_SOFTSTART_SEL;
else if (strcmp(argv[1],"2.2") == 0)
sel = LIBWR2RF_RF2T2_SOFTSTART_SEL;
else if (strcmp(argv[1],"none") == 0)
sel = LIBWR2RF_SOFTSTART_NONE_SEL;
else {
printf("Usage: %s [RF.TU]\n", argv[0]);
printf("Usage: %s [RF.TU] or none\n", argv[0]);
return;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment