Some cleanup for fault debugging

- Not the correct print for 32 bit Hex uints in firmware (bootloader is
ok)
- Fixing bootloader warnings

Author: haata

Bootloader/mchck-cdefs.h

@@ -28,14 +28,14 @@
 
 #define _CONCAT(x,y) _CONCAT1(x,y)
 #define _CONCAT1(x,y) x ## y
-#define _STR(a) #a
+#define _STR_(a) #a
 
 typedef __CHAR16_TYPE__ char16_t;
 
 #define __packed __attribute__((__packed__))
 
 /* From FreeBSD: compile-time asserts */
-#define CTASSERT(x)             _Static_assert(x, _STR(x))
+#define CTASSERT(x)             _Static_assert(x, _STR_(x))
 
 #define CTASSERT_SIZE_BYTE(t, s)     CTASSERT(sizeof(t) == (s))
 #define CTASSERT_SIZE_BIT(t, s)     CTASSERT(sizeof(t) * 8 == (s))

Lib/sam.c

@@ -105,7 +105,11 @@ void __stack_chk_fail(void)
 	uint32_t sp = __get_MSP();
 	print("Stack overflow!" NL );
 	print(" SP = ");
+#if defined(_bootloader_)
 	printHex(sp);
+#else
+	printHex32(sp);
+#endif
 	print(NL NL);
 	fault_isr();
 }
@@ -116,7 +120,11 @@ void unused_isr()
 	Cortex_IRQ irq = get_current_isr();
 	print("Unhandled ISR!" NL);
 	print(" IRQn = ");
+#if defined(_bootloader_)
 	printHex(irq);
+#else
+	printHex32(irq);
+#endif
 	print(NL NL);
 	fault_isr();
 }