Move hal_log() support to separate module.

3 files changed, 67 insertions, 26 deletions

diff --git a/Makefile b/Makefile
index 2944aa9..581adda 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,8 @@ BOARD_OBJS += \
 	$(TOPLEVEL)/stm-fpgacfg.o \
 	$(TOPLEVEL)/stm-keystore.o \
 	$(TOPLEVEL)/stm-sdram.o \
-	$(TOPLEVEL)/stm-flash.o
+	$(TOPLEVEL)/stm-flash.o \
+	$(TOPLEVEL)/stm-log.o
 endif
 export BOARD_OBJS
 
diff --git a/projects/hsm/hsm.c b/projects/hsm/hsm.c
index 5e9d06e..60e35fc 100644
--- a/projects/hsm/hsm.c
+++ b/projects/hsm/hsm.c
@@ -257,31 +257,6 @@ void hal_critical_section_end(void)
 }
 #endif
 
-/* Logging */
-
-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");
-}
-
 /* The main thread. This does all the setup, and the worker threads handle
  * the rest.
  */
diff --git a/stm-log.c b/stm-log.c
new file mode 100644
index 0000000..a8a9fd9
--- /dev/null
+++ b/stm-log.c
@@ -0,0 +1,65 @@
+/*
+ * stm-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");
+}