USB init moved to separate file

Author: bbogush

firmware/Makefile

@@ -48,7 +48,7 @@ vpath %.s $(SRC_DIR)
 
 STARTUP=startup_stm32f10x_hd.s
 USB_SRCS=hw_config.c stm32_it.c usb_prop.c usb_desc.c usb_istr.c usb_pwr.c \
-  usb_endp.c
+  usb_endp.c usb.c
 
 
 SRCS=main.c system_stm32f10x.c syscalls.c fsmc_nand.c chip_db.c led.c uart.c \

firmware/main.c

@@ -10,9 +10,7 @@
 /* SPL */
 #include <stm32f10x.h>
 /* USB */
-#include <usb_lib.h>
-#include <usb_pwr.h>
-#include "hw_config.h"
+#include "usb.h"
 #include "cdc.h"
 /* LED */
 #include "led.h"
@@ -190,15 +188,6 @@ static np_comm_cb_t *np_comm_cb;
 
 uint8_t np_packet_send_buf[NP_PACKET_BUF_SIZE];
 
-static void np_usb_init()
-{
-    Set_System();
-    Set_USBClock();
-    USB_Interrupts_Config();
-    USB_Init();
-    while (!USB_IsDeviceConfigured());
-}
-
 static int np_send_ok_status()
 {
     np_resp_t status = { NP_RESP_STATUS, NP_STATUS_OK };
@@ -813,7 +802,7 @@ int main()
     printf("done.\r\n");
 
     printf("USB init...");
-    np_usb_init();
+    usb_init();
     printf("done.\r\n");
 
     printf("CDC init...");

firmware/usb.c

@@ -0,0 +1,17 @@
+/*  Copyright (C) 2017 Bogdan Bogush <[email protected]>
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
+ */
+
+#include "hw_config.h"
+#include <usb_lib.h>
+#include <usb_pwr.h>
+
+void usb_init()
+{
+    Set_System();
+    Set_USBClock();
+    USB_Interrupts_Config();
+    USB_Init();
+    while (!USB_IsDeviceConfigured());
+}

firmware/usb.h

@@ -0,0 +1,11 @@
+/*  Copyright (C) 2017 Bogdan Bogush <[email protected]>
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
+ */
+ 
+#ifndef _USB_H_
+#define _USB_H_
+
+void usb_init();
+
+#endif