update atcmd_server from v1265
Change-Id: Ic2ce53afc20d0c72cd7b29e8cb7cc9ebc502c37a
diff --git a/marvell/lte-telephony/apps/atcmd_server_ss/src/telcontroller.c b/marvell/lte-telephony/apps/atcmd_server_ss/src/telcontroller.c
old mode 100644
new mode 100755
index 33b828b..d2e7bde
--- a/marvell/lte-telephony/apps/atcmd_server_ss/src/telcontroller.c
+++ b/marvell/lte-telephony/apps/atcmd_server_ss/src/telcontroller.c
@@ -2093,6 +2093,40 @@
utlDEFINE_STRING_AT_PARAMETER(utlAT_PARAMETER_ACCESS_READ_WRITE, utlAT_PARAMETER_PRESENCE_REQUIRED),
};
+
+#else
+//mbtk for gps add
+static utlAtParameter_T mbtk_gpsInit_params[] = {
+ utlDEFINE_DECIMAL_AT_PARAMETER(utlAT_PARAMETER_ACCESS_READ_WRITE, utlAT_PARAMETER_PRESENCE_REQUIRED),
+};
+
+static utlAtParameter_T mbtk_gpsSleep_params[] = {
+ utlDEFINE_DECIMAL_AT_PARAMETER(utlAT_PARAMETER_ACCESS_READ_WRITE, utlAT_PARAMETER_PRESENCE_REQUIRED),
+};
+
+static utlAtParameter_T mbtk_agnssGet_params[] = {
+ utlDEFINE_DECIMAL_AT_PARAMETER(utlAT_PARAMETER_ACCESS_READ_WRITE, utlAT_PARAMETER_PRESENCE_REQUIRED),
+ utlDEFINE_DECIMAL_AT_PARAMETER(utlAT_PARAMETER_ACCESS_READ_WRITE, utlAT_PARAMETER_PRESENCE_OPTIONAL),
+};
+
+static utlAtParameter_T mbtk_agnssCfg_params[] = {
+ utlDEFINE_STRING_AT_PARAMETER(utlAT_PARAMETER_ACCESS_READ_WRITE, utlAT_PARAMETER_PRESENCE_REQUIRED), //server
+ utlDEFINE_DECIMAL_AT_PARAMETER(utlAT_PARAMETER_ACCESS_READ_WRITE, utlAT_PARAMETER_PRESENCE_REQUIRED), //port
+ utlDEFINE_STRING_AT_PARAMETER(utlAT_PARAMETER_ACCESS_READ_WRITE, utlAT_PARAMETER_PRESENCE_OPTIONAL), //username
+ utlDEFINE_STRING_AT_PARAMETER(utlAT_PARAMETER_ACCESS_READ_WRITE, utlAT_PARAMETER_PRESENCE_OPTIONAL), //password
+ utlDEFINE_DECIMAL_AT_PARAMETER(utlAT_PARAMETER_ACCESS_READ_WRITE, utlAT_PARAMETER_PRESENCE_REQUIRED), //day
+ utlDEFINE_DECIMAL_AT_PARAMETER(utlAT_PARAMETER_ACCESS_READ_WRITE, utlAT_PARAMETER_PRESENCE_REQUIRED), //force
+};
+
+static utlAtParameter_T mbtk_gpsSet_params[] = {
+ utlDEFINE_STRING_AT_PARAMETER(utlAT_PARAMETER_ACCESS_READ_WRITE, utlAT_PARAMETER_PRESENCE_REQUIRED),
+};
+
+static utlAtParameter_T mbtk_gpsFwdl_params[] = {
+ utlDEFINE_STRING_AT_PARAMETER(utlAT_PARAMETER_ACCESS_READ_WRITE, utlAT_PARAMETER_PRESENCE_REQUIRED),
+};
+//mbtk for gnss add
+
#endif
static utlAtParameter_T plusCMTLRA_params[] = {
@@ -3365,6 +3399,18 @@
utlDEFINE_EXACTION_AT_COMMAND("+AGNSSSET", NULL, NULL, ciAGnssSet),
utlDEFINE_EXACTION_AT_COMMAND("+GPSST", NULL, NULL, ciGPSState),
utlDEFINE_EXTENDED_AT_COMMAND("+GPSSETTING", gpsSet_params, "+GPSSETTING: <string>", ciGPSSetting, ciGPSSetting),
+#else
+//mbtk for gps add
+ //0-close 1-uart1 2-USB_NAME 3-USB_AT 4-tty_gnss_name
+ utlDEFINE_EXTENDED_AT_COMMAND("+GPSINIT", mbtk_gpsInit_params, "+GPSINIT: (0-15)", mbtk_GPSInit, mbtk_GPSInit),
+ utlDEFINE_EXACTION_AT_COMMAND("+GPSDEINIT", NULL, NULL, mbtk_GPSDeInit),
+ utlDEFINE_EXTENDED_AT_COMMAND("+GPSSLEEP", mbtk_gpsSleep_params, "+GPSSLEEP: (0,1)", mbtk_GPSSleep, mbtk_GPSSleep),
+ utlDEFINE_EXTENDED_AT_COMMAND("+AGNSSGET", mbtk_agnssGet_params, "+AGNSSGET: <supl_server_addr>, <alam_flag>", mbtk_AGnssGet, mbtk_AGnssGet),
+ utlDEFINE_EXTENDED_AT_COMMAND("+AGNSSCFG", mbtk_agnssCfg_params, "+AGNSSCFG: <server>,<port>,<user>,<pass>,<day>,<force>", mbtk_AGnssCfg, mbtk_AGnssCfg),
+ utlDEFINE_EXACTION_AT_COMMAND("+AGNSSSET", NULL, NULL, mbtk_AGnssSet),
+ utlDEFINE_EXACTION_AT_COMMAND("+GPSST", NULL, NULL, mbtk_GPSState),
+ utlDEFINE_EXTENDED_AT_COMMAND("+GPSSETTING", mbtk_gpsSet_params, "+GPSSETTING: <string>", mbtk_GPSSetting, mbtk_GPSSetting),
+ utlDEFINE_EXTENDED_MBTK_AT_COMMAND("+GPSFWDL", mbtk_gpsFwdl_params, "+GPSFWDL: <string>", mbtk_GPSFwdl, mbtk_GPSFwdl),
#endif
utlDEFINE_EXTENDED_AT_COMMAND("*FACTORY", NULL, "*FACTORY", ciFactoryReset, ciFactoryReset),
@@ -3528,6 +3574,9 @@
{"+CCFC", {155, utlAT_AWAIT_ASYNC_TIMEOUT_TIME, utlAT_AWAIT_ASYNC_TIMEOUT_TIME}},
{"+CCWA", {155, utlAT_AWAIT_ASYNC_TIMEOUT_TIME, utlAT_AWAIT_ASYNC_TIMEOUT_TIME}},
{"+CGLA", {150, utlAT_AWAIT_ASYNC_TIMEOUT_TIME, utlAT_AWAIT_ASYNC_TIMEOUT_TIME}},
+ // Add by mbtk
+ {"+GPSINIT",{120, utlAT_AWAIT_ASYNC_TIMEOUT_TIME, utlAT_AWAIT_ASYNC_TIMEOUT_TIME}},
+ {"+GPSFWDL",{120, utlAT_AWAIT_ASYNC_TIMEOUT_TIME, utlAT_AWAIT_ASYNC_TIMEOUT_TIME}},
{"+CSIM", {150, utlAT_AWAIT_ASYNC_TIMEOUT_TIME, utlAT_AWAIT_ASYNC_TIMEOUT_TIME}},
{"+CFUN", {120, utlAT_AWAIT_ASYNC_TIMEOUT_TIME, utlAT_AWAIT_ASYNC_TIMEOUT_TIME}},
{"+CGDATA", {155, utlAT_AWAIT_ASYNC_TIMEOUT_TIME, utlAT_AWAIT_ASYNC_TIMEOUT_TIME}},
@@ -4575,6 +4624,13 @@
#ifdef MBTK_AT_SUPPORT
DEFINE_MASTER_SIM_CHANEL_DESC(TEL_SOCKET_AT_CMD_ATP_BEGIN, "atcmdmbtk", FALSE),
#endif
+
+// Add by liubin
+ DEFINE_SIM1_CHANEL_DESC(TEL_SOCKET_AT_CMD_ATP_BEGIN, "atcmd_urc", FALSE),
+ DEFINE_SIM1_NO_INDICATION_CHANEL_DESC(TEL_SOCKET_AT_CMD_ATP_BEGIN, "atcmd_at", FALSE),
+ DEFINE_SIM1_NO_INDICATION_CHANEL_DESC(TEL_SOCKET_AT_CMD_ATP_BEGIN, "atcmd_at_1", FALSE),
+ DEFINE_SIM1_NO_INDICATION_CHANEL_DESC(TEL_SOCKET_AT_CMD_ATP_BEGIN, "atcmd_at_2", FALSE),
+// End by liubin
};
unsigned int i;