[Commit-gnuradio] r10181 - in gnuradio/trunk/usrp2/firmware: apps lib

[jcorgan]

Author: jcorgan
Date: 2008-12-31 13:46:29 -0700 (Wed, 31 Dec 2008)
New Revision: 10181

Modified:
   gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c
   gnuradio/trunk/usrp2/firmware/lib/memory_map.h
Log:
Rename constant for clarity

Modified: gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c
===================================================================
--- gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c  2008-12-30 04:58:11 UTC 
(rev 10180)
+++ gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c  2008-12-31 20:46:29 UTC 
(rev 10181)
@@ -180,7 +180,7 @@
       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 @@
       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;

Modified: gnuradio/trunk/usrp2/firmware/lib/memory_map.h
===================================================================
--- gnuradio/trunk/usrp2/firmware/lib/memory_map.h      2008-12-30 04:58:11 UTC 
(rev 10180)
+++ gnuradio/trunk/usrp2/firmware/lib/memory_map.h      2008-12-31 20:46:29 UTC 
(rev 10181)
@@ -370,8 +370,8 @@
 
 // --- 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 @@
 
 #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;