[Feature][T108] [task-view-1792] modify LOG
Only Configure: No
Affected branch: GSW_V1453
Affected module: wifi,uart,gnss
Self-test: yes
Doc Update: no
Change-Id: I51ac94eed6b94db91ea7cfa22c65c70ff1ef890b
diff --git a/mbtk/libgsw_lib/gsw_gnss_interface.c b/mbtk/libgsw_lib/gsw_gnss_interface.c
index 86b12eb..a1c65a2 100755
--- a/mbtk/libgsw_lib/gsw_gnss_interface.c
+++ b/mbtk/libgsw_lib/gsw_gnss_interface.c
@@ -21,103 +21,15 @@
#define MBTK_GNSS_IND_NMEA (1 << 1) // 2
#define QSER_GNSS_TIMEOUT 5
-#ifndef LOG_ERR_LEVEL
-#define LOG_ERR_LEVEL 3 /* error conditions */
-#endif
-#ifndef LOG_WARN_LEVEL
-#define LOG_WARN_LEVEL 4 /* warning conditions */
-#endif
-#ifndef LOG_INFO_LEVEL
-#define LOG_INFO_LEVEL 6 /* informational */
-#endif
-#ifndef LOG_DEBUG_LEVEL
-#define LOG_DEBUG_LEVEL 7 /* debug-level messages */
-#endif
-#ifndef LOG_VERBOSE_LEVEL
-#define LOG_VERBOSE_LEVEL 8
-#endif
-
+#include "gsw_log_interface.h"
#define GSW_GNSS "[HAL][GSW_GNSS]"
-
-#define LOGV(fmt, args ...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- fun_ptr_log(LOG_VERBOSE_LEVEL, "%s#%s: "GSW_GNSS"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-#define LOGI(fmt, args...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- fun_ptr_log(LOG_INFO_LEVEL, "%s#%s: "GSW_GNSS"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-#define LOGD(fmt, args...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- fun_ptr_log(LOG_DEBUG_LEVEL, "%s#%s: "GSW_GNSS"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-#define LOGW(fmt, args...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- fun_ptr_log(LOG_WARN_LEVEL, "%s#%s: "GSW_GNSS"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-#define LOGE(fmt, args...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- fun_ptr_log(LOG_ERR_LEVEL, "%s#%s: "GSW_GNSS"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
#define MOPEN_GNSS_NMEA_MAX_LENGTH 255 /** NMEA string maximum length. */
static gsw_gnss_cb *gsw_cb = NULL;
static bool inited = false;
static bool strated = false;
typedef void (*mbtk_gnss_callback_func)(uint32_t ind_type, const void* data, uint32_t data_len);
-typedef void (*mbtk_log)(int level, const char *format,...);
-static mbtk_log fun_ptr_log = NULL;
int (*mbtk_gnss_init)(mbtk_gnss_callback_func cb);
int (*mbtk_gnss_deinit)();
@@ -278,7 +190,7 @@
ret = write(fd, tx, sizeof(tx));
if(ret < 0)
{
- LOGE("[GSW_gnss] send_and_wait write fail.ret = [%d]", ret);
+ LOGE(GSW_GNSS,"[GSW_gnss] send_and_wait write fail.ret = [%d]", ret);
}
pthread_join(tid, NULL);
return ctx.got_hd8;
@@ -299,7 +211,7 @@
ret = system("/usr/sbin/gnss_gpio.sh VTG > /dev/null 2>&1");
if(ret != 0)
{
- LOGE("[GSW_gnss] mbtk_gnss_set_VTG on fail.ret = [%d]", ret);
+ LOGE(GSW_GNSS,"[GSW_gnss] mbtk_gnss_set_VTG on fail.ret = [%d]", ret);
return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -327,7 +239,7 @@
ret = system(cmd);
if(ret != 0)
{
- LOGE("[GSW_gnss] gnss_gpio.sh GSW_HD8040D mode fail.ret = [%d]", ret);
+ LOGE(GSW_GNSS,"[GSW_gnss] gnss_gpio.sh GSW_HD8040D mode fail.ret = [%d]", ret);
return GSW_HAL_NORMAL_FAIL;
}
return ret;
@@ -352,7 +264,7 @@
if(gsw_device == NO_DEVICE)
{
ret = get_gnss_device_version();
- LOGD("[GSW_gnss] get_gnss_device_version ret = [%d]", ret);
+ LOGD(GSW_GNSS,"[GSW_gnss] get_gnss_device_version ret = [%d]", ret);
}
if(gsw_device == HD8040D)
{
@@ -365,7 +277,7 @@
ret = mbtk_gnss_setting(param_buf, QSER_GNSS_TIMEOUT);
if(ret != 0)
{
- LOGE("[qser_gnss] mbtk_gnss_setting fail.ret = [%d]", ret);
+ LOGE(GSW_GNSS,"[qser_gnss] mbtk_gnss_setting fail.ret = [%d]", ret);
return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -420,7 +332,7 @@
ret = system(cmd);
if(ret != 0)
{
- LOGE("[GSW_gnss] gnss_gpio.sh GSW_HD8040D mode fail.ret = [%d]", ret);
+ LOGE(GSW_GNSS,"[GSW_gnss] gnss_gpio.sh GSW_HD8040D mode fail.ret = [%d]", ret);
return GSW_HAL_NORMAL_FAIL;
}
return ret;
@@ -445,7 +357,7 @@
if(gsw_device == NO_DEVICE)
{
ret = get_gnss_device_version();
- LOGD("[GSW_gnss] get_gnss_device_version ret = [%d]", ret);
+ LOGD(GSW_GNSS,"[GSW_gnss] get_gnss_device_version ret = [%d]", ret);
}
if(gsw_device == HD8040D)
{
@@ -456,14 +368,14 @@
snprintf(param_buf, 32, "$SYSCFG,%d", map_gnss_mode(start_mode));
if(map_gnss_mode(start_mode) == -1)
{
- LOGE("[qser_gnss] mbtk_gnss_start_mode con't support");
+ LOGE(GSW_GNSS,"[qser_gnss] mbtk_gnss_start_mode con't support");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_gnss_setting=(int(*)(const char *setting_cmd, int))dlsym(dlHandle_gnss, "mbtk_gnss_setting");
ret = mbtk_gnss_setting(param_buf, QSER_GNSS_TIMEOUT);
if(ret != 0)
{
- LOGE("[qser_gnss] mbtk_gnss_setting fail.ret = [%d]", ret);
+ LOGE(GSW_GNSS,"[qser_gnss] mbtk_gnss_setting fail.ret = [%d]", ret);
return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -492,14 +404,14 @@
ret = mbtk_gnss_eph_download(QSER_GNSS_TIMEOUT);
if(ret != 0)
{
- LOGE("[qser_gnss] mbtk_gnss_eph_download fail.ret = [%d]", ret);
+ LOGE(GSW_GNSS,"[qser_gnss] mbtk_gnss_eph_download fail.ret = [%d]", ret);
return GSW_HAL_NORMAL_FAIL;
}
mbtk_gnss_eph_inject=(int(*)(int))dlsym(dlHandle_gnss, "mbtk_gnss_eph_inject");
ret = mbtk_gnss_eph_inject(QSER_GNSS_TIMEOUT);
if(ret != 0)
{
- LOGE("[qser_gnss] mbtk_gnss_eph_inject fail.ret = [%d]", ret);
+ LOGE(GSW_GNSS,"[qser_gnss] mbtk_gnss_eph_inject fail.ret = [%d]", ret);
return GSW_HAL_NORMAL_FAIL;
}
}
@@ -510,20 +422,20 @@
{
if(data == NULL || data_len <= 0)
{
- LOGE("[GSW_gnss] data is NULL.");
+ LOGE(GSW_GNSS,"[GSW_gnss] data is NULL.");
return;
}
if(gsw_cb == NULL)
{
- //LOGE("[qser_gnss] qser_gnss_callback is NULL.");
+ //LOGE(GSW_GNSS,"[qser_gnss] qser_gnss_callback is NULL.");
return;
}
if(ind_type == MBTK_GNSS_IND_LOCATION && gsw_cb->gsw_location_cb != NULL) {
if(data_len != sizeof(mbtk_gnss_location_info_t))
{
- LOGE("[GSW_gnss] data size error");
+ LOGE(GSW_GNSS,"[GSW_gnss] data size error");
return;
}
GSW_GNSS_LOCATION_EXT_T gsw_location;
@@ -546,7 +458,7 @@
//qser_nmea.timestamp = qser_get_gnss_time_sec(data, data_len);
gsw_cb->gsw_nmea_cb(data,data_len);
} else {
- LOGD("Unknown IND : %d\n", ind_type);
+ LOGD(GSW_GNSS,"Unknown IND : %d\n", ind_type);
}
}
@@ -558,14 +470,12 @@
ret = system("serial_atcmd AT*IMLCONFIG=13");
if(ret != 0)
{
- LOGE("serial_atcmd fail\n");
+ LOGE(GSW_GNSS,"serial_atcmd fail\n");
return GSW_HAL_NORMAL_FAIL;
}
if(dlHandle_gnss == NULL)
- dlHandle_gnss = dlopen(lynqLib_gnss, RTLD_NOW);
- if(fun_ptr_log == NULL)
- fun_ptr_log = (mbtk_log)dlsym(dlHandle_gnss, "mbtk_log");
- if(fun_ptr_log == NULL || dlHandle_gnss == NULL)
+ dlHandle_gnss = dlopen(lynqLib_gnss, RTLD_NOW);;
+ if(dlHandle_gnss == NULL)
{
return GSW_HAL_NORMAL_FAIL;
}
@@ -581,13 +491,13 @@
}
else
{
- LOGE("[GSW_gnss] init mbtk_gnss_ind_set() fail.ret = [%d]", ret);
+ LOGE(GSW_GNSS,"[GSW_gnss] init mbtk_gnss_ind_set() fail.ret = [%d]", ret);
return GSW_HAL_NORMAL_FAIL;
}
}
else
{
- LOGE("[GSW_gnss] mbtk_gnss_init() fail.ret = [%d]", ret);
+ LOGE(GSW_GNSS,"[GSW_gnss] mbtk_gnss_init() fail.ret = [%d]", ret);
return GSW_HAL_NORMAL_FAIL;
}
}
@@ -607,7 +517,7 @@
return GSW_HAL_NORMAL_FAIL;
if(callback.gsw_location_cb == NULL && callback.gsw_nmea_cb == NULL)
{
- LOGE("[GSW_gnss] handler_ptr is NULL.");
+ LOGE(GSW_GNSS,"[GSW_gnss] handler_ptr is NULL.");
return GSW_HAL_NORMAL_FAIL;
}
if (gsw_cb == NULL)
@@ -615,7 +525,7 @@
gsw_cb = (gsw_gnss_cb *)malloc(sizeof(gsw_gnss_cb));
if (gsw_cb == NULL)
{
- LOGE("[GSW_gnss] Memory allocation failed.");
+ LOGE(GSW_GNSS,"[GSW_gnss] Memory allocation failed.");
return GSW_HAL_NORMAL_FAIL;
}
}
@@ -637,13 +547,13 @@
ret = system("/usr/sbin/gnss_gpio.sh on > /dev/null 2>&1");
if(ret != 0)
{
- LOGE("[GSW_gnss] gnss_gpio.sh on fail.ret = [%d]", ret);
+ LOGE(GSW_GNSS,"[GSW_gnss] gnss_gpio.sh on fail.ret = [%d]", ret);
return GSW_HAL_NORMAL_FAIL;
}
// 记录mbtk_gnss_open前的时间戳
struct timespec start_time;
if (clock_gettime(CLOCK_MONOTONIC, &start_time) != 0) {
- LOGE("[GSW_gnss] Failed to get start time");
+ LOGE(GSW_GNSS,"[GSW_gnss] Failed to get start time");
return GSW_HAL_NORMAL_FAIL;
}
@@ -651,7 +561,7 @@
ret = mbtk_gnss_open(255, QSER_GNSS_TIMEOUT);
if(ret != 0)
{
- LOGE("[GSW_gnss] mbtk_gnss_open is error.ret = [%d]", ret);
+ LOGE(GSW_GNSS,"[GSW_gnss] mbtk_gnss_open is error.ret = [%d]", ret);
return GSW_HAL_NORMAL_FAIL;
}
@@ -668,7 +578,7 @@
// 记录mbtk_gnss_set_VTG前的时间戳并计算等待时间
struct timespec end_time;
if (clock_gettime(CLOCK_MONOTONIC, &end_time) != 0) {
- LOGE("[GSW_gnss] Failed to get end time");
+ LOGE(GSW_GNSS,"[GSW_gnss] Failed to get end time");
return GSW_HAL_NORMAL_FAIL;
}
long start_ms = start_time.tv_sec * 1000 + start_time.tv_nsec / 1000000;
@@ -700,13 +610,13 @@
ret = mbtk_gnss_close(QSER_GNSS_TIMEOUT);
if(ret != 0)
{
- LOGE("[GSW_gnss] mbtk_gnss_close is error.ret = [%d]", ret);
+ LOGE(GSW_GNSS,"[GSW_gnss] mbtk_gnss_close is error.ret = [%d]", ret);
return GSW_HAL_NORMAL_FAIL;
}
ret = system("/usr/sbin/gnss_gpio.sh off > /dev/null 2>&1");
if(ret != 0)
{
- LOGE("[GSW_gnss] gnss_gpio.sh off fail.ret = [%d]", ret);
+ LOGE(GSW_GNSS,"[GSW_gnss] gnss_gpio.sh off fail.ret = [%d]", ret);
return GSW_HAL_NORMAL_FAIL;
}
strated = false;
@@ -729,7 +639,7 @@
ret = system("serial_atcmd AT*IMLCONFIG=12");
if(ret != 0)
{
- LOGE("serial_atcmd fail\n");
+ LOGE(GSW_GNSS,"serial_atcmd fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_gnss_deinit=(int(*)())dlsym(dlHandle_gnss, "mbtk_gnss_deinit");
@@ -740,7 +650,7 @@
}
else
{
- LOGE("[GSW_gnss] mbtk_gnss_deinit() fail.ret = [%d]", ret);
+ LOGE(GSW_GNSS,"[GSW_gnss] mbtk_gnss_deinit() fail.ret = [%d]", ret);
/*
dlclose(dlHandle_gnss);
dlHandle_gnss = NULL;
@@ -792,7 +702,7 @@
ret = mbtk_gnss_setting(param_buf, QSER_GNSS_TIMEOUT);
if(ret != 0)
{
- LOGE("[qser_gnss] mbtk_gnss_setting fail.ret = [%d]", ret);
+ LOGE(GSW_GNSS,"[qser_gnss] mbtk_gnss_setting fail.ret = [%d]", ret);
return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -812,7 +722,7 @@
int gsw_gnss_get_tail_nmea_type(char *tail_type, int len)
{
if(NULL == tail_type){
- LOGE("get_tail_nmea_type fail, tail_type is NULL");
+ LOGE(GSW_GNSS,"get_tail_nmea_type fail, tail_type is NULL");
return GSW_HAL_ERROR_GNSS_FAIL;
}
@@ -820,7 +730,7 @@
strcpy(tail_type, "RMC");
return GSW_HAL_GNSS_SUCCESS;
}else{
- LOGE("get_tail_nmea_type fail, len[%d] is too short", len);
+ LOGE(GSW_GNSS,"get_tail_nmea_type fail, len[%d] is too short", len);
return GSW_HAL_ERROR_GNSS_FAIL;
}
}