hci_dump: prefix LOG_LEVELs with HCI_DUMP_

This commit is contained in:
Matthias Ringwald 2018-05-09 14:56:47 +02:00
parent 0c1b8529e8
commit fa087dea27
4 changed files with 12 additions and 12 deletions

View File

@ -80,19 +80,19 @@ static inline void __log_unused(const char *format, ...) {
#endif
#ifdef ENABLE_LOG_DEBUG
#define log_debug(format, ...) HCI_DUMP_LOG(LOG_LEVEL_DEBUG, format, ## __VA_ARGS__)
#define log_debug(format, ...) HCI_DUMP_LOG(HCI_DUMP_LOG_LEVEL_DEBUG, format, ## __VA_ARGS__)
#else
#define log_debug(...) __log_unused(__VA_ARGS__)
#endif
#ifdef ENABLE_LOG_INFO
#define log_info(format, ...) HCI_DUMP_LOG(LOG_LEVEL_INFO, format, ## __VA_ARGS__)
#define log_info(format, ...) HCI_DUMP_LOG(HCI_DUMP_LOG_LEVEL_INFO, format, ## __VA_ARGS__)
#else
#define log_info(...) __log_unused(__VA_ARGS__)
#endif
#ifdef ENABLE_LOG_ERROR
#define log_error(format, ...) HCI_DUMP_LOG(LOG_LEVEL_ERROR, format, ## __VA_ARGS__)
#define log_error(format, ...) HCI_DUMP_LOG(HCI_DUMP_LOG_LEVEL_ERROR, format, ## __VA_ARGS__)
#else
#define log_error(...) __log_unused(__VA_ARGS__)
#endif

View File

@ -229,7 +229,7 @@ static void log_hexdump(int level, const void * data, int size){
void log_debug_hexdump(const void *data, int size){
#ifdef ENABLE_LOG_DEBUG
log_hexdump(LOG_LEVEL_DEBUG, data, size);
log_hexdump(HCI_DUMP_LOG_LEVEL_DEBUG, data, size);
#else
UNUSED(data); // ok: no code
UNUSED(size); // ok: no code
@ -238,7 +238,7 @@ void log_debug_hexdump(const void *data, int size){
void log_info_hexdump(const void *data, int size){
#ifdef ENABLE_LOG_INFO
log_hexdump(LOG_LEVEL_INFO, data, size);
log_hexdump(HCI_DUMP_LOG_LEVEL_INFO, data, size);
#else
UNUSED(data); // ok: no code
UNUSED(size); // ok: no code

View File

@ -278,8 +278,8 @@ void hci_dump_packet(uint8_t packet_type, uint8_t in, uint8_t *packet, uint16_t
}
static int hci_dump_log_level_active(int log_level){
if (log_level < 0) return 0;
if (log_level > LOG_LEVEL_ERROR) return 0;
if (log_level < HCI_DUMP_LOG_LEVEL_DEBUG) return 0;
if (log_level > HCI_DUMP_LOG_LEVEL_ERROR) return 0;
return log_level_enabled[log_level];
}
@ -327,8 +327,8 @@ void hci_dump_close(void){
}
void hci_dump_enable_log_level(int log_level, int enable){
if (log_level < 0) return;
if (log_level > LOG_LEVEL_ERROR) return;
if (log_level < HCI_DUMP_LOG_LEVEL_DEBUG) return;
if (log_level > HCI_DUMP_LOG_LEVEL_ERROR) return;
log_level_enabled[log_level] = enable;
}

View File

@ -57,9 +57,9 @@
extern "C" {
#endif
#define LOG_LEVEL_DEBUG 0
#define LOG_LEVEL_INFO 1
#define LOG_LEVEL_ERROR 2
#define HCI_DUMP_LOG_LEVEL_DEBUG 0
#define HCI_DUMP_LOG_LEVEL_INFO 1
#define HCI_DUMP_LOG_LEVEL_ERROR 2
/* API_START */