summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/target/firmware/Makefile2
-rw-r--r--src/target/firmware/board/gta0x/afcparams.c53
-rw-r--r--src/target/firmware/board/gta0x/rf_tables.c29
3 files changed, 55 insertions, 29 deletions
diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile
index 6e511073..6eacb33b 100644
--- a/src/target/firmware/Makefile
+++ b/src/target/firmware/Makefile
@@ -44,6 +44,7 @@ calypso_COMMON_OBJS=board/common/calypso_uart.o \
# OpenMoko GTA0x
BOARD_gta0x_OBJS=$(calypso_COMMON_OBJS) board/gta0x/init.o \
board/gta0x/rffe_gta0x_triband.o board/gta0x/rf_tables.o \
+ board/gta0x/afcparams.o \
board/common/readcal_tiffs.o battery/dummy.o $(FB_dummy_OBJS)
BOARD_gta0x_ENVIRONMENTS=highram
@@ -56,6 +57,7 @@ BOARD_gtm900b_ENVIRONMENTS=highram
# FreeCalypso FCDEV3B
BOARD_fcdev3b_OBJS=$(calypso_COMMON_OBJS) board/fcdev3b/init.o \
board/gta0x/rffe_gta0x_triband.o board/gta0x/rf_tables.o \
+ board/gta0x/afcparams.o \
board/common/readcal_tiffs.o battery/dummy.o $(FB_dummy_OBJS)
BOARD_fcdev3b_ENVIRONMENTS=highram
diff --git a/src/target/firmware/board/gta0x/afcparams.c b/src/target/firmware/board/gta0x/afcparams.c
new file mode 100644
index 00000000..ba48360d
--- /dev/null
+++ b/src/target/firmware/board/gta0x/afcparams.c
@@ -0,0 +1,53 @@
+/*
+ * This code was written by Mychaela Falconia <falcon@freecalypso.org>
+ * who refuses to claim copyright on it and has released it as public domain
+ * instead. NO rights reserved, all rights relinquished.
+ *
+ * Tweaked (coding style changes) by Vadim Yanitskiy <axilirator@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include <stdint.h>
+#include <rf/vcxocal.h>
+
+/*
+ * Here is a typical set of AFC Psi parameters for an FCDEV3B modem board,
+ * computed by FreeCalypso fc-rfcal-vcxo calibration tool from frequency
+ * offset measurements made with a CMU200 RF tester:
+ *
+ * Psi_sta_inv: 3462
+ * Psi_st: 15
+ * Psi_st_32: 992326
+ * Psi_st_inv: 4328
+ *
+ * The following AFC slope number is the closest OsmocomBB-style afc_slope
+ * integer corresponding to these Psi numbers; the true value is somewhere
+ * between 454 and 455.
+ *
+ * This AFC slope setting is expected to be correct for both Openmoko and
+ * FreeCalypso hardware as we use the same VCXO components as were used
+ * by Openmoko.
+ */
+int16_t afc_slope = 454;
+
+/*
+ * The compiled-in AFC initial DAC value below is the same as was used by
+ * the old OsmocomBB code written for Mot C1xx phones, but it will normally
+ * be overridden by the per-unit factory calibration value read from the
+ * /gsm/rf/afcdac file in FFS.
+ */
+int16_t afc_initial_dac_value = -700;
diff --git a/src/target/firmware/board/gta0x/rf_tables.c b/src/target/firmware/board/gta0x/rf_tables.c
index fd33b16b..9a08b3c7 100644
--- a/src/target/firmware/board/gta0x/rf_tables.c
+++ b/src/target/firmware/board/gta0x/rf_tables.c
@@ -23,35 +23,6 @@
#include <stdint.h>
#include <rf/txcal.h>
-#include <rf/vcxocal.h>
-
-/*
- * Here is a typical set of AFC Psi parameters for an FCDEV3B modem board,
- * computed by FreeCalypso fc-rfcal-vcxo calibration tool from frequency
- * offset measurements made with a CMU200 RF tester:
- *
- * Psi_sta_inv: 3462
- * Psi_st: 15
- * Psi_st_32: 992326
- * Psi_st_inv: 4328
- *
- * The following AFC slope number is the closest OsmocomBB-style afc_slope
- * integer corresponding to these Psi numbers; the true value is somewhere
- * between 454 and 455.
- *
- * This AFC slope setting is expected to be correct for both Openmoko and
- * FreeCalypso hardware as we use the same VCXO components as were used
- * by Openmoko.
- */
-int16_t afc_slope = 454;
-
-/*
- * The compiled-in AFC initial DAC value below is the same as was used by
- * the old OsmocomBB code written for Mot C1xx phones, but it will normally
- * be overridden by the per-unit factory calibration value read from the
- * /gsm/rf/afcdac file in FFS.
- */
-int16_t afc_initial_dac_value = -700;
/* APC offset (comes from the official firmware) for TI-classic targets */
uint8_t apc_offset = 48;