Skip to content

fix for issue "serial example callback not working" #6009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 14, 2018
Merged

fix for issue "serial example callback not working" #6009

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b89ef1f
fix for serial issue #5805
prashantrar Feb 4, 2018
011dbff
Fixing coding style
prashantrar Feb 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 62 additions & 25 deletions targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/serial_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,13 @@ static HAL_GDMA_OP UartGdmaOp;

#ifdef CONFIG_MBED_ENABLED
#include "log_uart_api.h"
#include "hal_log_uart.h"
int stdio_uart_inited = 0;
serial_t stdio_uart;
log_uart_t stdio_uart_log;
static uint32_t serial_log_irq_ids;
static uart_irq_handler log_irq_handler;
static uint32_t serial_log_irq_en;
#endif

static void SerialTxDoneCallBack(VOID *pAdapter);
Expand Down Expand Up @@ -99,7 +103,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
return;
}
#ifdef CONFIG_MBED_ENABLED
else if(uart_idx == UART_3){
else if (uart_idx == UART_3) {
obj->index = UART_3;
goto init_stdio;
}
Expand Down Expand Up @@ -158,11 +162,11 @@ void serial_free(serial_t *obj)
{
PHAL_RUART_ADAPTER pHalRuartAdapter;
#ifdef CONFIG_GDMA_EN
u8 uart_idx;
u8 uart_idx;
PUART_DMA_CONFIG pHalRuartDmaCfg;
#endif
#ifdef CONFIG_MBED_ENABLED
if(obj->index == UART_3){
if (obj->index == UART_3) {
log_uart_free(&stdio_uart_log);
return;
}
Expand All @@ -189,7 +193,7 @@ void serial_free(serial_t *obj)
void serial_baud(serial_t *obj, int baudrate)
{
#ifdef CONFIG_MBED_ENABLED
if(obj->index == UART_3){
if (obj->index == UART_3) {
return;
}
#endif
Expand All @@ -204,7 +208,7 @@ void serial_baud(serial_t *obj, int baudrate)
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits)
{
#ifdef CONFIG_MBED_ENABLED
if(obj->index == UART_3){
if (obj->index == UART_3) {
log_uart_format(&stdio_uart_log, data_bits, parity, stop_bits);
return;
}
Expand Down Expand Up @@ -271,30 +275,64 @@ static void SerialRxDoneCallBack(VOID *pAdapter)
}
}


#ifdef CONFIG_MBED_ENABLED
static void serial_loguart_irq_handler(uint32_t id, LOG_UART_INT_ID event)
{
if (event == IIR_RX_RDY || event == IIR_CHAR_TIMEOUT)
{
if (log_irq_handler) {
log_irq_handler(serial_log_irq_ids, RxIrq);
}
} else if (event == IIR_THR_EMPTY) {
if (log_irq_handler) {
log_irq_handler(serial_log_irq_ids, TxIrq);
}
}
return;
}
#endif



void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id)
{

#ifdef CONFIG_MBED_ENABLED
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why CONFIG_MBED_ENABLED is here needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have just updated the description

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

The "CONFIG_MBED_ENABLED" macro has been put so that the software is compatible with our own internal SDK.

I can see it is used in this file. I just do not follow how is it used. If config is enabled then what changes ? Why serial_api.c depends on the config enabled?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are reusing the same file in our internal SDK and within realtek, we are trying to maintain one single repository structure for all projects so when we build our SDK, it would refer to this same file. Our loguart is slightly different in nature and hence the changes

if (obj->index == UART_3) {
log_irq_handler = handler;
serial_log_irq_ids = id;
log_uart_irq_handler(&stdio_uart_log, serial_loguart_irq_handler, id);
return;
}
#endif
PHAL_RUART_ADAPTER pHalRuartAdapter;
u8 uart_idx;

pHalRuartAdapter = &(obj->hal_uart_adp);
pHalRuartAdapter = &(obj->hal_uart_adp);
uart_idx = pHalRuartAdapter->UartIndex;

irq_handler[uart_idx] = handler;
serial_irq_ids[uart_idx] = id;

serial_irq_ids[uart_idx] = id;
pHalRuartAdapter->TxTDCallback = SerialTxDoneCallBack;
pHalRuartAdapter->TxTDCbPara = (void*)pHalRuartAdapter;
pHalRuartAdapter->RxDRCallback = SerialRxDoneCallBack;
pHalRuartAdapter->RxDRCbPara = (void*)pHalRuartAdapter;
}


void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable)
{
#ifdef CONFIG_MBED_ENABLED
if (obj->index == UART_3) {
if (irq == RxIrq) {
log_uart_irq_set(&stdio_uart_log, IIR_RX_RDY, enable);
} else {
log_uart_irq_set(&stdio_uart_log, IIR_THR_EMPTY, enable);
}
return;
}
#endif
PHAL_RUART_ADAPTER pHalRuartAdapter;
PHAL_RUART_OP pHalRuartOp;
u8 uart_idx;

pHalRuartAdapter = &(obj->hal_uart_adp);
pHalRuartOp = &(obj->hal_uart_op);
uart_idx = pHalRuartAdapter->UartIndex;
Expand All @@ -304,10 +342,12 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable)
pHalRuartAdapter->Interrupts |= RUART_IER_ERBI | RUART_IER_ELSI;
serial_irq_en[uart_idx] |= SERIAL_RX_IRQ_EN;
HalRuartSetIMRRtl8195a (pHalRuartAdapter);
} else {
} else {
serial_irq_en[uart_idx] |= SERIAL_TX_IRQ_EN;
}

pHalRuartOp->HalRuartRegIrq(pHalRuartAdapter);
//log_uart
pHalRuartOp->HalRuartIntEnable(pHalRuartAdapter);
} else { // disable
if (irq == RxIrq) {
Expand All @@ -318,6 +358,7 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable)
serial_irq_en[uart_idx] &= ~SERIAL_TX_IRQ_EN;
}
HalRuartSetIMRRtl8195a (pHalRuartAdapter);

