[PATCH 4/5] uart.h: move header out of calypso-directory

Wolfram Sang wolfram at the-dreams.de
Wed May 4 20:58:16 UTC 2011


Everything defined is a pretty generic interface and can be used by
mediatek, too.

Signed-off-by: Wolfram Sang <wolfram at the-dreams.de>
---
 src/target/firmware/apps/loader/main.c         |    2 +-
 src/target/firmware/board/compal_e86/init.c    |    2 +-
 src/target/firmware/board/compal_e88/init.c    |    2 +-
 src/target/firmware/board/compal_e99/init.c    |    2 +-
 src/target/firmware/board/gta0x/init.c         |    2 +-
 src/target/firmware/board/pirelli_dpl10/init.c |    2 +-
 src/target/firmware/calypso/uart.c             |    2 +-
 src/target/firmware/comm/sercomm.c             |    2 +-
 src/target/firmware/comm/sercomm_cons.c        |    2 +-
 src/target/firmware/include/calypso/uart.h     |   32 ------------------------
 src/target/firmware/include/uart.h             |   32 ++++++++++++++++++++++++
 src/target/firmware/lib/console.c              |    2 +-
 12 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 src/target/firmware/include/calypso/uart.h
 create mode 100644 src/target/firmware/include/uart.h

diff --git a/src/target/firmware/apps/loader/main.c b/src/target/firmware/apps/loader/main.c
index 4e71d98..a948934 100644
--- a/src/target/firmware/apps/loader/main.c
+++ b/src/target/firmware/apps/loader/main.c
@@ -45,7 +45,7 @@
 #include <calypso/tsp.h>
 #include <calypso/irq.h>
 #include <calypso/misc.h>
-#include <calypso/uart.h>
+#include <uart.h>
 #include <calypso/timer.h>
 
 #include <flash/cfi_flash.h>
diff --git a/src/target/firmware/board/compal_e86/init.c b/src/target/firmware/board/compal_e86/init.c
index 537702c..1de6193 100644
--- a/src/target/firmware/board/compal_e86/init.c
+++ b/src/target/firmware/board/compal_e86/init.c
@@ -37,7 +37,7 @@
 #include <calypso/dma.h>
 #include <calypso/rtc.h>
 #include <calypso/timer.h>
-#include <calypso/uart.h>
+#include <uart.h>
 #include <calypso/backlight.h>
 
 #include <comm/sercomm.h>
diff --git a/src/target/firmware/board/compal_e88/init.c b/src/target/firmware/board/compal_e88/init.c
index 54deb6a..a5bf880 100644
--- a/src/target/firmware/board/compal_e88/init.c
+++ b/src/target/firmware/board/compal_e88/init.c
@@ -36,7 +36,7 @@
 #include <calypso/dma.h>
 #include <calypso/rtc.h>
 #include <calypso/timer.h>
-#include <calypso/uart.h>
+#include <uart.h>
 #include <calypso/backlight.h>
 
 #include <comm/sercomm.h>
diff --git a/src/target/firmware/board/compal_e99/init.c b/src/target/firmware/board/compal_e99/init.c
index ed45c39..0c218a8 100644
--- a/src/target/firmware/board/compal_e99/init.c
+++ b/src/target/firmware/board/compal_e99/init.c
@@ -37,7 +37,7 @@
 #include <calypso/dma.h>
 #include <calypso/rtc.h>
 #include <calypso/timer.h>
-#include <calypso/uart.h>
+#include <uart.h>
 #include <calypso/backlight.h>
 
 #include <comm/sercomm.h>
diff --git a/src/target/firmware/board/gta0x/init.c b/src/target/firmware/board/gta0x/init.c
index 545250d..4f256ea 100644
--- a/src/target/firmware/board/gta0x/init.c
+++ b/src/target/firmware/board/gta0x/init.c
@@ -36,7 +36,7 @@
 #include <calypso/dma.h>
 #include <calypso/rtc.h>
 #include <calypso/timer.h>
-#include <calypso/uart.h>
+#include <uart.h>
 #include <calypso/backlight.h>
 
 #include <comm/sercomm.h>
diff --git a/src/target/firmware/board/pirelli_dpl10/init.c b/src/target/firmware/board/pirelli_dpl10/init.c
index cd38839..53fb257 100644
--- a/src/target/firmware/board/pirelli_dpl10/init.c
+++ b/src/target/firmware/board/pirelli_dpl10/init.c
@@ -37,7 +37,7 @@
 #include <calypso/dma.h>
 #include <calypso/rtc.h>
 #include <calypso/timer.h>
