From 3ebbca6ad64f2d02e6cb906c128f8e9e49aa69d9 Mon Sep 17 00:00:00 2001 From: Elizabeth Liner Date: Tue, 11 Oct 2016 11:16:33 -0500 Subject: Adding interface changes to provide UART information to HDAT Change-Id: I2e1a79509065177b4047ce7befe9cbbca5210255 RTC:161647 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30998 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: VENKATESH SAINATH Reviewed-by: William G. Hoffa Reviewed-by: Matthew A. Ploetz --- src/usr/console/ast2400.C | 9 +-------- src/usr/console/uart.C | 9 ++++++++- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/usr/console') diff --git a/src/usr/console/ast2400.C b/src/usr/console/ast2400.C index c56bf02c4..5e8c0bcb2 100644 --- a/src/usr/console/ast2400.C +++ b/src/usr/console/ast2400.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2015 */ +/* Contributors Listed Below - COPYRIGHT 2014,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -39,13 +39,6 @@ namespace CONSOLE const uint32_t VUART1_ADDRL = VUART1_BASE + 0x28; const uint32_t VUART1_ADDRH = VUART1_BASE + 0x2c; - const uint8_t SERIAL_IRQ = 4; - - // Host SerlIRQ interrupt type for SUART1 - const uint8_t RESERVED = 0x00; - const uint8_t LOW_LEVEL_TRIG = 0x01; - const uint8_t RISING_EDGE_TRIG = 0x02; - const uint8_t HIGH_LEVEL_TRIG = 0x03; // used to test config flags related to console output selection const uint8_t CONFIG_MASK = 0xC0; diff --git a/src/usr/console/uart.C b/src/usr/console/uart.C index e282fd834..23c82c5b4 100644 --- a/src/usr/console/uart.C +++ b/src/usr/console/uart.C @@ -226,8 +226,15 @@ namespace CONSOLE */ UartInfo_t getUartInfo(void) { - //@TODO-RTC:161647-Fill in information for HDAT UartInfo_t l_info; + + l_info.lpcBaseAddr = g_uartBase; + l_info.lpcSize = sizeof(uint8_t); + l_info.clockFreqHz = g_uartClock; + l_info.freqHz = g_uartBaud; + l_info.interruptNum = SERIAL_IRQ; + l_info.interruptTrigger = LOW_LEVEL_TRIG; + return l_info; }; } -- cgit v1.2.3