Merge branch 'umetronics-master'

src/platforms/common/cdcacm.c

@@ -498,7 +498,7 @@ static void cdcacm_set_config(usbd_device *dev, uint16_t wValue)
 	configured = wValue;
 
 	/* GDB interface */
-#ifdef STM32F4
+#if defined(STM32F4) || defined(LM4F)
 	usbd_ep_setup(dev, 0x01, USB_ENDPOINT_ATTR_BULK,
 	              CDCACM_PACKET_SIZE, gdb_usb_out_cb);
 #else

src/platforms/f4discovery/platform.h

@@ -160,6 +160,7 @@ static inline int platform_hwversion(void)
 #define sscanf siscanf
 #define sprintf siprintf
 #define vasprintf vasiprintf
+#define snprintf sniprintf
 
 #endif
 

src/platforms/launchpad-icdi/platform.c

@@ -46,8 +46,8 @@ void sys_tick_handler(void)
 void
 platform_init(void)
 {
-        int i;
-        for(i=0; i<1000000; i++);
+	int i;
+	for(i=0; i<1000000; i++);
 
 	rcc_sysclk_config(OSCSRC_MOSC, XTAL_16M, PLL_DIV_80MHZ);
 
@@ -77,12 +77,12 @@ platform_init(void)
 	periph_clock_enable(RCC_GPIOD);
 	__asm__("nop"); __asm__("nop"); __asm__("nop");
 	gpio_mode_setup(GPIOD_BASE, GPIO_MODE_ANALOG, GPIO_PUPD_NONE, GPIO4|GPIO5);
+	usbuart_init();
+	cdcacm_init();
+
 	usb_enable_interrupts(USB_INT_RESET | USB_INT_DISCON |
 	                      USB_INT_RESUME | USB_INT_SUSPEND,
 	                      0xff, 0xff);
-
-	usbuart_init();
-	cdcacm_init();
 }
 
 void platform_timeout_set(uint32_t ms)

src/platforms/launchpad-icdi/platform.h

@@ -96,6 +96,7 @@ extern usbd_driver lm4f_usb_driver;
 #define sscanf siscanf
 #define sprintf siprintf
 #define vasprintf vasiprintf
+#define snprintf sniprintf
 
 #define DEBUG(...)
 

src/platforms/stlink/platform.h

@@ -138,6 +138,7 @@ extern uint16_t led_idle_run;
 #define sscanf siscanf
 #define sprintf siprintf
 #define vasprintf vasiprintf
+#define snprintf sniprintf
 
 #endif
 

src/platforms/swlink/platform.h

@@ -131,6 +131,7 @@
 #define sscanf siscanf
 #define sprintf siprintf
 #define vasprintf vasiprintf
+#define snprintf sniprintf
 
 #endif