From aece05b2e82ba2e77a40aa346c67b3952ea1cf48 Mon Sep 17 00:00:00 2001
From: Conor Patrick <conorpp94@gmail.com>
Date: Mon, 3 Dec 2018 00:14:26 -0500
Subject: [PATCH] remove dead code

---
 fido2/log.c                         |  6 +++++
 fido2/log.h                         |  6 +++--
 targets/stm32l442/bootloader/main.c | 38 ++---------------------------
 3 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/fido2/log.c b/fido2/log.c
index 2db43b0..42a2b7f 100644
--- a/fido2/log.c
+++ b/fido2/log.c
@@ -25,12 +25,17 @@
 #include "log.h"
 #include "util.h"
 
+#if DEBUG_LEVEL > 0
+
 static uint32_t LOGMASK = TAG_FILENO;
 
+
 void set_logging_mask(uint32_t mask)
 {
     LOGMASK = mask;
 }
+
+
 struct logtag
 {
     uint32_t tagn;
@@ -108,3 +113,4 @@ void LOG_HEX(uint32_t tag, uint8_t * data, int length)
     set_logging_tag(tag);
     dump_hex(data,length);
 }
+#endif
diff --git a/fido2/log.h b/fido2/log.h
index 3b2af12..d298a52 100644
--- a/fido2/log.h
+++ b/fido2/log.h
@@ -33,7 +33,7 @@
 
 void LOG(uint32_t tag, const char * filename, int num, const char * fmt, ...);
 void LOG_HEX(uint32_t tag, uint8_t * data, int length);
-void set_logging_mask(uint32_t mask);
+
 void set_logging_tag(uint32_t tag);
 
 typedef enum
@@ -60,8 +60,9 @@ typedef enum
     TAG_FILENO = (1<<31)
 } LOG_TAG;
 
-#if DEBUG_LEVEL == 1
+#if DEBUG_LEVEL > 0
 
+void set_logging_mask(uint32_t mask);
 #define printf1(tag,fmt, ...) LOG(tag & ~(TAG_FILENO), NULL, 0, fmt, ##__VA_ARGS__)
 #define printf2(tag,fmt, ...) LOG(tag | TAG_FILENO,__FILE__, __LINE__, fmt, ##__VA_ARGS__)
 #define printf3(tag,fmt, ...) LOG(tag | TAG_FILENO,__FILE__, __LINE__, fmt, ##__VA_ARGS__)
@@ -70,6 +71,7 @@ typedef enum
 
 #else
 
+#define set_logging_mask(mask)
 #define printf1(fmt, ...)
 #define printf2(fmt, ...)
 #define printf3(fmt, ...)
diff --git a/targets/stm32l442/bootloader/main.c b/targets/stm32l442/bootloader/main.c
index 3bee9f5..ac19810 100644
--- a/targets/stm32l442/bootloader/main.c
+++ b/targets/stm32l442/bootloader/main.c
@@ -37,52 +37,18 @@
 uint8_t REBOOT_FLAG = 0;
 
 
-
-
-// void __attribute__((optimize("O0"))) BOOT_boot(void)
 void  BOOT_boot(void)
 {
-  uint32_t sp;
   typedef void (*pFunction)(void);
-  pFunction jump;
-
-
-  /* Reset the RCC clock configuration to the default reset state ------------*/
-  /* Set MSION bit */
-  RCC->CR |= RCC_CR_MSION;
-
-  /* Reset CFGR register */
-  RCC->CFGR = 0x00000000U;
-
-  /* Reset HSEON, CSSON , HSION, and PLLON bits */
-  RCC->CR &= 0xEAF6FFFFU;
-
-  /* Reset PLLCFGR register */
-  RCC->PLLCFGR = 0x00001000U;
-
-  /* Reset HSEBYP bit */
-  RCC->CR &= 0xFFFBFFFFU;
-
-  /* Disable all interrupts */
-  RCC->CIER = 0x00000000U;
-
 
   uint32_t *bootAddress = (uint32_t *)(APPLICATION_JUMP_ADDR);
 
-  printf("stack addr: %02lx\r\n",bootAddress[0]);
-  printf("jmp addr: %02lx\r\n",bootAddress[1]);
-
   /* Set new vector table */
   SCB->VTOR = APPLICATION_JUMP_ADDR;
 
   /* Read new SP and PC from vector table */
-  sp = bootAddress[0];
-  jump = (pFunction)bootAddress[1];
-
-  /* Do a jump by loading the PC and SP into the CPU registers */
-  __set_MSP(sp);
-  jump();
-  //jmp();
+  __set_MSP(bootAddress[0]);
+  ((pFunction)bootAddress[1])();
 }
 
 int main(int argc, char * argv[])