<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/20325">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
Vadim Yanitskiy: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">firmware: calibration: split afcparams.c from rf_tables.c for gta0x<br><br>We have new hardware targets that have appeared since the original<br>OS#3582 patch was created, namely Huawei GTM900-B and the upcoming<br>FreeCalypso Caramel2 board. These new targets need the same APC<br>offset as gta0x and fcdev3b (TI's original Leonardo value), they<br>have proper calibration records in their FFS (meaning that all<br>compiled-in numbers become no-effect placeholders), and their PA<br>tracts are similar enough to Openmoko/FCDEV3B to where even in the<br>absence of calibration OM/FC numbers are close enough. Thus most<br>of the tables in board/gta0x/rf_tables.c should be reusable by<br>these new targets.<br><br>However, these new targets have quite different VCXOs from Openmoko<br>and FCDEV3B, thus they need different AFC parameters. Thus we split<br>board/gta0x/afcparams.c from board/gta0x/rf_tables.c, making the<br>latter more reusable.<br><br>Related: OS#3582<br>Change-Id: I92e245843253f279dd6d61bd5098766694c5215f<br>---<br>M src/target/firmware/Makefile<br>A src/target/firmware/board/gta0x/afcparams.c<br>M src/target/firmware/board/gta0x/rf_tables.c<br>3 files changed, 55 insertions(+), 29 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile</span><br><span>index 6e51107..6eacb33 100644</span><br><span>--- a/src/target/firmware/Makefile</span><br><span>+++ b/src/target/firmware/Makefile</span><br><span>@@ -44,6 +44,7 @@</span><br><span> # OpenMoko GTA0x</span><br><span> BOARD_gta0x_OBJS=$(calypso_COMMON_OBJS) board/gta0x/init.o \</span><br><span> board/gta0x/rffe_gta0x_triband.o board/gta0x/rf_tables.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ board/gta0x/afcparams.o \</span><br><span> board/common/readcal_tiffs.o battery/dummy.o $(FB_dummy_OBJS)</span><br><span> BOARD_gta0x_ENVIRONMENTS=highram</span><br><span> </span><br><span>@@ -56,6 +57,7 @@</span><br><span> # FreeCalypso FCDEV3B</span><br><span> BOARD_fcdev3b_OBJS=$(calypso_COMMON_OBJS) board/fcdev3b/init.o \</span><br><span> board/gta0x/rffe_gta0x_triband.o board/gta0x/rf_tables.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ board/gta0x/afcparams.o \</span><br><span> board/common/readcal_tiffs.o battery/dummy.o $(FB_dummy_OBJS)</span><br><span> BOARD_fcdev3b_ENVIRONMENTS=highram</span><br><span> </span><br><span>diff --git a/src/target/firmware/board/gta0x/afcparams.c b/src/target/firmware/board/gta0x/afcparams.c</span><br><span>new file mode 100644</span><br><span>index 0000000..ba48360</span><br><span>--- /dev/null</span><br><span>+++ b/src/target/firmware/board/gta0x/afcparams.c</span><br><span>@@ -0,0 +1,53 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * This code was written by Mychaela Falconia <falcon@freecalypso.org></span><br><span style="color: hsl(120, 100%, 40%);">+ * who refuses to claim copyright on it and has released it as public domain</span><br><span style="color: hsl(120, 100%, 40%);">+ * instead. NO rights reserved, all rights relinquished.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Tweaked (coding style changes) by Vadim Yanitskiy <axilirator@gmail.com></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 2 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU General Public License along</span><br><span style="color: hsl(120, 100%, 40%);">+ * with this program; if not, write to the Free Software Foundation, Inc.,</span><br><span style="color: hsl(120, 100%, 40%);">+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdint.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <rf/vcxocal.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * Here is a typical set of AFC Psi parameters for an FCDEV3B modem board,</span><br><span style="color: hsl(120, 100%, 40%);">+ * computed by FreeCalypso fc-rfcal-vcxo calibration tool from frequency</span><br><span style="color: hsl(120, 100%, 40%);">+ * offset measurements made with a CMU200 RF tester:</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Psi_sta_inv: 3462</span><br><span style="color: hsl(120, 100%, 40%);">+ * Psi_st: 15</span><br><span style="color: hsl(120, 100%, 40%);">+ * Psi_st_32: 992326</span><br><span style="color: hsl(120, 100%, 40%);">+ * Psi_st_inv: 4328</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * The following AFC slope number is the closest OsmocomBB-style afc_slope</span><br><span style="color: hsl(120, 100%, 40%);">+ * integer corresponding to these Psi numbers; the true value is somewhere</span><br><span style="color: hsl(120, 100%, 40%);">+ * between 454 and 455.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This AFC slope setting is expected to be correct for both Openmoko and</span><br><span style="color: hsl(120, 100%, 40%);">+ * FreeCalypso hardware as we use the same VCXO components as were used</span><br><span style="color: hsl(120, 100%, 40%);">+ * by Openmoko.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int16_t afc_slope = 454;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * The compiled-in AFC initial DAC value below is the same as was used by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the old OsmocomBB code written for Mot C1xx phones, but it will normally</span><br><span style="color: hsl(120, 100%, 40%);">+ * be overridden by the per-unit factory calibration value read from the</span><br><span style="color: hsl(120, 100%, 40%);">+ * /gsm/rf/afcdac file in FFS.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int16_t afc_initial_dac_value = -700;</span><br><span>diff --git a/src/target/firmware/board/gta0x/rf_tables.c b/src/target/firmware/board/gta0x/rf_tables.c</span><br><span>index fd33b16..9a08b3c 100644</span><br><span>--- a/src/target/firmware/board/gta0x/rf_tables.c</span><br><span>+++ b/src/target/firmware/board/gta0x/rf_tables.c</span><br><span>@@ -23,35 +23,6 @@</span><br><span> </span><br><span> #include <stdint.h></span><br><span> #include <rf/txcal.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <rf/vcxocal.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * Here is a typical set of AFC Psi parameters for an FCDEV3B modem board,</span><br><span style="color: hsl(0, 100%, 40%);">- * computed by FreeCalypso fc-rfcal-vcxo calibration tool from frequency</span><br><span style="color: hsl(0, 100%, 40%);">- * offset measurements made with a CMU200 RF tester:</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * Psi_sta_inv: 3462</span><br><span style="color: hsl(0, 100%, 40%);">- * Psi_st: 15</span><br><span style="color: hsl(0, 100%, 40%);">- * Psi_st_32: 992326</span><br><span style="color: hsl(0, 100%, 40%);">- * Psi_st_inv: 4328</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * The following AFC slope number is the closest OsmocomBB-style afc_slope</span><br><span style="color: hsl(0, 100%, 40%);">- * integer corresponding to these Psi numbers; the true value is somewhere</span><br><span style="color: hsl(0, 100%, 40%);">- * between 454 and 455.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This AFC slope setting is expected to be correct for both Openmoko and</span><br><span style="color: hsl(0, 100%, 40%);">- * FreeCalypso hardware as we use the same VCXO components as were used</span><br><span style="color: hsl(0, 100%, 40%);">- * by Openmoko.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-int16_t afc_slope = 454;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * The compiled-in AFC initial DAC value below is the same as was used by</span><br><span style="color: hsl(0, 100%, 40%);">- * the old OsmocomBB code written for Mot C1xx phones, but it will normally</span><br><span style="color: hsl(0, 100%, 40%);">- * be overridden by the per-unit factory calibration value read from the</span><br><span style="color: hsl(0, 100%, 40%);">- * /gsm/rf/afcdac file in FFS.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-int16_t afc_initial_dac_value = -700;</span><br><span> </span><br><span> /* APC offset (comes from the official firmware) for TI-classic targets */</span><br><span> uint8_t apc_offset = 48;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/20325">change 20325</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmocom-bb/+/20325"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I92e245843253f279dd6d61bd5098766694c5215f </div>
<div style="display:none"> Gerrit-Change-Number: 20325 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>