[Feature][ZXW-33]merge ZXW 0428 version
Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/ap/app/include/at_pdp_api.h b/ap/app/include/at_pdp_api.h
index 1b8b2da..af83bfb 100755
--- a/ap/app/include/at_pdp_api.h
+++ b/ap/app/include/at_pdp_api.h
@@ -65,6 +65,7 @@
int volte_param3;
int ppp_cid;//½öÓÃÓÚppp²¦ºÅʱºòÖ¸¶¨cidʹÓã¬ÆäËûʱºò¾ùΪ0
char default_flag;
+ char is_ext;
};
/**
diff --git a/ap/app/include/atreg_msg.h b/ap/app/include/atreg_msg.h
new file mode 100755
index 0000000..a1a5077
--- /dev/null
+++ b/ap/app/include/atreg_msg.h
@@ -0,0 +1,74 @@
+/**
+ * @file atreg_msg.h
+ * @brief ÌṩlibatregÏà¹ØÏûÏ¢¡¢½á¹¹Ìå
+ *
+ * Copyright (C) 2022 Sanechips Technology Co., Ltd.
+ * @author
+ * @ingroup
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+
+#ifndef _ATREG_MSG_H
+#define _ATREG_MSG_H
+
+
+/*******************************************************************************
+ * Include header files *
+ *******************************************************************************/
+#include "message.h"
+
+
+/*******************************************************************************
+ * Macro definitions *
+ *******************************************************************************/
+
+
+/*******************************************************************************
+ * Type definitions *
+ *******************************************************************************/
+/** ÏûÏ¢id */
+enum MSG_CDM_RANGE_T
+{
+ MSG_CMD_AT_REG_BASE = MSG_CMD_EXTAT_BASE,
+
+ /* at×¢²áÏûÏ¢id¶¨Òå */
+ MSG_CMD_AT_REG_REQ,
+ MSG_CMD_AT_REG_RSP,
+
+ /* at×¢ÏúÏûÏ¢id¶¨Òå */
+ MSG_CMD_AT_UNREG_REQ,
+ MSG_CMD_AT_UNREG_RSP,
+};
+
+
+/** AT×¢²áÖÁat_ctl */
+struct atreg_msg_t {
+ char at_cmd_prefix[AT_CMD_PREFIX];
+
+ int req_msg_id;
+ int rsp_msg_id;
+
+ /* ATÀàÐÍ: 0-ser, 1-info */
+ int type;
+
+ int res;
+};
+
+
+/*******************************************************************************
+ * Global variable declarations *
+ *******************************************************************************/
+
+
+/*******************************************************************************
+ * Global function declarations *
+ *******************************************************************************/
+
+
+#endif
+
diff --git a/ap/app/include/mainctl_msg.h b/ap/app/include/mainctl_msg.h
index 8c66cc5..5867013 100755
--- a/ap/app/include/mainctl_msg.h
+++ b/ap/app/include/mainctl_msg.h
@@ -88,6 +88,12 @@
MSG_CMD_NET_DHCP_SETTING_REQ, /*ÍøÂçDHCP»ù´¡²ÎÊýÅäÖÃÇëÇó*/
MSG_CMD_NET_DHCP_SETTING_RSP, /*ÍøÂçDHCP»ù´¡²ÎÊýÅäÖûظ´*/
+#if (MODEM_TYPE == vehicle_dc)
+ MSG_CMD_NET_FIREWALL_ADD_REQ, /*ÅäÖ÷À»ðǽ£ºÖ¸¶¨IP²»ÔÊÐí·ÃÎÊÉ豸*/
+ MSG_CMD_NET_FIREWALL_DEL_REQ, /*ɾ³ý·À»ðǽ£ºÖ¸¶¨IP²»ÔÊÐí·ÃÎÊÉ豸*/
+ MSG_CMD_NET_FIREWALL_CLEANUP_REQ, /*Çå³þËùÓÐÒÑ·À»ðǽ£ºÖ¸¶¨IP²»ÔÊÐí·ÃÎÊÉ豸*/
+#endif
+
/* --------------------- ÒÔÏÂÊÇÄÚ²¿Ê¹ÓÃÏûÏ¢ ---------------- */
MSG_CMD_NET_WAN4_CHANGE, /*ipv4ÍâÍø¿Ú·¢Éú±ä»¯, ²ÎÊý:ÎÞ */
MSG_CMD_NET_WAN6_CHANGE, /*ipv6ÍâÍø¿Ú·¢Éú±ä»¯, ²ÎÊý:ÎÞ */
diff --git a/ap/app/include/rtc_timer.h b/ap/app/include/rtc_timer.h
index 3dbecf6..8069d93 100755
--- a/ap/app/include/rtc_timer.h
+++ b/ap/app/include/rtc_timer.h
@@ -34,7 +34,7 @@
* @note
*/
enum RTC_CPU {
- RTC_CPU_CP = 0, //rtcÓÉcp·¢Æð
+ RTC_CPU_CAP = 0, //rtcÓÉCAP·¢Æð
RTC_CPU_AP, //rtcÓÉAP·¢Æð
};