diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/usr/console/uartif.H | 22 | ||||
| -rw-r--r-- | src/usr/console/ast2400.C | 9 | ||||
| -rw-r--r-- | src/usr/console/uart.C | 9 |
3 files changed, 24 insertions, 16 deletions
diff --git a/src/include/usr/console/uartif.H b/src/include/usr/console/uartif.H index 8cbd0c0ff..768e0d45b 100644 --- a/src/include/usr/console/uartif.H +++ b/src/include/usr/console/uartif.H @@ -31,18 +31,26 @@ namespace CONSOLE { + 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; + /** * Structure to return UART information in */ struct UartInfo_t { - //@TODO-RTC:161647-Add more details/comments - uint64_t lpcBaseAddr; - uint32_t lpcSize; - uint32_t clockFreqHz; - uint32_t freqHz; - uint8_t interruptNum; - uint8_t interruptTrigger; + uint64_t lpcBaseAddr; //< Base address of the UART device the LPC bus + uint32_t lpcSize; //< Size of the UART device address space on LPC bus + uint32_t clockFreqHz; //< Clock Frequency of the UART baud clock in Hz + uint32_t freqHz; //< Current baud rate of the UART device + uint8_t interruptNum; //< UART Interrupt Number + uint8_t interruptTrigger; //< UART trigger type + //< 0x01: low level, 0x02: rising edge, 0x03: high level }; /** 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; }; } |
