Refactored headers

bbogush · bbogush · commit 2e978d87cc07 · 2018-12-29T19:35:53.000+02:00
diff --git a/firmware/fsmc_nand.c b/firmware/fsmc_nand.c
@@ -5,6 +5,7 @@
 
 #include "fsmc_nand.h"
 #include "chip_db.h"
+#include <stm32f10x.h>
 
 #define FSMC_Bank_NAND     FSMC_Bank2_NAND
 #define Bank_NAND_ADDR     Bank2_NAND_ADDR 
diff --git a/firmware/fsmc_nand.h b/firmware/fsmc_nand.h
@@ -6,8 +6,6 @@
 #ifndef _FSMC_NAND_H_
 #define _FSMC_NAND_H_
 
-#include "stm32f10x.h"
-
 typedef struct
 {
     uint8_t maker_id;
diff --git a/firmware/led.c b/firmware/led.c
@@ -4,6 +4,7 @@
  */
 
 #include "led.h"
+#include <stm32f10x.h>
 
 void led_init()
 {
diff --git a/firmware/led.h b/firmware/led.h
@@ -7,7 +7,6 @@
 #define _LED_H_
 
 #include <stdbool.h>
-#include "stm32f10x.h"
 
 void led_init();
 void led_wr_set(bool on);
diff --git a/firmware/main.c b/firmware/main.c
@@ -3,26 +3,17 @@
  *  it under the terms of the GNU General Public License version 3.
  */
 
-/* NAND */
 #include "fsmc_nand.h"
 #include "chip_db.h"
 #include "nand_programmer.h"
-/* SPL */
-#include <stm32f10x.h>
-/* USB */
 #include "usb.h"
 #include "cdc.h"
-/* LED */
 #include "led.h"
-/* UART */
 #include "uart.h"
-/* JTAG */
 #include "jtag.h"
-/* Version */
 #include "version.h"
-/* Utils */
 #include "log.h"
-/* STD */
+#include <stm32f10x.h>
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>
diff --git a/firmware/uart.c b/firmware/uart.c
@@ -3,8 +3,8 @@
  *  it under the terms of the GNU General Public License version 3.
  */
 
-#include <stm32f10x.h>
 #include "uart.h"
+#include <stm32f10x.h>
 
 void uart_init()
 {

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@`
`6`	`6`	`#ifndef _FSMC_NAND_H_`
`7`	`7`	`#define _FSMC_NAND_H_`
`8`	`8`
`9`		`-#include "stm32f10x.h"`
`10`		`-`
`11`	`9`	`typedef struct`
`12`	`10`	`{`
`13`	`11`	`uint8_t maker_id;`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`*/`
`5`	`5`
`6`	`6`	`#include "led.h"`
	`7`	`+#include <stm32f10x.h>`
`7`	`8`
`8`	`9`	`void led_init()`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`* it under the terms of the GNU General Public License version 3.`
`4`	`4`	`*/`
`5`	`5`
`6`		`-#include <stm32f10x.h>`
`7`	`6`	`#include "uart.h"`
	`7`	`+#include <stm32f10x.h>`
`8`	`8`
`9`	`9`	`void uart_init()`
`10`	`10`	`{`