# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1579464898 0
# Node ID 57e67ca2e1cb426a82ed7d7f8b97afe96ece5675
# Parent baa0a02bc676f729a69c2e9ab41ce3853c7c7c66
pcmdata.c: default +CGMI to "FreeCalypso" and +CGMM to model
The present change has no effect whatsoever on Falconia-made and Openmoko-made
devices on which /pcm/CGMI and /pcm/CGMM files have been programmed in FFS
with sensible ID strings by the respective factories, but what should AT+CGMI
and AT+CGMM queries return when the device is a Huawei GTM900 or Tango modem
that has been converted to FreeCalypso with a firmware change? Before the
present change they would return compiled-in defaults of "<manufacturer>" and
"<model>", respectively; with the present change the firmware will self-identify
as "FreeCalypso GTM900-FC" or "FreeCalypso Tango" on the two respective targets.
This firmware identification will become important if someone incorporates an
FC-converted GTM900 or Tango modem into a ZeroPhone-style smartphone where some
high-level software like ofono will be talking to the modem and will need to
properly identify this modem as FreeCalypso, as opposed to some other AT command
modem flavor with different quirks.
In technical terms, the compiled-in default for the AT+CGMI query (which will
always be overridden by the /pcm/CGMI file in FFS if one is present) is now
"FreeCalypso" in all configs on all targets; the compiled-in default for the
AT+CGMM query (likewise always overridden by /pcm/CGMM if present) is
"GTM900-FC" if CONFIG_TARGET_GTM900 or "Tango" if CONFIG_TARGET_TANGO or the
original default of "<model>" otherwise.
diff -r baa0a02bc676 -r 57e67ca2e1cb src/cs/drivers/drv_app/ffs/board/pcmdata.c
--- a/src/cs/drivers/drv_app/ffs/board/pcmdata.c Sun Jan 19 01:41:35 2020 +0000
+++ b/src/cs/drivers/drv_app/ffs/board/pcmdata.c Sun Jan 19 20:14:58 2020 +0000
@@ -26,6 +26,7 @@
#include "rv/general.h"
#include "swconfig.cfg"
#include "sys.cfg"
+ #include "fc-target.h"
#endif
#include "ffs/pcm.h"
@@ -487,15 +488,16 @@
/********************************************************************
* Field MANUFACTURER - CGMI
********************************************************************/
-#if (OP_WCP == 1)
- 'T', 'e', 'x', 'a', 's', ' ', 'I', 'n',
- 's', 't', 'r', 'u', 'm', 'e', 'n', 't',
- 's', 0xFF, 0xFF, 0xFF,
+#if 1
+ 'F', 'r', 'e', 'e', 'C', 'a', 'l', 'y',
+ 'p', 's', 'o', 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF,
#else
'<', 'm', 'a', 'n', 'u', 'f', 'a', 'c',
't', 'u', 'r', 'e', 'r', '>', 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF,
#endif
+
/********************************************************************
* Field IDENTIFICATION INFORMATION - INF0
********************************************************************/
@@ -512,8 +514,12 @@
/********************************************************************
* Field MODEL - CGMM
********************************************************************/
-#if (OP_WCP == 1)
- 'O', 'M', 'A', 'P', '7', '1', '0', 0xFF,
+#ifdef CONFIG_TARGET_GTM900
+ 'G', 'T', 'M', '9', '0', '0', '-', 'F',
+ 'C', 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF,
+#elif defined(CONFIG_TARGET_TANGO)
+ 'T', 'a', 'n', 'g', 'o', 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF,
#else
@@ -525,15 +531,10 @@
/********************************************************************
* Field REVISION - CGMR
********************************************************************/
-#if (OP_WCP == 1)
- '1', '4', '0', '.', '5', '4', '2', '.',
- '8', '2', '7', 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF,
-#else
'<', 'r', 'e', 'v', 'i', 's', 'i', 'o',
'n', '>', 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF,
-#endif
+
/********************************************************************
* Field PRODUCT SERIAL NUMBER - CGSN
********************************************************************/