github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-10-08 18:25:05 +00:00
Code Issues Projects Releases Wiki Activity

HV: vuart: remove console related code from vuart

Browse Source 
Move the console related code from dm/vuart.c to debug/console.c as
console is not supported in release version.

Tracked-On: #2987
Signed-off-by: Conghui Chen <conghui.chen@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Conghui Chen
2019-04-29 14:37:58 +08:00
committed by ACRN System Integration
parent 513c9f8744
commit c61db6ffa0
4 changed files with 90 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
hypervisor/debug/console.c
View File

@@ -11,10 +11,15 @@
#include <timer.h>
#include <vuart.h>
#include <logmsg.h>
#include <acrn_hv_defs.h>
#include <vm.h>
struct hv_timer console_timer;
#define CONSOLE_KICK_TIMER_TIMEOUT 40UL /* timeout is 40ms*/
/* Switching key combinations for shell and uart console */
#define GUEST_CONSOLE_TO_HV_SWITCH_KEY 0 /* CTRL + SPACE */
uint16_t console_vmid = ACRN_INVALID_VMID;
void console_init(void)
{
@@ -37,6 +42,67 @@ char console_getc(void)
return uart16550_getc();
}
/*
* @post return != NULL
*/
struct acrn_vuart *vm_console_vuart(struct acrn_vm *vm)
{
return &vm->vuart[0];
}
/**
* @pre vu != NULL
* @pre vu->active == true
*/
void vuart_console_rx_chars(struct acrn_vuart *vu)
{
char ch = -1;
/* Get data from physical uart */
ch = uart16550_getc();
if (ch == GUEST_CONSOLE_TO_HV_SWITCH_KEY) {
/* Switch the console */
console_vmid = ACRN_INVALID_VMID;
printf("\r\n\r\n ---Entering ACRN SHELL---\r\n");
}
if (ch != -1) {
vuart_putchar(vu, ch);
vuart_toggle_intr(vu);
}
}
/**
* @pre vu != NULL
*/
void vuart_console_tx_chars(struct acrn_vuart *vu)
{
char c;
while ((c = vuart_getchar(vu)) != -1) {
printf("%c", c);
}
}
struct acrn_vuart *vuart_console_active(void)
{
struct acrn_vm *vm = NULL;
struct acrn_vuart *vu = NULL;
if (console_vmid < CONFIG_MAX_VM_NUM) {
vm = get_vm_from_vmid(console_vmid);
if (is_valid_vm(vm)) {
vu = vm_console_vuart(vm);
} else {
/* Console vm is invalid, switch back to HV-Shell */
console_vmid = ACRN_INVALID_VMID;
}
}
return (vu && vu->active) ? vu : NULL;
}
static void console_timer_callback(__unused void *data)
{
struct acrn_vuart *vu;