-#include <calypso/uart.h>
+#include <uart.h>
 #include <calypso/backlight.h>
 
 #include <comm/sercomm.h>
diff --git a/src/target/firmware/calypso/uart.c b/src/target/firmware/calypso/uart.c
index 394078d..d3ede4d 100644
--- a/src/target/firmware/calypso/uart.c
+++ b/src/target/firmware/calypso/uart.c
@@ -33,7 +33,7 @@
 #include <comm/sercomm.h>
 
 #include <calypso/irq.h>
-#include <calypso/uart.h>
+#include <uart.h>
 
 #define BASE_ADDR_UART_MODEM	0xffff5000
 #define OFFSET_IRDA		0x800
diff --git a/src/target/firmware/comm/sercomm.c b/src/target/firmware/comm/sercomm.c
index d7f6036..f9d5bfa 100644
--- a/src/target/firmware/comm/sercomm.c
+++ b/src/target/firmware/comm/sercomm.c
@@ -43,7 +43,7 @@
 #include <asm/system.h>
 
 #include <comm/sercomm.h>
-#include <calypso/uart.h>
+#include <uart.h>
 #endif
 
 
diff --git a/src/target/firmware/comm/sercomm_cons.c b/src/target/firmware/comm/sercomm_cons.c
index 987c992..a0dca40 100644
--- a/src/target/firmware/comm/sercomm_cons.c
+++ b/src/target/firmware/comm/sercomm_cons.c
@@ -26,7 +26,7 @@
 
 #include <asm/system.h>
 
-#include <calypso/uart.h>
+#include <uart.h>
 
 #include <console.h>
 #include <osmocom/core/msgb.h>
diff --git a/src/target/firmware/include/calypso/uart.h b/src/target/firmware/include/calypso/uart.h
deleted file mode 100644
index 7eb925e..0000000
--- a/src/target/firmware/include/calypso/uart.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef _CAL_UART_H
-#define _CAL_UART_H
-
-#include <stdint.h>
-
-enum uart_baudrate {
-	UART_38400,
-	UART_57600,
-	UART_115200,
-	UART_230400,
-	UART_460800,
-	UART_614400,
-	UART_921600,
-};
-
-void uart_init(uint8_t uart, uint8_t interrupts);
-void uart_putchar_wait(uint8_t uart, int c);
-int uart_putchar_nb(uint8_t uart, int c);
-int uart_getchar_nb(uint8_t uart, uint8_t *ch);
-int uart_tx_busy(uint8_t uart);
-int uart_baudrate(uint8_t uart, enum uart_baudrate bdrt);
-
-enum uart_irq {
-	UART_IRQ_TX_EMPTY,
-	UART_IRQ_RX_CHAR,
-};
-
-void uart_irq_enable(uint8_t uart, enum uart_irq irq, int on);
-
-void uart_poll(uint8_t uart);
-
-#endif /* _CAL_UART_H */
diff --git a/src/target/firmware/include/uart.h b/src/target/firmware/include/uart.h
new file mode 100644
index 0000000..81d7a15
--- /dev/null
+++ b/src/target/firmware/include/uart.h
@@ -0,0 +1,32 @@
+#ifndef _UART_H
+#define _UART_H
+
+#include <stdint.h>
+
+enum uart_baudrate {
+	UART_38400,
+	UART_57600,
+	UART_115200,
+	UART_230400,
+	UART_460800,
+	UART_614400,
+	UART_921600,
+};
+
+void uart_init(uint8_t uart, uint8_t interrupts);
+void uart_putchar_wait(uint8_t uart, int c);
+int uart_putchar_nb(uint8_t uart, int c);
+int uart_getchar_nb(uint8_t uart, uint8_t *ch);
+int uart_tx_busy(uint8_t uart);
+int uart_baudrate(uint8_t uart, enum uart_baudrate bdrt);
+
+enum uart_irq {
+	UART_IRQ_TX_EMPTY,
+	UART_IRQ_RX_CHAR,
+};
+
+void uart_irq_enable(uint8_t uart, enum uart_irq irq, int on);
+
+void uart_poll(uint8_t uart);
+
+#endif /* _UART_H */
diff --git a/src/target/firmware/lib/console.c b/src/target/firmware/lib/console.c
index 2ec028a..7135ae2 100644
--- a/src/target/firmware/lib/console.c
+++ b/src/target/firmware/lib/console.c
@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <console.h>
-#include <calypso/uart.h>
+#include <uart.h>
 
 #include <asm/system.h>
 
-- 
1.7.2.5





More information about the baseband-devel mailing list