From: Andreas Koelbl <andreas.koe...@st.oth-regensburg.de>

This header is only included by concrete uart drivers. Furthermore, it
only declares the the abstract uart_chip structure. Naming it debug.h
might be misleading.

Signed-off-by: Andreas Koelbl <andreas.koe...@st.oth-regensburg.de>
---
 hypervisor/arch/arm/dbg-write.c                     | 2 +-
 hypervisor/arch/arm/include/asm/uart-8250-dw.h      | 2 +-
 hypervisor/arch/arm/include/asm/uart-pl011.h        | 2 +-
 hypervisor/arch/arm/include/asm/uart-tegra.h        | 2 +-
 hypervisor/arch/arm/include/asm/{debug.h => uart.h} | 6 +++---
 inmates/lib/arm/printk.c                            | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename hypervisor/arch/arm/include/asm/{debug.h => uart.h} (86%)

diff --git a/hypervisor/arch/arm/dbg-write.c b/hypervisor/arch/arm/dbg-write.c
index 076821b..8de0103 100644
--- a/hypervisor/arch/arm/dbg-write.c
+++ b/hypervisor/arch/arm/dbg-write.c
@@ -13,7 +13,7 @@
 #include <jailhouse/entry.h>
 #include <jailhouse/printk.h>
 #include <jailhouse/processor.h>
-#include <asm/debug.h>
+#include <asm/uart.h>
 
 static struct uart_chip uart;
 
diff --git a/hypervisor/arch/arm/include/asm/uart-8250-dw.h 
b/hypervisor/arch/arm/include/asm/uart-8250-dw.h
index 9c6c27f..a06923a 100644
--- a/hypervisor/arch/arm/include/asm/uart-8250-dw.h
+++ b/hypervisor/arch/arm/include/asm/uart-8250-dw.h
@@ -12,7 +12,7 @@
 
 #include <jailhouse/mmio.h>
 #include <jailhouse/processor.h>
-#include <asm/debug.h>
+#include <asm/uart.h>
 
 #define UART_TX                        0x0
 #define UART_DLL               0x0
diff --git a/hypervisor/arch/arm/include/asm/uart-pl011.h 
b/hypervisor/arch/arm/include/asm/uart-pl011.h
index adba555..7f1a56e 100644
--- a/hypervisor/arch/arm/include/asm/uart-pl011.h
+++ b/hypervisor/arch/arm/include/asm/uart-pl011.h
@@ -13,7 +13,7 @@
 #ifndef _JAILHOUSE_ASM_UART_PL011_H
 #define _JAILHOUSE_ASM_UART_PL011_H
 
-#include <asm/debug.h>
+#include <asm/uart.h>
 #include <asm/processor.h>
 
 #define UART_CLK       24000000
diff --git a/hypervisor/arch/arm/include/asm/uart-tegra.h 
b/hypervisor/arch/arm/include/asm/uart-tegra.h
index 0c0b254..ecac543 100644
--- a/hypervisor/arch/arm/include/asm/uart-tegra.h
+++ b/hypervisor/arch/arm/include/asm/uart-tegra.h
@@ -12,7 +12,7 @@
 
 #include <jailhouse/mmio.h>
 #include <jailhouse/processor.h>
-#include <asm/debug.h>
+#include <asm/uart.h>
 
 #define UART_TX                        0x0
 #define UART_DLL               0x0
diff --git a/hypervisor/arch/arm/include/asm/debug.h 
b/hypervisor/arch/arm/include/asm/uart.h
similarity index 86%
rename from hypervisor/arch/arm/include/asm/debug.h
rename to hypervisor/arch/arm/include/asm/uart.h
index 02c6f48..8bcb242 100644
--- a/hypervisor/arch/arm/include/asm/debug.h
+++ b/hypervisor/arch/arm/include/asm/uart.h
@@ -10,8 +10,8 @@
  * the COPYING file in the top-level directory.
  */
 
-#ifndef JAILHOUSE_ASM_DEBUG_H_
-#define JAILHOUSE_ASM_DEBUG_H_
+#ifndef JAILHOUSE_ASM_UART_H_
+#define JAILHOUSE_ASM_UART_H_
 
 #ifndef __ASSEMBLY__
 
@@ -30,4 +30,4 @@ struct uart_chip {
 void uart_chip_init(struct uart_chip *chip);
 
 #endif /* !__ASSEMBLY__ */
-#endif /* !JAILHOUSE_ASM_DEBUG_H_ */
+#endif /* !JAILHOUSE_ASM_UART_H_ */
diff --git a/inmates/lib/arm/printk.c b/inmates/lib/arm/printk.c
index 874dada..3ede5cf 100644
--- a/inmates/lib/arm/printk.c
+++ b/inmates/lib/arm/printk.c
@@ -11,7 +11,7 @@
  */
 
 #include <inmate.h>
-#include <asm/debug.h>
+#include <asm/uart.h>
 #include <stdarg.h>
 
 static struct uart_chip chip;
-- 
2.10.0

-- 
You received this message because you are subscribed to the Google Groups 
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to jailhouse-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to