[lib][device] Part 1: Rename all mentions of serial to uart

b-man · Oct 18, 2017 · 04ae29f · 04ae29f
1 parent 9bb8a1f
commit 04ae29f
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 31 deletions.
diff --git a/bsp/raspberrypi2/bsp.mk b/bsp/raspberrypi2/bsp.mk
@@ -15,6 +15,4 @@ C_SRC_FILES := \
 C_SRCS += $(addprefix $(SRC_DIR)/, $(C_SRC_FILES))
 
 include $(SRCROOT)/driver/timer/bcm_timer/module.mk
-include $(SRCROOT)/driver/serial/pl011/module.mk
-
-
+include $(SRCROOT)/driver/uart/pl011/module.mk
diff --git a/bsp/raspberrypi2/config.c b/bsp/raspberrypi2/config.c
@@ -1,6 +1,6 @@
 /* Raspberry Pi2-specific configuration information
  *
- * Copyright (c) 2013, Brian McKenzie <mckenzba@gmail.com>
+ * Copyright (c) 2017, Brian McKenzie <mckenzba@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -39,10 +39,10 @@
 #include <boot/bsp.h>
 
 #include <device/timer.h>
-#include <device/serial.h>
+#include <device/uart.h>
 #include <device/sysctl.h>
 
-#include <driver/serial/pl011/pl011.h>
+#include <driver/uart/pl011/pl011.h>
 #include <driver/timer/bcm_timer/bcm_timer.h>
 
 #include "bcm2836.h"

diff --git a/bsp/realview-pba8/bsp.mk b/bsp/realview-pba8/bsp.mk
@@ -15,4 +15,4 @@ C_SRC_FILES := \
 C_SRCS += $(addprefix $(SRC_DIR)/, $(C_SRC_FILES))
 
 include $(SRCROOT)/driver/timer/sp804/module.mk
-include $(SRCROOT)/driver/serial/pl011/module.mk
+include $(SRCROOT)/driver/uart/pl011/module.mk
diff --git a/bsp/realview-pba8/config.c b/bsp/realview-pba8/config.c
@@ -38,11 +38,11 @@
 #include <boot/bsp.h>
 
 #include <device/timer.h>
-#include <device/serial.h>
+#include <device/uart.h>
 #include <device/sysctl.h>
 
+#include <driver/uart/pl011/pl011.h>
 #include <driver/timer/sp804/sp804.h>
-#include <driver/serial/pl011/pl011.h>
 
 #include "rvpba8.h"
 #include "realview-pba8.h"

diff --git a/bsp/snowball/bsp.mk b/bsp/snowball/bsp.mk
@@ -15,4 +15,4 @@ C_SRC_FILES := \
 C_SRCS += $(addprefix $(SRC_DIR)/, $(C_SRC_FILES))
 
 include $(SRCROOT)/driver/timer/ste_mtu/module.mk
-include $(SRCROOT)/driver/serial/pl011/module.mk
+include $(SRCROOT)/driver/uart/pl011/module.mk
diff --git a/bsp/snowball/config.c b/bsp/snowball/config.c
@@ -39,9 +39,9 @@
 
 #include <device/timer.h>
 #include <device/sysctl.h>
-#include <device/serial.h>
+#include <device/uart.h>
 
-#include <driver/serial/pl011/pl011.h>
+#include <driver/uart/pl011/pl011.h>
 #include <driver/timer/ste_mtu/ste_mtu.h>
 
 #include "ap9500.h"

diff --git a/core/main.c b/core/main.c
@@ -40,7 +40,7 @@
 #include <boot/boot.h>
 
 #include <device/timer.h>
-#include <device/serial.h>
+#include <device/uart.h>
 
 #define SHELL_PROMPT "] "
 

diff --git a/driver/serial/pl011/module.mk → driver/uart/pl011/module.mk b/driver/serial/pl011/module.mk → driver/uart/pl011/module.mk
@@ -1,4 +1,4 @@
-SRC_DIR := $(SRCROOT)/driver/serial/pl011
+SRC_DIR := $(SRCROOT)/driver/uart/pl011
 
 C_SRC_FILES := \
 	pl011.c

diff --git a/driver/serial/pl011/pl011.c → driver/uart/pl011/pl011.c b/driver/serial/pl011/pl011.c → driver/uart/pl011/pl011.c
@@ -1,6 +1,6 @@
-/* PL011 serial driver
+/* PL011 UART driver
  *
- * Copyright (c) 2013, Brian McKenzie <mckenzba@gmail.com>
+ * Copyright (c) 2017, Brian McKenzie <mckenzba@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -34,7 +34,7 @@
 #include <sys/io.h>
 #include <sys/types.h>
 
-#include <device/serial.h>
+#include <device/uart.h>
 
 #include "pl011.h"
 
@@ -99,7 +99,7 @@ void pl011_rx_interrupt_mask(bool state)
 	pl011_cfg *config = &pl011_config;
 	addr_t base = config->base;
 
-	if (state == TRUE)
+	if (state == true)
 		writel((base + UART_IMSC), (UART_IMSC_RXMS));
 	else
 		writel((base + UART_IMSC), (UART_IMSC_RXMS & ~UART_IMSC_RXMS));
@@ -115,7 +115,7 @@ void pl011_tx_interrupt_mask(bool state)
 	pl011_cfg *config = &pl011_config;
 	addr_t base = config->base;
 
-	if (state == TRUE)
+	if (state == true)
 		writel((base + UART_IMSC), (UART_IMSC_TXMS));
 	else
 		writel((base + UART_IMSC), (UART_IMSC_TXMS & ~UART_IMSC_TXMS));

diff --git a/driver/serial/pl011/pl011.h → driver/uart/pl011/pl011.h b/driver/serial/pl011/pl011.h → driver/uart/pl011/pl011.h
diff --git a/include/device/serial.h → include/device/uart.h b/include/device/serial.h → include/device/uart.h
@@ -1,6 +1,6 @@
-/* Serial device api
+/* UART device api
  *
- * Copyright (c) 2013, Brian McKenzie <mckenzba@gmail.com>
+ * Copyright (c) 2017, Brian McKenzie <mckenzba@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -29,8 +29,8 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SERIAL_H
-#define SERIAL_H
+#ifndef UART_H
+#define UART_H
 
 #include <sys/types.h>
 
@@ -50,4 +50,4 @@ extern uint32_t serial_getc(void);
 extern void serial_putc(int c);
 extern void serial_puts(const char *str);
 
-#endif /* !SERIAL_H */
+#endif /* !UART_H */
diff --git a/lib/crt/stdio/printf.c b/lib/crt/stdio/printf.c
@@ -1,6 +1,6 @@
 /* Basic printf for xBoot
  *
- * Copyright (c) 2014, Brian McKenzie <mckenzba@gmail.com>
+ * Copyright (c) 2017, Brian McKenzie <mckenzba@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -39,7 +39,7 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include <device/serial.h>
+#include <device/uart.h>
 
 /* putc function to use */
 static void (*putchar)(int c);

diff --git a/lib/device/module.mk b/lib/device/module.mk
@@ -1,7 +1,7 @@
 SRC_DIR := $(SRCROOT)/lib/device
 
 C_SRC_FILES := \
-	serial.c \
+	uart.c \
 	sysctl.c \
 	timer.c \
 	nvram.c

diff --git a/lib/device/serial.c → lib/device/uart.c b/lib/device/serial.c → lib/device/uart.c
@@ -1,6 +1,6 @@
-/* Generic serial driver interface
+/* Generic UART driver interface
  *
- * Copyright (c) 2013, Brian McKenzie <mckenzba@gmail.com>
+ * Copyright (c) 2017, Brian McKenzie <mckenzba@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -30,7 +30,7 @@
  */
 
 #include <sys/types.h>
-#include <device/serial.h>
+#include <device/uart.h>
 
 extern serial_driver serial_drv;
 static serial_driver *serial = &serial_drv;

diff --git a/lib/shell/shell.c b/lib/shell/shell.c
@@ -35,7 +35,7 @@
 
 #include <shell.h>
 
-#include <device/serial.h>
+#include <device/uart.h>
 
 /**
  * shell_getline