diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | projects/bootloader/Makefile | 2 | ||||
| -rw-r--r-- | projects/bootloader/log.c (renamed from stm-log.c) | 4 | ||||
| -rw-r--r-- | projects/hsm/Makefile | 3 | ||||
| -rw-r--r-- | projects/hsm/log.c | 65 |
5 files changed, 71 insertions, 6 deletions
@@ -72,8 +72,7 @@ BOARD_OBJS += \ $(TOPLEVEL)/stm-fpgacfg.o \ $(TOPLEVEL)/stm-keystore.o \ $(TOPLEVEL)/stm-sdram.o \ - $(TOPLEVEL)/stm-flash.o \ - $(TOPLEVEL)/stm-log.o + $(TOPLEVEL)/stm-flash.o endif export BOARD_OBJS diff --git a/projects/bootloader/Makefile b/projects/bootloader/Makefile index 7de93c0..8415c69 100644 --- a/projects/bootloader/Makefile +++ b/projects/bootloader/Makefile @@ -1,6 +1,6 @@ PROG = bootloader -OBJS = crc32.o dfu.o +OBJS = crc32.o dfu.o log.o BOARD_OBJS = \ ./stm-init.o \ diff --git a/stm-log.c b/projects/bootloader/log.c index a8a9fd9..ee951d9 100644 --- a/stm-log.c +++ b/projects/bootloader/log.c @@ -1,6 +1,6 @@ /* - * stm-log.c - * ---------------- + * log.c + * ----- * Implement libhal logging API on Alpha. * * Copyright (c) 2017, NORDUnet A/S All rights reserved. diff --git a/projects/hsm/Makefile b/projects/hsm/Makefile index b92390a..56ee462 100644 --- a/projects/hsm/Makefile +++ b/projects/hsm/Makefile @@ -9,7 +9,8 @@ OBJS = crc32.o \ mgmt-keystore.c \ mgmt-masterkey.c \ mgmt-misc.c \ - mgmt-thread.c + mgmt-thread.c \ + log.o BOARD_OBJS = \ $(TOPLEVEL)/stm-init.o \ diff --git a/projects/hsm/log.c b/projects/hsm/log.c new file mode 100644 index 0000000..ee951d9 --- /dev/null +++ b/projects/hsm/log.c @@ -0,0 +1,65 @@ +/* + * log.c + * ----- + * Implement libhal logging API on Alpha. + * + * Copyright (c) 2017, NORDUnet A/S All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of the NORDUnet nor the names of its contributors may + * be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#define HAL_OK CMSIS_HAL_OK +#include "stm-uart.h" +#undef HAL_OK + +#define HAL_OK LIBHAL_OK +#include "hal.h" +#include "hal_internal.h" +#undef HAL_OK + +static hal_log_level_t current_log_level; + +void hal_log_set_level(const hal_log_level_t level) +{ + current_log_level = level; +} + +void hal_log(const hal_log_level_t level, const char *format, ...) +{ + if (level < current_log_level) + return; + + char buffer[2048]; + va_list ap; + + va_start(ap, format); + vsnprintf(buffer, sizeof(buffer), format, ap); + va_end(ap); + + uart_send_string2(STM_UART_MGMT, buffer); + uart_send_string2(STM_UART_MGMT, "\r\n"); +} |