summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--setup.c2
-rw-r--r--uart.c (renamed from uart/uart.c)0
-rw-r--r--uart.h (renamed from uart/uart.h)8
-rw-r--r--usb/endpt1.c2
-rw-r--r--usb/usb.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index ce66787..1bc11e1 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ LDFLAGS = -T layout.ld -O2 -flto -ffreestanding -nostdlib
ASFLAGS = $(TARGET_ARCH)
OBJ := crt0.o vectors.o flashconf.o setup.o fmk.o lib/le.o usb/usb.o \
- usb/endpt0.o usb/endpt1.o uart/uart.o
+ usb/endpt0.o usb/endpt1.o uart.o
include $(MK20DX256)/mk20dx256.mk
CPPFLAGS += $(mk20dx256_CPPFLAGS)
diff --git a/setup.c b/setup.c
index 57ef649..60f8c53 100644
--- a/setup.c
+++ b/setup.c
@@ -22,7 +22,7 @@
#include <string.h>
#include "usb/usb.h"
-#include "uart/uart.h"
+#include "uart.h"
extern unsigned char _ldata[], _sdata[], _edata[];
extern unsigned char _sbss[], _ebss[];
diff --git a/uart/uart.c b/uart.c
index 3ead880..3ead880 100644
--- a/uart/uart.c
+++ b/uart.c
diff --git a/uart/uart.h b/uart.h
index bb5c6f7..5ff2d79 100644
--- a/uart/uart.h
+++ b/uart.h
@@ -1,5 +1,5 @@
/*
- * uart/uart.h -- hardware UART interface
+ * uart.h -- hardware UART interface
*
* Copyright (C) 2016-2017 Tomasz Kramkowski <tk@the-tk.com>
*
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef FMK_UART_UART_H
-#define FMK_UART_UART_H
+#ifndef FMK_UART_H
+#define FMK_UART_H
void uart_setup(void);
void uart_putchar(int c);
@@ -25,4 +25,4 @@ void uart_printf(const char *fmt, ...);
void uart_puts(const char *s);
void uart0_isr(void);
-#endif /* FMK_UART_UART_H */
+#endif /* FMK_UART_H */
diff --git a/usb/endpt1.c b/usb/endpt1.c
index 3139104..0580349 100644
--- a/usb/endpt1.c
+++ b/usb/endpt1.c
@@ -20,7 +20,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "../uart/uart.h"
+#include "../uart.h"
#include "bdt.h"
#include "endpt1.h"
diff --git a/usb/usb.c b/usb/usb.c
index 5f00fe0..252268e 100644
--- a/usb/usb.c
+++ b/usb/usb.c
@@ -22,7 +22,7 @@
#include <reg/usbotg.h>
#include <stddef.h>
-#include "../uart/uart.h"
+#include "../uart.h"
#include "usb.h"
#include "bdt.h"
#include "endpt0.h"