if (pHalRuartAdapter->Interrupts == 0) {
InterruptUnRegister(&pHalRuartAdapter->IrqHandle);
InterruptDis(&pHalRuartAdapter->IrqHandle);
Expand All @@ -332,7 +373,7 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable)
int serial_getc(serial_t *obj)
{
#ifdef CONFIG_MBED_ENABLED
if(obj->index == UART_3){
if (obj->index == UART_3) {
return log_uart_getc(&stdio_uart_log);
}
#endif
Expand All @@ -346,7 +387,7 @@ int serial_getc(serial_t *obj)
void serial_putc(serial_t *obj, int c)
{
#ifdef CONFIG_MBED_ENABLED
if(obj->index == UART_3){
if (obj->index == UART_3) {
log_uart_putc(&stdio_uart_log, (char)c);
return;
}
Expand All @@ -367,7 +408,7 @@ void serial_putc(serial_t *obj, int c)
int serial_readable(serial_t *obj)
{
#ifdef CONFIG_MBED_ENABLED
if(obj->index == UART_3){
if (obj->index == UART_3) {
return log_uart_readable(&stdio_uart_log);
}
#endif
Expand All @@ -385,16 +426,15 @@ int serial_readable(serial_t *obj)
int serial_writable(serial_t *obj)
{
#ifdef CONFIG_MBED_ENABLED
if(obj->index == UART_3){
if (obj->index == UART_3) {
return log_uart_writable(&stdio_uart_log);
}
#endif

PHAL_RUART_ADAPTER pHalRuartAdapter=(PHAL_RUART_ADAPTER)&(obj->hal_uart_adp);
u8 uart_idx = pHalRuartAdapter->UartIndex;

if (HAL_RUART_READ32(uart_idx, RUART_LINE_STATUS_REG_OFF) &
(RUART_LINE_STATUS_REG_THRE)) {
if (HAL_RUART_READ32(uart_idx, RUART_LINE_STATUS_REG_OFF) & (RUART_LINE_STATUS_REG_THRE)) {
return 1;
} else {
return 0;
Expand All @@ -404,7 +444,7 @@ int serial_writable(serial_t *obj)
void serial_clear(serial_t *obj)
{
#ifdef CONFIG_MBED_ENABLED
if(obj->index == UART_3){
if (obj->index == UART_3) {
log_uart_clear(&stdio_uart_log);
return;
}
Expand All @@ -419,7 +459,7 @@ void serial_clear(serial_t *obj)
void serial_break_set(serial_t *obj)
{
#ifdef CONFIG_MBED_ENABLED
if(obj->index == UART_3){
if (obj->index == UART_3) {
log_uart_break_set(&stdio_uart_log);
return;
}
Expand All @@ -428,7 +468,6 @@ void serial_break_set(serial_t *obj)
PHAL_RUART_ADAPTER pHalRuartAdapter=(PHAL_RUART_ADAPTER)&(obj->hal_uart_adp);
u8 uart_idx = pHalRuartAdapter->UartIndex;
u32 RegValue;

RegValue = HAL_RUART_READ32(uart_idx, RUART_LINE_CTL_REG_OFF);
RegValue |= BIT_UART_LCR_BREAK_CTRL;
HAL_RUART_WRITE32(uart_idx, RUART_LINE_CTL_REG_OFF, RegValue);
Expand All @@ -437,16 +476,14 @@ void serial_break_set(serial_t *obj)
void serial_break_clear(serial_t *obj)
{
#ifdef CONFIG_MBED_ENABLED
if(obj->index == UART_3){
if (obj->index == UART_3) {
log_uart_break_clear(&stdio_uart_log);
return;
}
#endif

PHAL_RUART_ADAPTER pHalRuartAdapter=(PHAL_RUART_ADAPTER)&(obj->hal_uart_adp);
u8 uart_idx = pHalRuartAdapter->UartIndex;
u32 RegValue;

RegValue = HAL_RUART_READ32(uart_idx, RUART_LINE_CTL_REG_OFF);
RegValue &= ~(BIT_UART_LCR_BREAK_CTRL);
HAL_RUART_WRITE32(uart_idx, RUART_LINE_CTL_REG_OFF, RegValue);
Expand Down