Mirrors/libhermit
1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-09 00:00:03 +01:00
Code Issues Releases Wiki Activity

revise uart interface, remove obsolete code

Browse source
This commit is contained in:
Stefan Lankes 2017-06-02 20:08:42 +02:00
parent 2f278b345f
commit ab6dee0db7
5 changed files with 11 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/x86/kernel/uart.c
View file

@ -154,9 +154,6 @@ static int uart_config(void)
/* disable interrupts */
write_to_uart(UART_IER, 0);
/* DTR + RTS */
write_to_uart(UART_MCR, UART_MCR_DTR|UART_MCR_RTS);
/*
* 8bit word length
* 1 stop bit
@ -181,8 +178,6 @@ static int uart_config(void)
return 0;
}
extern const void kernel_start;
int uart_init(void)
{
if (is_uhyve())

10
arch/x86/loader/include/uart.h
View file

@ -34,17 +34,11 @@
extern "C" {
#endif
/** @brief Initialize UART output
*
* @return Returns 0 on success
*/
int uart_init(void);
/** @brief Initialize UART output without a device check
*
* @return Returns 0 on success
*/
int uart_early_init(char*);
int uart_init(const char*);
/** @brief Simple string output on a serial device.
*
@ -56,7 +50,7 @@ int uart_puts(const char *text);
/** @brief Simple character output on a serial device.
*
* @return The original input character casted to int
* @return The original input character casted to int
*/
int uart_putchar(unsigned char c);

1
arch/x86/loader/main.c
View file

@ -106,6 +106,7 @@ void main(void)
cmdline_size = strlen(cmdline);
}
// enable paging
page_init();
if (mb_info) {

2
arch/x86/loader/stdio.c
View file

@ -31,7 +31,7 @@
int koutput_init(void)
{
uart_early_init((char*) mb_info->cmdline);
uart_init((const char*) (size_t)mb_info->cmdline);
return 0;
}

61
arch/x86/loader/uart.c
View file

@ -150,9 +150,6 @@ static int uart_config(void)
/* disable interrupts */
write_to_uart(UART_IER, 0);
/* DTR + RTS */
write_to_uart(UART_MCR, UART_MCR_DTR|UART_MCR_RTS);
/*
* 8bit word length
* 1 stop bit
@ -177,65 +174,21 @@ static int uart_config(void)
return 0;
}
extern const void kernel_start;
int uart_early_init(char* cmdline)
int uart_init(const char* cmdline)
{
char* str = NULL;
char* str;
if (!cmdline || ((str = strstr(cmdline, "uart=io:")) == NULL)) {
// default value of our QEMU configuration
if (!uartport && cmdline && ((str = strstr(cmdline, "uart=io:")) != NULL))
uartport = strtol(str+8, (char **)NULL, 16);
if (!uartport)
uartport = DEFAULT_UART_PORT;
} else {
uartport = strtol(str+8, (char **)NULL, 16);
if (!uartport)
uartport = DEFAULT_UART_PORT;
}
// configure uart
return uart_config();
}
int uart_init(void)
{
if (uartport)
if (!uartport)
return 0;
#ifdef CONFIG_PCI
pci_info_t pci_info;
uint32_t bar = 0;
// Searching for Intel's UART device
if (pci_get_device_info(0x8086, 0x0936, &pci_info) == 0)
goto Lsuccess;
// Searching for Qemu's UART device
if (pci_get_device_info(0x1b36, 0x0002, &pci_info) == 0)
goto Lsuccess;
// Searching for Qemu's 2x UART device (pci-serial-2x)
if (pci_get_device_info(0x1b36, 0x0003, &pci_info) == 0)
goto Lsuccess;
// Searching for Qemu's 4x UART device (pci-serial-4x)
if (pci_get_device_info(0x1b36, 0x0004, &pci_info) == 0)
goto Lsuccess;
uartport = DEFAULT_UART_PORT;
return uart_config();
Lsuccess:
uartport = pci_info.base[bar];
//irq_install_handler(32+pci_info.irq, uart_handler);
kprintf("UART uses io address 0x%x\n", uartport);
// configure uart
return uart_config();
#else
// default value of our QEMU configuration
uartport = DEFAULT_UART_PORT;
// configure uart
return uart_config();
#endif
}
#endif