Elsewhere, the semantic of "write" is used differently: arch_uart_write(), i.e., writes a character array and not a single character.
Rename this function to write_character to make this obvious, and to prevent name clashes. Signed-off-by: Ralf Ramsauer <[email protected]> --- hypervisor/arch/arm-common/dbg-write.c | 2 +- hypervisor/arch/arm-common/include/asm/uart.h | 2 +- hypervisor/arch/arm-common/uart-8250.c | 4 ++-- hypervisor/arch/arm-common/uart-pl011.c | 4 ++-- hypervisor/arch/arm-common/uart-xuartps.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hypervisor/arch/arm-common/dbg-write.c b/hypervisor/arch/arm-common/dbg-write.c index e9e51a32..1c9e9dbc 100644 --- a/hypervisor/arch/arm-common/dbg-write.c +++ b/hypervisor/arch/arm-common/dbg-write.c @@ -36,7 +36,7 @@ static void arm_uart_write(const char *msg) cpu_relax(); if (panic_in_progress && panic_cpu != phys_processor_id()) break; - uart->write(uart, c); + uart->write_character(uart, c); } } diff --git a/hypervisor/arch/arm-common/include/asm/uart.h b/hypervisor/arch/arm-common/include/asm/uart.h index 2b0d9484..5c6b99fe 100644 --- a/hypervisor/arch/arm-common/include/asm/uart.h +++ b/hypervisor/arch/arm-common/include/asm/uart.h @@ -23,7 +23,7 @@ struct uart_chip { void (*init)(struct uart_chip *chip); bool (*is_busy)(struct uart_chip *chip); - void (*write)(struct uart_chip *chip, char c); + void (*write_character)(struct uart_chip *chip, char c); }; extern struct uart_chip uart_8250_ops, uart_pl011_ops, uart_xuartps_ops; diff --git a/hypervisor/arch/arm-common/uart-8250.c b/hypervisor/arch/arm-common/uart-8250.c index 8d24487f..fadde0a5 100644 --- a/hypervisor/arch/arm-common/uart-8250.c +++ b/hypervisor/arch/arm-common/uart-8250.c @@ -50,7 +50,7 @@ static bool uart_is_busy(struct uart_chip *chip) return !(mmio_read32(chip->virt_base + UART_LSR) & UART_LSR_THRE); } -static void uart_write(struct uart_chip *chip, char c) +static void uart_write_character(struct uart_chip *chip, char c) { mmio_write32(chip->virt_base + UART_TX, c); } @@ -58,5 +58,5 @@ static void uart_write(struct uart_chip *chip, char c) struct uart_chip uart_8250_ops = { .init = uart_init, .is_busy = uart_is_busy, - .write = uart_write, + .write_character = uart_write_character, }; diff --git a/hypervisor/arch/arm-common/uart-pl011.c b/hypervisor/arch/arm-common/uart-pl011.c index 1ae95deb..df12f005 100644 --- a/hypervisor/arch/arm-common/uart-pl011.c +++ b/hypervisor/arch/arm-common/uart-pl011.c @@ -58,7 +58,7 @@ static bool uart_is_busy(struct uart_chip *chip) (UARTFR_TXFF | UARTFR_BUSY)) != 0; } -static void uart_write(struct uart_chip *chip, char c) +static void uart_write_character(struct uart_chip *chip, char c) { mmio_write32(chip->virt_base + UARTDR, c); } @@ -66,5 +66,5 @@ static void uart_write(struct uart_chip *chip, char c) struct uart_chip uart_pl011_ops = { .init = uart_init, .is_busy = uart_is_busy, - .write = uart_write, + .write_character = uart_write_character, }; diff --git a/hypervisor/arch/arm-common/uart-xuartps.c b/hypervisor/arch/arm-common/uart-xuartps.c index 4bb2b7c4..92438f0b 100644 --- a/hypervisor/arch/arm-common/uart-xuartps.c +++ b/hypervisor/arch/arm-common/uart-xuartps.c @@ -26,7 +26,7 @@ static bool uart_is_busy(struct uart_chip *chip) return !(mmio_read32(chip->virt_base + UART_SR) & UART_SR_TXEMPTY); } -static void uart_write(struct uart_chip *chip, char c) +static void uart_write_character(struct uart_chip *chip, char c) { mmio_write32(chip->virt_base + UART_FIFO, c); } @@ -34,5 +34,5 @@ static void uart_write(struct uart_chip *chip, char c) struct uart_chip uart_xuartps_ops = { .init = uart_init, .is_busy = uart_is_busy, - .write = uart_write, + .write_character = uart_write_character, }; -- 2.11.1 -- 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 [email protected]. For more options, visit https://groups.google.com/d/optout.
