j3d1/open-ameba
1
0
Fork 0
mirror of https://github.com/drasko/open-ameba.git synced 2024-11-22 05:54:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix set UART BaudRate

Browse source
This commit is contained in:
pvvx 2017-02-16 08:10:52 +03:00
parent 3f4d5c4454
commit c8ebe27a6b
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RTL00_SDKV35a/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_uart.h
View file

@ -223,7 +223,7 @@ typedef enum {
#define UART_OVSR_POOL_MAX 2090 #define UART_OVSR_POOL_MAX 2090
#define DIVISOR_RESOLUTION 10 #define DIVISOR_RESOLUTION 10
#define JITTER_LIMIT 100 #define JITTER_LIMIT 100
#define UART_SCLK (200000000*5/12) #define UART_SCLK ((HAL_SYS_CTRL_READ32(REG_SYS_SYSPLL_CTRL1) & (1<<17))? (100000000) : (200000000*5/12))
typedef struct _RUART_SPEED_SETTING_ { typedef struct _RUART_SPEED_SETTING_ {
u32 BaudRate; u32 BaudRate;

21
RTL00_SDKV35a/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_uart.c
View file

@ -154,7 +154,7 @@ HalRuartGenBaudRateRtl8195a(
u32 uart_ovsr_mod; u32 uart_ovsr_mod;
u32 min_uart_ovsr; // ovsr with mini err u32 min_uart_ovsr; // ovsr with mini err
u32 min_uart_ovsr_mod; u32 min_uart_ovsr_mod;
u32 uart_clock; u64 uart_clock;
u32 divisor_temp; u32 divisor_temp;
u32 max_jitter_temp; u32 max_jitter_temp;
u32 err_temp; u32 err_temp;
@ -168,17 +168,17 @@ HalRuartGenBaudRateRtl8195a(
baud_rate = pBaudSetting->BaudRate; baud_rate = pBaudSetting->BaudRate;
if (baud_rate >= 1000000) { if (baud_rate >= 1000000) {
baud_rate /= 100; baud_rate /= 100;
uart_clock = pBaudSetting->sclk; uart_clock = (u64)pBaudSetting->sclk;
} else { } else {
baud_rate /= 2; baud_rate /= 2;
uart_clock = pBaudSetting->sclk*50; // UART clock is 1/2 CPU clock uart_clock = (u64)pBaudSetting->sclk * 50; // UART clock is 1/2 CPU clock
} }
div_res = pBaudSetting->divisor_resolution; div_res = pBaudSetting->divisor_resolution;
while ((min_err > pBaudSetting->max_err) && (div_res > 0)) { while ((min_err > pBaudSetting->max_err) && (div_res > 0)) {
uart_ovsr = pBaudSetting->Ovsr_max; uart_ovsr = pBaudSetting->Ovsr_max;
while(uart_ovsr >= pBaudSetting->Ovsr_min) { while(uart_ovsr >= pBaudSetting->Ovsr_min) {
divisor_temp = ((uart_clock/baud_rate)/uart_ovsr); divisor_temp = (uart_clock/baud_rate)/uart_ovsr;
max_jitter_temp = 0; max_jitter_temp = 0;
if (divisor_temp > 0) { if (divisor_temp > 0) {
max_jitter_temp = 100000/uart_ovsr; max_jitter_temp = 100000/uart_ovsr;
@ -242,8 +242,8 @@ HalRuartGenBaudRateRtl8195a(
pBaudSetting->Ovsr_adj = ovsr_adj; pBaudSetting->Ovsr_adj = ovsr_adj;
pBaudSetting->Ovsr_adj_bits = adj_bits; pBaudSetting->Ovsr_adj_bits = adj_bits;
DBG_UART_INFO("HalRuartGenBaudRateRtl8195a: BaudRate=%d ovsr=%d divisor=%d ovsr_adj=0x%x\r\n", DBG_UART_INFO("%sBaudRateRtl8195a: BaudRate:%d Divisor:%d Ovsr:%d Ovsr_ADj:0x%x\n",
pBaudSetting->BaudRate, uart_ovsrs_actual, min_divisor, ovsr_adj); "HalRuartGen", pBaudSetting->BaudRate, min_divisor, uart_ovsrs_actual, ovsr_adj);
return HAL_OK; return HAL_OK;
} }
@ -380,7 +380,7 @@ HalRuartSetBaudRateRtl8195a(
} }
is_defined_baud = 0; is_defined_baud = 0;
if (pHalRuartAdapter->pDefaultBaudRateTbl != NULL) { if (pHalRuartAdapter->pDefaultBaudRateTbl != NULL) {
i = 0; i = 0;
while (pHalRuartAdapter->pDefaultBaudRateTbl[i] < 0xffffffff) { while (pHalRuartAdapter->pDefaultBaudRateTbl[i] < 0xffffffff) {
@ -409,6 +409,8 @@ HalRuartSetBaudRateRtl8195a(
// Verify again // Verify again
cpu_clk = UART_SCLK; cpu_clk = UART_SCLK;
baud_rate_temp = cpu_clk/Ovsr/Divisor; baud_rate_temp = cpu_clk/Ovsr/Divisor;
// DBG_8195A("baud_rate_temp %d\n", baud_rate_temp);
if (baud_rate_temp > pHalRuartAdapter->BaudRate) { if (baud_rate_temp > pHalRuartAdapter->BaudRate) {
err = baud_rate_temp - pHalRuartAdapter->BaudRate; err = baud_rate_temp - pHalRuartAdapter->BaudRate;
} else { } else {
@ -478,8 +480,9 @@ HalRuartSetBaudRateRtl8195a(
UartIndex = pHalRuartAdapter->UartIndex; UartIndex = pHalRuartAdapter->UartIndex;
DBG_UART_INFO("HalRuartSetBaudRateRtl8195a: BaudRate:%d Divisor:%d Ovsr:%d Ovsr_ADj:0x%x\n", DBG_UART_INFO("%sBaudRateRtl8195a: BaudRate:%d Divisor:%d Ovsr:%d Ovsr_ADj:0x%x\n",
pHalRuartAdapter->BaudRate, Divisor, Ovsr, Ovsr_adj); "HalRuartSet", pHalRuartAdapter->BaudRate, Divisor, Ovsr, Ovsr_adj);
DBG_UART_INFO("RealBaudRate: %d\n", RuartSpeedSetting.sclk/Divisor/Ovsr);
Dll = Divisor & 0xFF; Dll = Divisor & 0xFF;
Dlm = (Divisor & 0xFF00) >> 8; Dlm = (Divisor & 0xFF00) >> 8;