Skip to content

B
Beam Positoning Monitor - Software
Commit 21172980 authored by Lucas Russo's avatar Lucas Russo
Browse files
Options

examples/*: remove maximum board checking 

This is unnecessary, as even if we force the user to input
a valid range, nothing guarantees that the specified board
will be plugged in the crate.
parent ed217868
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 59 deletions
examples/acq.c
View file @ 21172980
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
* * a client and the FPGA device * * a client and the FPGA device
* */ * */
#include <mdp.h>
#include <czmq.h> #include <czmq.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>
...@@ -19,7 +18,6 @@ ...@@ -19,7 +18,6 @@
#define MAX_BPM_NUMBER 1 #define MAX_BPM_NUMBER 1
#define DFLT_BOARD_NUMBER 0 #define DFLT_BOARD_NUMBER 0
#define MAX_BOARD_NUMBER 5
/* Arbitrary hard limits */ /* Arbitrary hard limits */
#define MAX_NUM_SAMPLES (1 << 28) #define MAX_NUM_SAMPLES (1 << 28)
...@@ -173,18 +171,12 @@ int main (int argc, char *argv []) ...@@ -173,18 +171,12 @@ int main (int argc, char *argv [])
} }
else { else {
board_number = strtoul (board_number_str, NULL, 10); board_number = strtoul (board_number_str, NULL, 10);
if (board_number > MAX_BOARD_NUMBER) {
fprintf (stderr, "[client:acq]: Board number too big! Defaulting to: %u\n",
MAX_BOARD_NUMBER);
board_number = MAX_BOARD_NUMBER;
}
} }
/* Set default bpm number */ /* Set default bpm number */
uint32_t bpm_number; uint32_t bpm_number;
if (bpm_number_str == NULL) { if (bpm_number_str == NULL) {
fprintf (stderr, "[client:leds]: Setting default value to BPM number: %u\n", fprintf (stderr, "[client:acq]: Setting default value to BPM number: %u\n",
DFLT_BPM_NUMBER); DFLT_BPM_NUMBER);
bpm_number = DFLT_BPM_NUMBER; bpm_number = DFLT_BPM_NUMBER;
} }
...@@ -192,7 +184,7 @@ int main (int argc, char *argv []) ...@@ -192,7 +184,7 @@ int main (int argc, char *argv [])
bpm_number = strtoul (bpm_number_str, NULL, 10); bpm_number = strtoul (bpm_number_str, NULL, 10);
if (bpm_number > MAX_BPM_NUMBER) { if (bpm_number > MAX_BPM_NUMBER) {
fprintf (stderr, "[client:leds]: BPM number too big! Defaulting to: %u\n", fprintf (stderr, "[client:acq]: BPM number too big! Defaulting to: %u\n",
MAX_BPM_NUMBER); MAX_BPM_NUMBER);
bpm_number = MAX_BPM_NUMBER; bpm_number = MAX_BPM_NUMBER;
} }
......
examples/ad9510_ctl.c
View file @ 21172980
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define MAX_BPM_NUMBER 1 #define MAX_BPM_NUMBER 1
#define DFLT_BOARD_NUMBER 0 #define DFLT_BOARD_NUMBER 0
#define MAX_BOARD_NUMBER 5
#define FUNC_AD9510_A_DIV_IDX 0 #define FUNC_AD9510_A_DIV_IDX 0
#define FUNC_AD9510_B_DIV_IDX 1 #define FUNC_AD9510_B_DIV_IDX 1
...@@ -186,12 +185,6 @@ int main (int argc, char *argv []) ...@@ -186,12 +185,6 @@ int main (int argc, char *argv [])
} }
else { else {
board_number = strtoul (board_number_str, NULL, 10); board_number = strtoul (board_number_str, NULL, 10);
if (board_number > MAX_BOARD_NUMBER) {
fprintf (stderr, "[client:leds]: BOARD number too big! Defaulting to: %u\n",
MAX_BOARD_NUMBER);
board_number = MAX_BOARD_NUMBER;
}
} }
/* Set default bpm number */ /* Set default bpm number */
......
examples/adc_dly.c
View file @ 21172980
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define MAX_BPM_NUMBER 1 #define MAX_BPM_NUMBER 1
#define DFLT_BOARD_NUMBER 0 #define DFLT_BOARD_NUMBER 0
#define MAX_BOARD_NUMBER 5
#define DFLT_ADC_DLY_VALUE 10 #define DFLT_ADC_DLY_VALUE 10
#define MAX_ADC_DLY_VALUE 31 #define MAX_ADC_DLY_VALUE 31
...@@ -113,12 +112,6 @@ int main (int argc, char *argv []) ...@@ -113,12 +112,6 @@ int main (int argc, char *argv [])
} }
else { else {
board_number = strtoul (board_number_str, NULL, 10); board_number = strtoul (board_number_str, NULL, 10);
if (board_number > MAX_BOARD_NUMBER) {
fprintf (stderr, "[client:leds]: BOARD number too big! Defaulting to: %u\n",
MAX_BOARD_NUMBER);
board_number = MAX_BOARD_NUMBER;
}
} }
/* Set default bpm number */ /* Set default bpm number */
......
examples/dsp_swap.c
View file @ 21172980
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#define MAX_BPM_NUMBER 1 #define MAX_BPM_NUMBER 1
#define DFLT_BOARD_NUMBER 0 #define DFLT_BOARD_NUMBER 0
#define MAX_BOARD_NUMBER 5
void print_help (char *program_name) void print_help (char *program_name)
{ {
...@@ -107,12 +106,6 @@ int main (int argc, char *argv []) ...@@ -107,12 +106,6 @@ int main (int argc, char *argv [])
} }
else { else {
board_number = strtoul (board_number_str, NULL, 10); board_number = strtoul (board_number_str, NULL, 10);
if (board_number > MAX_BOARD_NUMBER) {
fprintf (stderr, "[client:dsp]: BOARD number too big! Defaulting to: %u\n",
MAX_BOARD_NUMBER);
board_number = MAX_BOARD_NUMBER;
}
} }
/* Set default bpm number */ /* Set default bpm number */
......
examples/fmc130m_4ch_ctl.c
View file @ 21172980
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#define MAX_BPM_NUMBER 1 #define MAX_BPM_NUMBER 1
#define DFLT_BOARD_NUMBER 0 #define DFLT_BOARD_NUMBER 0
#define MAX_BOARD_NUMBER 5
void print_help (char *program_name) void print_help (char *program_name)
{ {
...@@ -123,12 +122,6 @@ int main (int argc, char *argv []) ...@@ -123,12 +122,6 @@ int main (int argc, char *argv [])
} }
else { else {
board_number = strtoul (board_number_str, NULL, 10); board_number = strtoul (board_number_str, NULL, 10);
if (board_number > MAX_BOARD_NUMBER) {
fprintf (stderr, "[client:fmc130m_4ch]: BOARD number too big! Defaulting to: %u\n",
MAX_BOARD_NUMBER);
board_number = MAX_BOARD_NUMBER;
}
} }
/* Set default bpm number */ /* Set default bpm number */
......
examples/leds.c
View file @ 21172980
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#define MAX_BPM_NUMBER 1 #define MAX_BPM_NUMBER 1
#define DFLT_BOARD_NUMBER 0 #define DFLT_BOARD_NUMBER 0
#define MAX_BOARD_NUMBER 5
void print_help (char *program_name) void print_help (char *program_name)
{ {
...@@ -85,12 +84,6 @@ int main (int argc, char *argv []) ...@@ -85,12 +84,6 @@ int main (int argc, char *argv [])
} }
else { else {
board_number = strtoul (board_number_str, NULL, 10); board_number = strtoul (board_number_str, NULL, 10);
if (board_number > MAX_BOARD_NUMBER) {
fprintf (stderr, "[client:leds]: BOARD number too big! Defaulting to: %u\n",
MAX_BOARD_NUMBER);
board_number = MAX_BOARD_NUMBER;
}
} }
/* Set default bpm number */ /* Set default bpm number */
......
examples/rffe_ctl.c
View file @ 21172980
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define MAX_BPM_NUMBER 1 #define MAX_BPM_NUMBER 1
#define DFLT_BOARD_NUMBER 0 #define DFLT_BOARD_NUMBER 0
#define MAX_BOARD_NUMBER 5
#define FUNC_RFFE_SW_IDX 0 #define FUNC_RFFE_SW_IDX 0
#define FUNC_RFFE_ATT1_IDX 1 #define FUNC_RFFE_ATT1_IDX 1
...@@ -198,12 +197,6 @@ int main (int argc, char *argv []) ...@@ -198,12 +197,6 @@ int main (int argc, char *argv [])
} }
else { else {
board_number = strtoul (board_number_str, NULL, 10); board_number = strtoul (board_number_str, NULL, 10);
if (board_number > MAX_BOARD_NUMBER) {
fprintf (stderr, "[client:rffe]: BOARD number too big! Defaulting to: %u\n",
MAX_BOARD_NUMBER);
board_number = MAX_BOARD_NUMBER;
}
} }
/* Set default bpm number */ /* Set default bpm number */
......
examples/test_data_en.c
View file @ 21172980
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define MAX_BPM_NUMBER 1 #define MAX_BPM_NUMBER 1
#define DFLT_BOARD_NUMBER 0 #define DFLT_BOARD_NUMBER 0
#define MAX_BOARD_NUMBER 5
void print_help (char *program_name) void print_help (char *program_name)
{ {
...@@ -93,12 +92,6 @@ int main (int argc, char *argv []) ...@@ -93,12 +92,6 @@ int main (int argc, char *argv [])
} }
else { else {
board_number = strtoul (board_number_str, NULL, 10); board_number = strtoul (board_number_str, NULL, 10);
if (board_number > MAX_BOARD_NUMBER) {
fprintf (stderr, "[client:leds]: BOARD number too big! Defaulting to: %u\n",
MAX_BOARD_NUMBER);
board_number = MAX_BOARD_NUMBER;
}
} }
/* Set default bpm number */ /* Set default bpm number */
......
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