[Feature][ZXW-88]merge P50 version
Only Configure: No
Affected branch: master
Affected module: unknown
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I34667719d9e0e7e29e8e4368848601cde0a48408
diff --git a/ap/lib/libupi_ab/inc/upi_log.h b/ap/lib/libupi_ab/inc/upi_log.h
index d089723..218ece1 100755
--- a/ap/lib/libupi_ab/inc/upi_log.h
+++ b/ap/lib/libupi_ab/inc/upi_log.h
@@ -2,26 +2,31 @@
#define UPI_LOG_H
-#define FOTA_UPI_AB_LOG_ROOT "/cache/zte_fota_ab/"
+extern FILE* s_FP_LOG;
+extern long cur_log_size;
-#define FOTA_UPI_AB_LOG_PATH "/cache/zte_fota_ab/upi_ab.log"
+//#define FOTA_UPI_AB_LOG_ROOT "/cache/zte_fota_ab/"
+
+//#define FOTA_UPI_AB_LOG_PATH "/cache/zte_fota_ab/upi_ab.log"
+
+#define FOTA_LOG_PATH "fota_ab_log_path"
#ifdef _IS_MIN
-#define upi_print(ModID,...) do { \
+#define upi_print(...) do { \
printf(__VA_ARGS__); \
} while(0)
#else
-#define upi_print(ModID,...) do { \
+#define upi_print(...) do { \
printf(__VA_ARGS__); \
char buffer_log[512] = {0}; \
snprintf(buffer_log, 510, __VA_ARGS__); \
- upi_fwrite(ModID,buffer_log); \
+ upi_fwrite(buffer_log); \
} while(0)
@@ -30,9 +35,9 @@
#define upi_log(fmt, args...) \
- do {upi_print(FOTA_UPI_AB_LOG_PATH, "[%s][fota_upi] [%s-%d]: " fmt"\n", upi_get_time_us(),__FUNCTION__, __LINE__, ## args);} while (0)
+ do {upi_print("[%s][fota_upi] [%s-%d]: " fmt"\n", upi_get_time_us(),__FUNCTION__, __LINE__, ## args);} while (0)
#define upi_err(fmt, args...) \
- do {upi_print(FOTA_UPI_AB_LOG_PATH, "[%s][fota_upi] [%s-%d]: " fmt"\n", upi_get_time_us(),__FUNCTION__, __LINE__, ## args);} while (0)
+ do {upi_print("[%s][fota_upi] [%s-%d]: " fmt"\n", upi_get_time_us(),__FUNCTION__, __LINE__, ## args);} while (0)
#if 0
#define lib_log(fmt, args...) \
do {upi_print(FOTA_UPI_AB_LOG_PATH, "" fmt"\n", ## args);} while (0)
@@ -43,8 +48,7 @@
#define LOG_FUNC_END upi_log("%s func end!", __func__);
-
-void upi_fwrite(char *filename, char* info);
+void upi_fwrite(char* info);
void upi_close_logfile(void);
char * upi_get_time_us(void);