diff --git a/CHANGELOG.md b/CHANGELOG.md index f2feaa0bf..01de66ea2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. --- ## Unreleased + ### Added + ### Fixed + ### Changed +- HCI Dump: provide log level to log_message implementation ## Release v1.5.3 diff --git a/platform/embedded/hci_dump_embedded_stdout.c b/platform/embedded/hci_dump_embedded_stdout.c index 65b81459f..08a712134 100644 --- a/platform/embedded/hci_dump_embedded_stdout.c +++ b/platform/embedded/hci_dump_embedded_stdout.c @@ -110,7 +110,8 @@ static void hci_dump_embedded_stdout_log_packet(uint8_t packet_type, uint8_t in, hci_dump_embedded_stdout_packet(packet_type, in, packet, len); } -static void hci_dump_embedded_stdout_log_message(const char * format, va_list argptr){ +static void hci_dump_embedded_stdout_log_message(int log_level, const char * format, va_list argptr){ + UNUSED(log_level); int len = vsnprintf(log_message_buffer, sizeof(log_message_buffer), format, argptr); hci_dump_embedded_stdout_log_packet(LOG_MESSAGE_PACKET, 0, (uint8_t*) log_message_buffer, len); } diff --git a/platform/embedded/hci_dump_segger_rtt_binary.c b/platform/embedded/hci_dump_segger_rtt_binary.c index c656b3f09..de828eeb9 100644 --- a/platform/embedded/hci_dump_segger_rtt_binary.c +++ b/platform/embedded/hci_dump_segger_rtt_binary.c @@ -121,7 +121,8 @@ static void hci_dump_segger_rtt_binary_log_packet(uint8_t packet_type, uint8_t i SEGGER_RTT_Write(SEGGER_RTT_PACKETLOG_CHANNEL, packet, len); } -static void hci_dump_segger_rtt_binary_log_message(const char * format, va_list argptr){ +static void hci_dump_segger_rtt_binary_log_message(int log_level, const char * format, va_list argptr){ + UNUSED(log_level); if (dump_format == HCI_DUMP_INVALID) return; int len = vsnprintf(log_message_buffer, sizeof(log_message_buffer), format, argptr); hci_dump_segger_rtt_binary_log_packet(LOG_MESSAGE_PACKET, 0, (uint8_t*) log_message_buffer, len); diff --git a/platform/embedded/hci_dump_segger_rtt_stdout.c b/platform/embedded/hci_dump_segger_rtt_stdout.c index b5d6eec5e..7dc009fc1 100644 --- a/platform/embedded/hci_dump_segger_rtt_stdout.c +++ b/platform/embedded/hci_dump_segger_rtt_stdout.c @@ -165,7 +165,8 @@ static void hci_dump_segger_rtt_stdout_log_packet(uint8_t packet_type, uint8_t i hci_dump_segger_rtt_stdout_packet(packet_type, in, packet, len); } -static void hci_dump_segger_rtt_stdout_log_message(const char * format, va_list argptr){ +static void hci_dump_segger_rtt_stdout_log_message(int log_level, const char * format, va_list argptr){ + UNUSED(log_level); #if SEGGER_RTT_MODE_DEFAULT != SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL // to avoid using snprintf for this, we cheat and assume that the messages is less then HCI_DUMP_MAX_MESSAGE_LEN bool ready = hci_dump_segger_prepare_message(HCI_DUMP_MAX_MESSAGE_LEN); diff --git a/platform/posix/hci_dump_posix_fs.c b/platform/posix/hci_dump_posix_fs.c index 2c038643a..891bb365c 100644 --- a/platform/posix/hci_dump_posix_fs.c +++ b/platform/posix/hci_dump_posix_fs.c @@ -160,7 +160,8 @@ static void hci_dump_posix_fs_log_packet(uint8_t packet_type, uint8_t in, uint8_ UNUSED(bytes_written); } -static void hci_dump_posix_fs_log_message(const char * format, va_list argptr){ +static void hci_dump_posix_fs_log_message(int log_level, const char * format, va_list argptr){ + UNUSED(log_level); if (dump_file < 0) return; int len = vsnprintf(log_message_buffer, sizeof(log_message_buffer), format, argptr); hci_dump_posix_fs_log_packet(LOG_MESSAGE_PACKET, 0, (uint8_t*) log_message_buffer, len); diff --git a/platform/posix/hci_dump_posix_stdout.c b/platform/posix/hci_dump_posix_stdout.c index 1b7e448be..489994510 100644 --- a/platform/posix/hci_dump_posix_stdout.c +++ b/platform/posix/hci_dump_posix_stdout.c @@ -116,7 +116,8 @@ static void hci_dump_posix_posix_stdout_log_packet(uint8_t packet_type, uint8_t hci_dump_posix_stdout_packet(packet_type, in, packet, len); } -static void hci_dump_posix_stdout_log_message(const char * format, va_list argptr){ +static void hci_dump_posix_stdout_log_message(int log_level, const char * format, va_list argptr){ + UNUSED(log_level); int len = vsnprintf(log_message_buffer, sizeof(log_message_buffer), format, argptr); hci_dump_posix_posix_stdout_log_packet(LOG_MESSAGE_PACKET, 0, (uint8_t*) log_message_buffer, len); } diff --git a/platform/windows/hci_dump_windows_fs.c b/platform/windows/hci_dump_windows_fs.c index e9d0b85f6..4a8a2a270 100644 --- a/platform/windows/hci_dump_windows_fs.c +++ b/platform/windows/hci_dump_windows_fs.c @@ -171,7 +171,8 @@ static void hci_dump_windows_fs_log_packet(uint8_t packet_type, uint8_t in, uint UNUSED(dwBytesWritten); } -static void hci_dump_windows_fs_log_message(const char * format, va_list argptr){ +static void hci_dump_windows_fs_log_message(int log_level, const char * format, va_list argptr){ + UNUSED(log_level); if (dump_file < 0) return; int len = vsnprintf(log_message_buffer, sizeof(log_message_buffer), format, argptr); hci_dump_windows_fs_log_packet(LOG_MESSAGE_PACKET, 0, (uint8_t*) log_message_buffer, len); diff --git a/platform/windows/hci_dump_windows_stdout.c b/platform/windows/hci_dump_windows_stdout.c index 2cc8d5258..3c917ffeb 100644 --- a/platform/windows/hci_dump_windows_stdout.c +++ b/platform/windows/hci_dump_windows_stdout.c @@ -105,7 +105,8 @@ static void hci_dump_windows_stdout_log_packet(uint8_t packet_type, uint8_t in, hci_dump_windows_stdout_packet(packet_type, in, packet, len); } -static void hci_dump_windows_stdout_log_message(const char * format, va_list argptr){ +static void hci_dump_windows_stdout_log_message(int log_level, const char * format, va_list argptr){ + UNUSED(log_level); int len = vsnprintf(log_message_buffer, sizeof(log_message_buffer), format, argptr); hci_dump_windows_stdout_log_packet(LOG_MESSAGE_PACKET, 0, (uint8_t*) log_message_buffer, len); } diff --git a/src/hci_dump.c b/src/hci_dump.c index d9b878c21..a2ef28c86 100644 --- a/src/hci_dump.c +++ b/src/hci_dump.c @@ -101,7 +101,7 @@ void hci_dump_log(int log_level, const char * format, ...){ va_list argptr; va_start(argptr, format); - (*hci_dump_implementation->log_message)(format, argptr); + (*hci_dump_implementation->log_message)(log_level, format, argptr); va_end(argptr); } @@ -111,7 +111,7 @@ void hci_dump_log_P(int log_level, PGM_P format, ...){ va_list argptr; va_start(argptr, format); - (*hci_dump_implementation->log_message_P)(format, argptr); + (*hci_dump_implementation->log_message_P)(log_level, format, argptr); va_end(argptr); } #endif diff --git a/src/hci_dump.h b/src/hci_dump.h index 2b7821b8e..cf0de1e56 100644 --- a/src/hci_dump.h +++ b/src/hci_dump.h @@ -83,10 +83,10 @@ typedef struct { // log packet void (*log_packet)(uint8_t packet_type, uint8_t in, uint8_t *packet, uint16_t len); // log message - void (*log_message)(const char * format, va_list argptr); + void (*log_message)(int log_level, const char * format, va_list argptr); #ifdef __AVR__ \ // log message - AVR - void (*log_message_P)(PGM_P * format, va_list argptr); + void (*log_message_P)(int log_level, PGM_P * format, va_list argptr); #endif } hci_dump_t;