Bladeren bron

Small changes

Anatoliy Chigirinskiy 1 jaar geleden
bovenliggende
commit
19798b6180
2 gewijzigde bestanden met toevoegingen van 123 en 124 verwijderingen
  1. 119 120
      Devices/lmx2594.c
  2. 4 4
      Devices/lmx2594.h

+ 119 - 120
Devices/lmx2594.c

@@ -1,6 +1,125 @@
 #include "lmx2594.h"
 #include <math.h>
 
+const uint32_t lmx2594_rst[] = {
+        0x002516,
+        0x002514
+};
+uint32_t lmx2594regs[LMX_COUNT] = {
+        0x700000,
+        0x6F0000,
+        0x6E0000,
+        0x6D0000,
+        0x6C0000,
+        0x6B0000,
+        0x6A0000,
+        0x690021,
+        0x680000,
+        0x670000,
+        0x660000,
+        0x650011,
+        0x640000,
+        0x630000,
+        0x620000,
+        0x610888,
+        0x600000,
+        0x5F0000,
+        0x5E0000,
+        0x5D0000,
+        0x5C0000,
+        0x5B0000,
+        0x5A0000,
+        0x590000,
+        0x580000,
+        0x570000,
+        0x560000,
+        0x550000,
+        0x540000,
+        0x530000,
+        0x520000,
+        0x510000,
+        0x500000,
+        0x4F0000,
+        0x4E0105,
+        0x4D0000,
+        0x4C000C,
+        0x4B0C40,
+        0x4A0000,
+        0x49003F,
+        0x480001,
+        0x470081,
+        0x46C350,
+        0x450000,
+        0x4403E8,
+        0x430000,
+        0x4201F4,
+        0x410000,
+        0x401388,
+        0x3F0000,
+        0x3E0322,
+        0x3D00A8,
+        0x3C03E8,
+        0x3B0001,
+        0x3A9001,
+        0x390020,
+        0x380000,
+        0x370000,
+        0x360000,
+        0x350000,
+        0x340820,
+        0x330080,
+        0x320000,
+        0x314180,
+        0x300300,
+        0x2F0300,
+        0x2E07FD,
+        0x2DC8DF,
+        0x2C1F20,
+        0x2B0000,
+        0x2A0000,
+        0x290000,
+        0x280000,
+        0x2703E8,
+        0x260000,
+        0x250104,
+        0x240032,
+        0x230004,
+        0x220000,
+        0x211E21,
+        0x200393,
+        0x1F43EC,
+        0x1E318C,
+        0x1D318C,
+        0x1C0488,
+        0x1B0002,
+        0x1A0DB0,
+        0x190C2B,
+        0x18071A,
+        0x17007C,
+        0x160001,
+        0x150401,
+        0x14D848,
+        0x1327B7,
+        0x120064,
+        0x110130,
+        0x100080,
+        0x0F064F,
+        0x0E1E40,
+        0x0D4000,
+        0x0C5001,
+        0x0B0018,
+        0x0A10D8,
+        0x090604,
+        0x082000,
+        0x0740B2,
+        0x06C802,
+        0x0500C8,
+        0x041443,
+        0x030642,
+        0x020500,
+        0x01080B,
+        0x00251C
+};
 
 struct vco_params calculate_vco_params (double lmx_freq, double f_pd) {
     struct vco_params params;
@@ -144,126 +263,6 @@ void set_vco_params (struct vco_params *params) {
 
 }
 
-const uint32_t lmx2594_rst[] = {
-        0x002516,
-        0x002514
-};
-uint32_t lmx2594regs[LMX_COUNT] = {
-        0x700000,
-        0x6F0000,
-        0x6E0000,
-        0x6D0000,
-        0x6C0000,
-        0x6B0000,
-        0x6A0000,
-        0x690021,
-        0x680000,
-        0x670000,
-        0x660000,
-        0x650011,
-        0x640000,
-        0x630000,
-        0x620000,
-        0x610888,
-        0x600000,
-        0x5F0000,
-        0x5E0000,
-        0x5D0000,
-        0x5C0000,
-        0x5B0000,
-        0x5A0000,
-        0x590000,
-        0x580000,
-        0x570000,
-        0x560000,
-        0x550000,
-        0x540000,
-        0x530000,
-        0x520000,
-        0x510000,
-        0x500000,
-        0x4F0000,
-        0x4E0105,
-        0x4D0000,
-        0x4C000C,
-        0x4B0C40,
-        0x4A0000,
-        0x49003F,
-        0x480001,
-        0x470081,
-        0x46C350,
-        0x450000,
-        0x4403E8,
-        0x430000,
-        0x4201F4,
-        0x410000,
-        0x401388,
-        0x3F0000,
-        0x3E0322,
-        0x3D00A8,
-        0x3C03E8,
-        0x3B0001,
-        0x3A9001,
-        0x390020,
-        0x380000,
-        0x370000,
-        0x360000,
-        0x350000,
-        0x340820,
-        0x330080,
-        0x320000,
-        0x314180,
-        0x300300,
-        0x2F0300,
-        0x2E07FD,
-        0x2DC8DF,
-        0x2C1F20,
-        0x2B0000,
-        0x2A0000,
-        0x290000,
-        0x280000,
-        0x2703E8,
-        0x260000,
-        0x250104,
-        0x240032,
-        0x230004,
-        0x220000,
-        0x211E21,
-        0x200393,
-        0x1F43EC,
-        0x1E318C,
-        0x1D318C,
-        0x1C0488,
-        0x1B0002,
-        0x1A0DB0,
-        0x190C2B,
-        0x18071A,
-        0x17007C,
-        0x160001,
-        0x150401,
-        0x14D848,
-        0x1327B7,
-        0x120064,
-        0x110130,
-        0x100080,
-        0x0F064F,
-        0x0E1E40,
-        0x0D4000,
-        0x0C5001,
-        0x0B0018,
-        0x0A10D8,
-        0x090604,
-        0x082000,
-        0x0740B2,
-        0x06C802,
-        0x0500C8,
-        0x041443,
-        0x030642,
-        0x020500,
-        0x01080B,
-        0x00251C
-};
-
 void auto_cal(void *bar1) {
     lmx2594regs[112-FCAL_ADDR] = lmx2594regs[112-FCAL_ADDR] & (~BITM_LMX2594_R0_FCAL);
     lmx2594regs[112-FCAL_ADDR] = lmx2594regs[112-FCAL_ADDR] | LMX2594_R0_FCAL_EN;

+ 4 - 4
Devices/lmx2594.h

@@ -18,10 +18,10 @@ struct vco_params {
     int a_core_max;
     uint16_t vco_cap_ctrl_strt;
     uint16_t vco_daciset_strt;
-    uint8_t acal_cmp_dly;
-    uint8_t cal_clk_div;
-    uint8_t pfd_dly_sel;
-    uint8_t fcal_hpfd_adj; 
+    uint16_t acal_cmp_dly;
+    uint16_t cal_clk_div;
+    uint16_t pfd_dly_sel;
+    uint16_t fcal_hpfd_adj; 
 
 
 };