mirror of
https://github.com/projectacrn/acrn-hypervisor.git
synced 2025-09-11 21:59:26 +00:00
hv:cleanup console.h
--move several uart API declarations from console.h to uart16550.h --move several shell API declarations from console.h to shell.h --add dbg_cmd.h, move 'handle_dbg_cmd' declaration from console.h to dbg_cmd.h --move debug/uart16550.h to include/debug/uart16550.h since some uart APIs will be called by external files Tracked-On: #1842 Signed-off-by: Mingqiang Chi <mingqiang.chi@intel.com> Reviewed-by: Eddie Dong <eddie.dong@intel.com> modified: arch/x86/guest/vm.c modified: arch/x86/init.c modified: bsp/uefi/cmdline.c modified: debug/console.c modified: debug/dbg_cmd.c modified: debug/uart16550.c modified: debug/vuart.c modified: hw/pci.c modified: include/arch/x86/multiboot.h modified: include/debug/console.h new file: include/debug/dbg_cmd.h new file: include/debug/shell.h renamed: debug/uart16550.h -> include/debug/uart16550.h
This commit is contained in:
Mingqiang Chi
wenlingz
@@ -38,15 +38,8 @@ void console_putc(const char *ch);
|
||||
char console_getc(void);
|
||||
|
||||
void console_setup_timer(void);
|
||||
void uart16550_set_property(bool enabled, bool port_mapped, uint64_t base_addr);
|
||||
bool is_pci_dbg_uart(union pci_bdf bdf_value);
|
||||
bool is_dbg_uart_enabled(void);
|
||||
|
||||
void shell_init(void);
|
||||
void shell_kick(void);
|
||||
|
||||
void suspend_console(void);
|
||||
void resume_console(void);
|
||||
|
||||
bool handle_dbg_cmd(const char *cmd, int32_t len);
|
||||
#endif /* CONSOLE_H */
|
||||
|
||||
12
hypervisor/include/debug/dbg_cmd.h
Normal file
12
hypervisor/include/debug/dbg_cmd.h
Normal file
@@ -0,0 +1,12 @@
|
||||
/*
|
||||
* Copyright (C) 2018 Intel Corporation. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#ifndef DBG_CMD_H
|
||||
#define DBG_CMD_H
|
||||
|
||||
bool handle_dbg_cmd(const char *cmd, int32_t len);
|
||||
|
||||
#endif /* DBG_CMD_H */
|
||||
13
hypervisor/include/debug/shell.h
Normal file
13
hypervisor/include/debug/shell.h
Normal file
@@ -0,0 +1,13 @@
|
||||
/*
|
||||
* Copyright (C) 2018 Intel Corporation. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#ifndef SHELL_H
|
||||
#define SHELL_H
|
||||
|
||||
void shell_init(void);
|
||||
void shell_kick(void);
|
||||
|
||||
#endif /* SHELL_H */
|
||||
116
hypervisor/include/debug/uart16550.h
Normal file
116
hypervisor/include/debug/uart16550.h
Normal file
@@ -0,0 +1,116 @@
|
||||
/*
|
||||
* Copyright (C) 2018 Intel Corporation. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#ifndef UART16550_H
|
||||
#define UART16550_H
|
||||
|
||||
/* Register / bit definitions for 16c550 uart */
|
||||
/*receive buffer register | base+00h, dlab=0b r*/
|
||||
#define UART16550_RBR 0x00U
|
||||
/*transmit holding register | base+00h, dlab=0b w*/
|
||||
#define UART16550_THR 0x00U
|
||||
/*divisor least significant byte | base+00h, dlab=1b rw*/
|
||||
#define UART16550_DLL 0x00U
|
||||
/*interrupt enable register | base+01h, dlab=0b rw*/
|
||||
#define UART16550_IER 0x01U
|
||||
/*divisor most significant byte | base+01h, dlab=1b rw*/
|
||||
#define UART16550_DLM 0x01U
|
||||
/*interrupt identification register | base+02h, dlab=0b r*/
|
||||
#define UART16550_IIR 0x02U
|
||||
/*fifo control register | base+02h, dlab=0b w*/
|
||||
#define UART16550_FCR 0x02U
|
||||
/*line control register | base+03h, dlab=xb rw*/
|
||||
#define UART16550_LCR 0x03U
|
||||
/*modem control register, only uart0 | base+04h, dlab=xb rw*/
|
||||
#define UART16550_MCR 0x04U
|
||||
/*line status register | base+05h, dlab=xb r*/
|
||||
#define UART16550_LSR 0x05U
|
||||
/*modem status register, only uart0 | base+06h, dlab=xb r*/
|
||||
#define UART16550_MSR 0x06U
|
||||
/*scratch pad register | base+07h, dlab=xb rw*/
|
||||
#define UART16550_SCR 0x07U
|
||||
|
||||
/* value definitions for IIR */
|
||||
#define IIR_FIFO_MASK 0xc0U /* set if FIFOs are enabled */
|
||||
#define IIR_RXTOUT 0x0cU
|
||||
#define IIR_RLS 0x06U
|
||||
#define IIR_RXRDY 0x04U
|
||||
#define IIR_TXRDY 0x02U
|
||||
#define IIR_NOPEND 0x01U
|
||||
#define IIR_MLSC 0x00U
|
||||
|
||||
#define IER_EDSSI (0x0008U)
|
||||
/*enable/disable modem status interrupt*/
|
||||
#define IER_ELSI (0x0004U)
|
||||
/*enable/disable receive data error interrupt*/
|
||||
#define IER_ETBEI (0x0002U)
|
||||
/*enable/disable transmit data write request interrupt*/
|
||||
#define IER_ERBFI (0x0001U)
|
||||
/*enable/disable receive data read request interrupt*/
|
||||
|
||||
/* definition for LCR */
|
||||
#define LCR_DLAB (1U << 7U) /*DLAB THR/RBR&IER or DLL&DLM= Bit 7*/
|
||||
#define LCR_SB (1U << 6U) /*break control on/off= Bit 6*/
|
||||
#define LCR_SP (1U << 5U) /*Specifies the operation of parity bit*/
|
||||
#define LCR_EPS (1U << 4U) /*Specifies the logic of a parity bit*/
|
||||
#define LCR_PEN (1U << 3U) /*Specifies whether to add a parity bit*/
|
||||
#define LCR_STB (1U << 2U) /*stop bit length*/
|
||||
#define LCR_WL8 (0x03U) /*number of bits of serial data*/
|
||||
#define LCR_WL7 (0x02U) /*number of bits of serial data*/
|
||||
#define LCR_WL6 (0x01U) /*number of bits of serial data*/
|
||||
#define LCR_WL5 (0x00U) /*number of bits of serial data*/
|
||||
#define LCR_PARITY_ODD (LCR_PEN)
|
||||
#define LCR_PARITY_NONE 0x0U
|
||||
#define LCR_PARITY_EVEN (LCR_PEN | LCR_EPS)
|
||||
#define LCR_NB_STOP_BITS_1 0x0U
|
||||
#define LCR_NB_STOP_BITS_2 (LCR_STB)
|
||||
|
||||
/* bit definitions for LSR */
|
||||
/* at least one error in data within fifo */
|
||||
#define LSR_ERR (1U << 7U)
|
||||
/* Transmit data Present */
|
||||
#define LSR_TEMT (1U << 6U)
|
||||
/* Transmit data write request present */
|
||||
#define LSR_THRE (1U << 5U)
|
||||
/* Break interrupt data Present */
|
||||
#define LSR_BI (1U << 4U)
|
||||
/* Framing Error Occurred */
|
||||
#define LSR_FE (1U << 3U)
|
||||
/* Parity Error Occurred */
|
||||
#define LSR_PE (1U << 2U)
|
||||
/* Overrun error */
|
||||
#define LSR_OE (1U << 1U)
|
||||
/* Readable received data is present */
|
||||
#define LSR_DR (1U << 0U)
|
||||
|
||||
/* definition for MCR */
|
||||
#define MCR_RTS (1U << 1U) /* Request to Send */
|
||||
#define MCR_DTR (1U << 0U) /* Data Terminal Ready */
|
||||
|
||||
/* definition for FCR */
|
||||
#define FCR_RX_MASK 0xc0U
|
||||
#define FCR_DMA (1U << 3U)
|
||||
#define FCR_TFR (1U << 2U) /* Reset Transmit Fifo */
|
||||
#define FCR_RFR (1U << 1U) /* Reset Receive Fifo */
|
||||
#define FCR_FIFOE (1U << 0U) /* Fifo Enable */
|
||||
|
||||
#define UART_IER_DISABLE_ALL 0x00000000U
|
||||
|
||||
#define BAUD_9600 9600U
|
||||
#define BAUD_115200 115200U
|
||||
#define BAUD_460800 460800U
|
||||
|
||||
/* UART oscillator clock */
|
||||
#define UART_CLOCK_RATE 1843200U /* 1.8432 MHz */
|
||||
|
||||
void uart16550_init(void);
|
||||
char uart16550_getc(void);
|
||||
size_t uart16550_puts(const char *buf, uint32_t len);
|
||||
void uart16550_set_property(bool enabled, bool port_mapped, uint64_t base_addr);
|
||||
bool is_pci_dbg_uart(union pci_bdf bdf_value);
|
||||
bool is_dbg_uart_enabled(void);
|
||||
|
||||
#endif /* !UART16550_H */
|
||||
Reference in New Issue
Block a user