From cf2618101ef832a9652d84b43ed5f558da401248 Mon Sep 17 00:00:00 2001
From: Christian Cunningham <cc@localhost>
Date: Tue, 21 Dec 2021 19:36:58 -0800
Subject: Consolidated UART Headers

---
 src/cpu/irq.c        |  1 -
 src/drivers/uart.a.h | 11 -----------
 src/drivers/uart.c   |  2 +-
 src/drivers/uart.h   |  6 ++++++
 src/lib/mem.c        |  2 +-
 src/sys/core.c       |  1 -
 src/sys/timer.c      |  1 -
 7 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 100644 src/drivers/uart.a.h

(limited to 'src')

diff --git a/src/cpu/irq.c b/src/cpu/irq.c
index adba7a7..1d50c7d 100644
--- a/src/cpu/irq.c
+++ b/src/cpu/irq.c
@@ -1,7 +1,6 @@
 #include "../cpu/irq.h"
 #include "../sys/core.h"
 #include "../sys/timer.h"
-#include "../drivers/uart.a.h"
 #include "../drivers/uart.h"
 #include "../util/mutex.h"
 #include "../util/time.h"
diff --git a/src/drivers/uart.a.h b/src/drivers/uart.a.h
deleted file mode 100644
index c14fa69..0000000
--- a/src/drivers/uart.a.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef DRIVERS_UART_A_H
-#define DRIVERS_UART_A_H
-
-#define PRINTS_DBG(X) uart_char('[');uart_string(__FILE__);uart_char(':');uart_10(__LINE__);uart_string("] ");uart_string(X);
-#define PRINTI_DBG(X) uart_char('[');uart_string(__FILE__);uart_char(':');uart_10(__LINE__);uart_string("] ");uart_10(X);
-
-extern void uart_char(unsigned char c);
-extern void uart_hex(unsigned long data);
-extern void uart_string(char* message);
-
-#endif
diff --git a/src/drivers/uart.c b/src/drivers/uart.c
index f7f15c2..bc67ca4 100644
--- a/src/drivers/uart.c
+++ b/src/drivers/uart.c
@@ -1,4 +1,4 @@
-#include "uart.a.h"
+#include "uart.h"
 
 void uart_hexn(unsigned long c_val) {
 	uart_hex(c_val);
diff --git a/src/drivers/uart.h b/src/drivers/uart.h
index 9f1319b..c3f8e86 100644
--- a/src/drivers/uart.h
+++ b/src/drivers/uart.h
@@ -1,6 +1,12 @@
 #ifndef DRIVERS_UART_H
 #define DRIVERS_UART_H
 
+#define PRINTS_DBG(X) uart_char('[');uart_string(__FILE__);uart_char(':');uart_10(__LINE__);uart_string("] ");uart_string(X);
+#define PRINTI_DBG(X) uart_char('[');uart_string(__FILE__);uart_char(':');uart_10(__LINE__);uart_string("] ");uart_10(X);
+
+extern void uart_char(unsigned char c);
+extern void uart_hex(unsigned long data);
+extern void uart_string(char* message);
 void uart_hexn(unsigned long);
 void uart_10(unsigned long);
 
diff --git a/src/lib/mem.c b/src/lib/mem.c
index cf1c980..3313c07 100644
--- a/src/lib/mem.c
+++ b/src/lib/mem.c
@@ -1,4 +1,4 @@
-#include "../drivers/uart.a.h"
+#include "../drivers/uart.h"
 
 void memshow32(unsigned long* addr, unsigned int n) {
 	for(unsigned int i = 0; i < n; i++) {
diff --git a/src/sys/core.c b/src/sys/core.c
index 5cac672..bd6df21 100644
--- a/src/sys/core.c
+++ b/src/sys/core.c
@@ -1,4 +1,3 @@
-#include "../drivers/uart.a.h"
 #include "../drivers/uart.h"
 #include "../graphics/draw.h"
 #include "../lib/mem.h"
diff --git a/src/sys/timer.c b/src/sys/timer.c
index 9df7b33..ca3366c 100644
--- a/src/sys/timer.c
+++ b/src/sys/timer.c
@@ -2,7 +2,6 @@
 #include "../sys/timer.h"
 #include "../util/time.h"
 #include "../util/mutex.h"
-#include "../drivers/uart.a.h"
 #include "../drivers/uart.h"
 
 #define SYS_TIMER_C
-- 
cgit v1.2.1