[Feature][ZXW-452]merge P54U02 version
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I17e6795ab66e2b9d1cbbfec4b7c0028d666e177d
diff --git a/ap/app/include/libcpnv.h b/ap/app/include/libcpnv.h
index f2c4c30..4494165 100755
--- a/ap/app/include/libcpnv.h
+++ b/ap/app/include/libcpnv.h
@@ -118,7 +118,7 @@
* @return CPNV_OK 成功，CPNV_ERROR 失败
* @retval
* @note
- * @warning nvrofs里nvroall.bin备份到nvrofs2
+ * @warning nvrofs里nvroall.bin、nvroc0wall.bin备份到nvrofs2
*/
unsigned int cpnv_NvroBackup(void);
@@ -128,8 +128,18 @@
* @return CPNV_OK 成功，CPNV_ERROR 失败
* @retval
* @note
- * @warning nvrofs2里nvroall.bin恢复到nvrofs
+ * @warning nvrofs2里nvroall.bin、nvroc0wall.bin恢复到nvrofs
*/
unsigned int cpnv_NvroRestore(void);
+/**
+ * @brief nvro完整性检查
+ * @param flag: 2 检查nvroall.bin和nvroc0wall.bin; 其他值只检查nvroall.bin
+ * @return CPNV_OK 成功，CPNV_ERROR 失败
+ * @retval
+ * @note
+ * @warning 执行cpnv_NvroBackup后，才会进行真正检查
+ */
+unsigned int cpnv_nvro_check(int flag);
+
#endif // __LIBCPNV_H
diff --git a/ap/app/include/netapi.h b/ap/app/include/netapi.h
index 2db6114..6a8d149 100755
--- a/ap/app/include/netapi.h
+++ b/ap/app/include/netapi.h
@@ -323,6 +323,13 @@
char challenge[CHALLENGE_MAX];
} pppd_auth;
+typedef union
+{
+ u_int8_t e8[8];
+ u_int16_t e16[4];
+ u_int32_t e32[2];
+} netapi_eui64_t;
+
/*******************************************************************************
* Global function declarations *
******************************************************************************/
@@ -451,6 +458,7 @@
*/
void set_ethwan_port_mode(int mode);
+int netapi_ether_to_eui64(const char *dev_name, netapi_eui64_t *p_eui64);
#endif