Changes between Version 11 and Version 12 of cores/w3_clock_controller

Timestamp:

Jan 29, 2015, 2:54:35 PM (9 years ago)

Author:

murphpo

Comment:

--

cores/w3_clock_controller

@@ -126 +126 @@
 }}}
 {{{#!td style="background: #fff"
- * Select clock module (MMCX Jack "Samp In") as sampling clock source
+ * Select clock module (MMCX connector "Samp In") as sampling clock source
  * Set output to FPGA as LVDS, bypass divider
 }}}
@@ -132 +132 @@
 
 == Custom Configurations ==
-The default configurations described above are implemented in the program ROM of the PicoBlaze microcontroller in the w3_clock_controller_axi core. These defaults can be overridden by programing new register address/data values in the WARP v3 EEPROM. The PicoBlaze program checks the EEPROM for valid clock configuration values on boot. If valid configuration options are found the program loads these from the EEPROM, bypassing the defaults entirely.
+The default configurations described above are implemented in the program ROM of the PicoBlaze microcontroller in the w3_clock_controller_axi core. These defaults can be overridden by programing new register address/data values in the WARP v3 EEPROM. The PicoBlaze program checks the EEPROM for valid clock configuration values on boot. If valid configuration options are found in the EEPROM the program loads these instead of the internal defaults.
+
+The configuration values are stored in the WARP v3 EEPROM starting at byte address 15000. Configuration values are stored as 2-byte address/data pairs, with each pair corresponding to a 1-byte register write via SPI to a single device. There are separate configuration values for the 3 SPI slave devices (the RF reference clock buffer, the sampling clock buffer and the PLL on the CM-PLL clock module). Multiple configurations can be defined for each device to support run-time selection of the active configuration via the clock module switches.
+
+The EEPROM addresses for the various clock configuration values are listed in the table below.
 
 ||= EEPROM Bytes =||= Byte Values =||= Description =||
@@ -175 +179 @@
 
         if(no_clock_module_mounted) {
-          load_configuration(CFG_NOCM)
-          config_complete()
+                load_configuration(DEV_RF_REF, CFG_NOCM)
+                load_configuration(DEV_SAMP, CFG_NOCM)
+                load_configuration(DEV_PLL, CFG_NOCM)
+                config_complete()
         }
 
@@ -184 +190 @@
                 if(sw == off_off) {
                         //Up-Up switches -> ignore clock module
-                        load_configuration(CFG_NOCM)
+                        load_configuration(DEV_RF_REF, CFG_NOCM)
+                        load_configuration(DEV_SAMP, CFG_NOCM)
+                        load_configuration(DEV_PLL, CFG_NOCM)
                 } else if(sw == off_on) {
                         //Up-Down switches -> Config A
-                        load_configuration(CFG_CMMMCX_A)
+                        load_configuration(DEV_RF_REF, CFG_CMMMCX_A)
+                        load_configuration(DEV_SAMP, CFG_CMMMCX_A)
                 } else if(sw == on_off) {
                         //Down-Up switches -> Config B
-                        load_configuration(CFG_CMMMCX_B)
+                        load_configuration(DEV_RF_REF, CFG_CMMMCX_B)
+                        load_configuration(DEV_SAMP, CFG_CMMMCX_B)
                 } else if(sw == on_on) {
                         //Down-Up switches -> Config C
-                        load_configuration(CFG_CMMMCX_C)
+                        load_configuration(DEV_RF_REF, CFG_CMMMCX_C)
+                        load_configuration(DEV_SAMP, CFG_CMMMCX_C)
                 }
   
@@ -204 +215 @@
                 if(sw == off_off) {
                         //Down-Down switches -> ignore clock module
-                        load_configuration(CFG_NOCM)
+                        load_configuration(DEV_RF_REF, CFG_NOCM)
+                        load_configuration(DEV_SAMP, CFG_NOCM)
+                        load_configuration(DEV_PLL, CFG_NOCM)
                         config_complete()
                 }
@@ -212 +225 @@
                 if(sw == off_on) {
                         //Down-Up switches -> Config A
-                        load_configuration(CFG_CMPLL_A)
+                        load_configuration(DEV_RF_REF, CFG_CMPLL_A)
+                        load_configuration(DEV_SAMP, CFG_CMPLL_A)
+                        load_configuration(DEV_PLL, CFG_CMPLL_A)
                 } else if(sw == on_off) {
                         //Up-Down switches -> Config B
-                        load_configuration(CFG_CMPLL_B)
+                        load_configuration(DEV_RF_REF, CFG_CMPLL_B)
+                        load_configuration(DEV_SAMP, CFG_CMPLL_B)
+                        load_configuration(DEV_PLL, CFG_CMPLL_B)
                 } else if(sw == on_on) {
                         //Up-Up switches -> Config C
-                        load_configuration(CFG_CMPLL_C)
+                        load_configuration(DEV_RF_REF, CFG_CMPLL_C)
+                        load_configuration(DEV_SAMP, CFG_CMPLL_C)
+                        load_configuration(DEV_PLL, CFG_CMPLL_C)
                 }
 
@@ -225 +244 @@
                 config_complete()
         }
+}
+
+load_configuration(req_device, req_cfg) {
+        if(eeprom[15000] == 0xA5 && eeprom[15001] == 0xCD) {
+                cfg_data = copy_cfg_from_eeprom(req_device, req_cfg)
+        } else {
+                cfg_data = copy_cfg_from_rom(req_device, req_cfg)
+        }
+
+        write_cfg_to_device(req_device, cfg_data)
 }