BugID: 1001

Added #ifdef to #define-out soem TD initialization code for testing purposes.

MAC/APL/PIC/RSPDriver/src/TDSProtocolWrite.cc

@@ -46,52 +46,72 @@ using namespace EPA_Protocol;
 namespace LOFAR {
   namespace RSP {
 
-    static uint8 tds_160MHz[  TDS_INIT_SIZE 
+    static uint8 tds_160MHz[
+#ifndef DISABLE_PROGRAMPLL
+			      TDS_INIT_SIZE 
 			    + TDS_PROGRAMPLLS_SIZE
+#endif
 			    + TDS_160MHZ_SIZE
 			    + TDS_C_END_SIZE] = {
 
 			      // switch to 160MHz to backplane (using 10MHz reference at the front)
+#ifndef DISABLE_PROGRAMPLL
 			      TDS_INIT,
 			      TDS_PROGRAMPLLS,
+#endif
 			      TDS_160MHZ,
 			      TDS_C_END,
 
 			    };
       
 
-    uint8 tds_160MHz_result[  TDS_INIT_RESULT_SIZE
+    uint8 tds_160MHz_result[
+#ifndef DISABLE_PROGRAMPLL
+			      TDS_INIT_RESULT_SIZE
 			    + TDS_PROGRAMPLLS_RESULT_SIZE
+#endif
 			    + TDS_160MHZ_RESULT_SIZE
 			    + TDS_C_END_RESULT_SIZE] = {
 
+#ifndef DISABLE_PROGRAMPLL
 			      TDS_INIT_RESULT,
 			      TDS_PROGRAMPLLS_RESULT,
+#endif
 			      TDS_160MHZ_RESULT,
 			      TDS_C_END_RESULT,
 
 			    };
 
-    static uint8 tds_200MHz[  TDS_INIT_SIZE
+    static uint8 tds_200MHz[ 
+#ifndef DISABLE_PROGRAMPLL
+			      TDS_INIT_SIZE
 			    + TDS_PROGRAMPLLS_SIZE
+#endif
 			    + TDS_200MHZ_SIZE
 			    + TDS_C_END_SIZE] = {
 
 			      // switch to 200MHz to backplane (using 10MHz reference at the front)
+#ifndef DISABLE_PROGRAMPLL
 			      TDS_INIT,
 			      TDS_PROGRAMPLLS,
+#endif
 			      TDS_200MHZ,
 			      TDS_C_END,
 
 			    };
 
-    uint8 tds_200MHz_result[  TDS_INIT_RESULT_SIZE
+    uint8 tds_200MHz_result[
+#ifndef DISABLE_PROGRAMPLL
+			      TDS_INIT_RESULT_SIZE
 			    + TDS_PROGRAMPLLS_RESULT_SIZE
+#endif
 			    + TDS_200MHZ_RESULT_SIZE
 			    + TDS_C_END_RESULT_SIZE] = {
 
+#ifndef DISABLE_PROGRAMPLL
 			      TDS_INIT_RESULT,
 			      TDS_PROGRAMPLLS_RESULT,
+#endif
 			      TDS_200MHZ_RESULT,
 			      TDS_C_END_RESULT,
 

MAC/APL/PIC/RSPDriver/src/TDSi2cdefs.h

@@ -357,15 +357,26 @@
 #define TDS_C_WAIT_RESULT      0x00
 #define TDS_C_WAIT_RESULT_SIZE 1
 
+//
+// Uncommand next line to prevent programming of PLL
+// 
+//#define DISABLE_PROGRAMPLL
+
 namespace LOFAR {
   namespace RSP {
 
-    extern uint8 tds_160MHz_result[  TDS_INIT_RESULT_SIZE
+    extern uint8 tds_160MHz_result[
+#ifndef DISABLE_PROGRAMPLL
+				     TDS_INIT_RESULT_SIZE
 				   + TDS_PROGRAMPLLS_RESULT_SIZE
+#endif
 				   + TDS_160MHZ_RESULT_SIZE
 				   + TDS_C_END_RESULT_SIZE];
-    extern uint8 tds_200MHz_result[  TDS_INIT_RESULT_SIZE
+    extern uint8 tds_200MHz_result[ 
+#ifndef DISABLE_PROGRAMPLL
+				     TDS_INIT_RESULT_SIZE
 				   + TDS_PROGRAMPLLS_RESULT_SIZE
+#endif
 				   + TDS_200MHZ_RESULT_SIZE
 				   + TDS_C_END_RESULT_SIZE];
     extern uint8 tds_off_result[  TDS_VCXO_OFF_RESULT_SIZE