mirror of
https://github.com/bluekitchen/btstack.git
synced 2025-03-28 08:37:22 +00:00
hci_dump: provide log level to log_message implementation
This commit is contained in:
parent
9f087478e0
commit
2d17d4c068
@ -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
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user