summaryrefslogtreecommitdiff
path: root/usrp2/firmware
diff options
context:
space:
mode:
authorjcorgan2008-12-31 20:46:29 +0000
committerjcorgan2008-12-31 20:46:29 +0000
commitbe2af97adb04146243019b5d3eb8bc44ca44e1a4 (patch)
tree87461b526da6437d1c07f90ab82b2838d6bc5aaa /usrp2/firmware
parent6fb1e402a79cb9c0f78180caf44e4274aa2c503b (diff)
downloadgnuradio-be2af97adb04146243019b5d3eb8bc44ca44e1a4.tar.gz
gnuradio-be2af97adb04146243019b5d3eb8bc44ca44e1a4.tar.bz2
gnuradio-be2af97adb04146243019b5d3eb8bc44ca44e1a4.zip
Rename constant for clarity
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10181 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp2/firmware')
-rw-r--r--usrp2/firmware/apps/app_common_v2.c4
-rw-r--r--usrp2/firmware/lib/memory_map.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/usrp2/firmware/apps/app_common_v2.c b/usrp2/firmware/apps/app_common_v2.c
index 0a51110a9..635093fbb 100644
--- a/usrp2/firmware/apps/app_common_v2.c
+++ b/usrp2/firmware/apps/app_common_v2.c
@@ -180,7 +180,7 @@ config_tx_v2_cmd(const op_config_tx_v2_t *p,
interp = interp >> 1;
}
- if (interp < MIN_INTERP || interp > MAX_INTERP)
+ if (interp < MIN_CIC_INTERP || interp > MAX_CIC_INTERP)
ok = false;
else {
dsp_tx_regs->interp_rate = (hb1<<9) | (hb2<<8) | interp;
@@ -254,7 +254,7 @@ config_rx_v2_cmd(const op_config_rx_v2_t *p,
decim = decim >> 1;
}
- if (decim < MIN_DECIM || decim > MAX_DECIM)
+ if (decim < MIN_CIC_DECIM || decim > MAX_CIC_DECIM)
ok = false;
else {
dsp_rx_regs->decim_rate = (hb1<<9) | (hb2<<8) | decim;
diff --git a/usrp2/firmware/lib/memory_map.h b/usrp2/firmware/lib/memory_map.h
index 0b7412fec..756513b91 100644
--- a/usrp2/firmware/lib/memory_map.h
+++ b/usrp2/firmware/lib/memory_map.h
@@ -370,8 +370,8 @@ typedef struct {
// --- dsp tx regs ---
-#define MIN_INTERP 1
-#define MAX_INTERP 128
+#define MIN_CIC_INTERP 1
+#define MAX_CIC_INTERP 128
typedef struct {
volatile int32_t freq;
@@ -423,8 +423,8 @@ typedef struct {
#define T_NOW (-1)
-#define MIN_DECIM 1
-#define MAX_DECIM 128
+#define MIN_CIC_DECIM 1
+#define MAX_CIC_DECIM 128
typedef struct {
volatile int32_t freq;