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

update

Browse source
This commit is contained in:
pvvx 2017-09-06 20:20:53 +03:00
parent c98cbe6e00
commit 9ffd9dac1a
27 changed files with 113 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
USDK/component/common/drivers/wlan/realtek/src/osdep/lwip_intf.c
View file

@ -133,13 +133,13 @@ void rltk_wlan_recv(int idx, struct eth_drv_sg *sg_list, int sg_len)
DBG_TRACE("%s is called", __FUNCTION__); DBG_TRACE("%s is called", __FUNCTION__);
if (rltk_wlan_check_isup(idx) == 0)
return;
if(idx == -1){ if(idx == -1){
DBG_ERR("skb is NULL"); DBG_ERR("skb is NULL");
return; return;
} }
if (rltk_wlan_check_isup(idx) == 0)
return;
skb = rltk_wlan_get_recv_skb(idx); skb = rltk_wlan_get_recv_skb(idx);
DBG_ASSERT(skb, "No pending rx skb"); DBG_ASSERT(skb, "No pending rx skb");

4
USDK/component/common/mbed/hal/gpio_irq_api.h
View file

@ -27,7 +27,9 @@ extern "C" {
typedef enum { typedef enum {
IRQ_NONE, IRQ_NONE,
IRQ_RISE, IRQ_RISE,
IRQ_FALL IRQ_FALL,
IRQ_LOW,
IRQ_HIGH
} gpio_irq_event; } gpio_irq_event;
typedef void (*gpio_irq_handler)(uint32_t id, gpio_irq_event event); typedef void (*gpio_irq_handler)(uint32_t id, gpio_irq_event event);

5
USDK/component/common/mbed/hal_ext/gpio_irq_ex_api.h
View file

@ -23,11 +23,12 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/*
typedef enum { typedef enum {
IRQ_LOW = 3, IRQ_LOW = 3,
IRQ_HIGH =4 IRQ_HIGH =4
} gpio_irq_event_ex; } gpio_irq_event_ex;
*/
void gpio_irq_deinit(gpio_irq_t *obj); void gpio_irq_deinit(gpio_irq_t *obj);
void gpio_irq_pull_ctrl(gpio_irq_t *obj, PinMode pull_type); void gpio_irq_pull_ctrl(gpio_irq_t *obj, PinMode pull_type);
@ -37,4 +38,4 @@ void gpio_irq_pull_ctrl(gpio_irq_t *obj, PinMode pull_type);
#endif // end of "#if DEVICE_INTERRUPTIN" #endif // end of "#if DEVICE_INTERRUPTIN"
#endif // end of #ifndef MBED_GPIO_IRQ_EX_API_H #endif // end of #ifndef MBED_GPIO_IRQ_EX_API_H

2
USDK/component/common/mbed/targets/hal/rtl8195a/analogin_api.c
View file

@ -118,7 +118,7 @@ void analogin_init (analogin_t *obj, PinName pin){
} }
float analogin_read(analogin_t *obj){ float analogin_read(analogin_t *obj){
float value; // float value;
union { union {
unsigned int ui[2]; unsigned int ui[2];
unsigned short us[4]; unsigned short us[4];

2
USDK/component/common/mbed/targets/hal/rtl8195a/flash_eep.c
View file

@ -376,7 +376,7 @@ LOCAL signed short FLASH_EEP_ATTR _flash_write_cfg(void *ptr, unsigned short id,
fobj_head fobj; fobj_head fobj;
fobj.n.id = id; fobj.n.id = id;
fobj.n.size = size; fobj.n.size = size;
bool retb = false; // bool retb = false;
unsigned int faddr = get_addr_bscfg(false); unsigned int faddr = get_addr_bscfg(false);
if(faddr >= FMEM_ERROR_MAX) { if(faddr >= FMEM_ERROR_MAX) {

14
USDK/component/common/mbed/targets/hal/rtl8195a/i2c_api.c
View file

@ -440,7 +440,7 @@ int i2c_byte_write(i2c_t *obj, int data) {
pSalI2CHND->pTXBuf->pDataBuf = (unsigned char*)&data; pSalI2CHND->pTXBuf->pDataBuf = (unsigned char*)&data;
if (RtkI2CSend(pSalI2CHND) != HAL_OK) { if (RtkI2CSend(pSalI2CHND) != HAL_OK) {
return 0; return 0; // error
} }
return 1; return 1;
@ -573,6 +573,7 @@ int i2c_enable_control(i2c_t *obj, int enable) {
pSalI2CHND->pInitDat->I2CEn = enable; pSalI2CHND->pInitDat->I2CEn = enable;
pSalI2CMngtAdpt->pHalOp->HalI2CEnable(pSalI2CHND->pInitDat); pSalI2CMngtAdpt->pHalOp->HalI2CEnable(pSalI2CHND->pInitDat);
return 1;
} }
#if DEVICE_I2CSLAVE #if DEVICE_I2CSLAVE
@ -719,14 +720,14 @@ int i2c_slave_write(i2c_t *obj, const char *data, int length) {
* \return result * \return result
*/ */
int i2c_slave_set_for_rd_req(i2c_t *obj, int set) { int i2c_slave_set_for_rd_req(i2c_t *obj, int set) {
PSAL_I2C_MNGT_ADPT pSalI2CMngtAdpt = NULL; PSAL_I2C_MNGT_ADPT pSalI2CMngtAdpt;
PSAL_I2C_HND pSalI2CHND = NULL; // PSAL_I2C_HND pSalI2CHND;
PHAL_I2C_INIT_DAT pHalI2CInitDat = NULL; PHAL_I2C_INIT_DAT pHalI2CInitDat;
PHAL_I2C_OP pHalI2COP = NULL; PHAL_I2C_OP pHalI2COP;
u32 I2CLocalTemp; u32 I2CLocalTemp;
pSalI2CMngtAdpt = &(obj->SalI2CMngtAdpt); pSalI2CMngtAdpt = &(obj->SalI2CMngtAdpt);
pSalI2CHND = &(pSalI2CMngtAdpt->pSalHndPriv->SalI2CHndPriv); // pSalI2CHND = &(pSalI2CMngtAdpt->pSalHndPriv->SalI2CHndPriv);
pHalI2CInitDat = pSalI2CMngtAdpt->pHalInitDat; pHalI2CInitDat = pSalI2CMngtAdpt->pHalInitDat;
pHalI2COP = pSalI2CMngtAdpt->pHalOp; pHalI2COP = pSalI2CMngtAdpt->pHalOp;
@ -772,6 +773,7 @@ int i2c_slave_set_for_data_nak(i2c_t *obj, int set_nak) {
//} //}
HAL_I2C_WRITE32(pSalI2CHND->DevNum, REG_DW_I2C_IC_SLV_DATA_NACK_ONLY, set_nak); HAL_I2C_WRITE32(pSalI2CHND->DevNum, REG_DW_I2C_IC_SLV_DATA_NACK_ONLY, set_nak);
return 1;
} }
#endif // CONFIG_I2C_SLAVE_EN #endif // CONFIG_I2C_SLAVE_EN

12
USDK/component/common/mbed/targets/hal/rtl8195a/log_uart_api.c
View file

@ -253,7 +253,7 @@ void log_uart_irq_set(log_uart_t *obj, LOG_UART_INT_ID irq, uint32_t enable)
char log_uart_getc(log_uart_t *obj) char log_uart_getc(log_uart_t *obj)
{ {
HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart); // HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
while (!log_uart_readable(obj)); while (!log_uart_readable(obj));
return (char)(HAL_UART_READ32(UART_REV_BUF_OFF) & 0xFF); return (char)(HAL_UART_READ32(UART_REV_BUF_OFF) & 0xFF);
@ -261,7 +261,7 @@ char log_uart_getc(log_uart_t *obj)
void log_uart_putc(log_uart_t *obj, char c) void log_uart_putc(log_uart_t *obj, char c)
{ {
HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart); // HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
while (!log_uart_writable(obj)); while (!log_uart_writable(obj));
HAL_UART_WRITE8(UART_TRAN_HOLD_OFF, c); HAL_UART_WRITE8(UART_TRAN_HOLD_OFF, c);
@ -269,7 +269,7 @@ void log_uart_putc(log_uart_t *obj, char c)
int log_uart_readable(log_uart_t *obj) int log_uart_readable(log_uart_t *obj)
{ {
HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart); // HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
volatile u8 line_status; volatile u8 line_status;
line_status = HAL_UART_READ8(UART_LINE_STATUS_REG_OFF); line_status = HAL_UART_READ8(UART_LINE_STATUS_REG_OFF);
@ -283,7 +283,7 @@ int log_uart_readable(log_uart_t *obj)
int log_uart_writable(log_uart_t *obj) int log_uart_writable(log_uart_t *obj)
{ {
HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart); // HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
volatile u8 line_status; volatile u8 line_status;
line_status = HAL_UART_READ8(UART_LINE_STATUS_REG_OFF); line_status = HAL_UART_READ8(UART_LINE_STATUS_REG_OFF);
@ -321,7 +321,7 @@ void log_uart_clear_rx(log_uart_t *obj)
void log_uart_break_set(log_uart_t *obj) void log_uart_break_set(log_uart_t *obj)
{ {
HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart); // HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
u32 RegValue; u32 RegValue;
RegValue = HAL_UART_READ32(UART_LINE_CTL_REG_OFF); RegValue = HAL_UART_READ32(UART_LINE_CTL_REG_OFF);
@ -331,7 +331,7 @@ void log_uart_break_set(log_uart_t *obj)
void log_uart_break_clear(log_uart_t *obj) void log_uart_break_clear(log_uart_t *obj)
{ {
HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart); // HAL_LOG_UART_ADAPTER *pUartAdapter=(PHAL_LOG_UART_ADAPTER)&(obj->log_hal_uart);
u32 RegValue; u32 RegValue;
RegValue = HAL_UART_READ32(UART_LINE_CTL_REG_OFF); RegValue = HAL_UART_READ32(UART_LINE_CTL_REG_OFF);

8
USDK/component/common/mbed/targets/hal/rtl8195a/serial_api.c
View file

@ -536,12 +536,12 @@ int32_t serial_send_stream (serial_t *obj, char *ptxbuf, uint32_t len)
int32_t serial_recv_stream_dma (serial_t *obj, char *prxbuf, uint32_t len) int32_t serial_recv_stream_dma (serial_t *obj, char *prxbuf, uint32_t len)
{ {
PHAL_RUART_OP pHalRuartOp; // PHAL_RUART_OP pHalRuartOp;
PHAL_RUART_ADAPTER pHalRuartAdapter=(PHAL_RUART_ADAPTER)&(obj->hal_uart_adp); PHAL_RUART_ADAPTER pHalRuartAdapter=(PHAL_RUART_ADAPTER)&(obj->hal_uart_adp);
u8 uart_idx = pHalRuartAdapter->UartIndex; u8 uart_idx = pHalRuartAdapter->UartIndex;
int32_t ret; int32_t ret;
pHalRuartOp = &(obj->hal_uart_op); // pHalRuartOp = &(obj->hal_uart_op);
if ((serial_dma_en[uart_idx] & SERIAL_RX_DMA_EN)==0) { if ((serial_dma_en[uart_idx] & SERIAL_RX_DMA_EN)==0) {
PUART_DMA_CONFIG pHalRuartDmaCfg; PUART_DMA_CONFIG pHalRuartDmaCfg;
@ -563,12 +563,12 @@ int32_t serial_recv_stream_dma (serial_t *obj, char *prxbuf, uint32_t len)
int32_t serial_send_stream_dma (serial_t *obj, char *ptxbuf, uint32_t len) int32_t serial_send_stream_dma (serial_t *obj, char *ptxbuf, uint32_t len)
{ {
PHAL_RUART_OP pHalRuartOp; // PHAL_RUART_OP pHalRuartOp;
PHAL_RUART_ADAPTER pHalRuartAdapter=(PHAL_RUART_ADAPTER)&(obj->hal_uart_adp); PHAL_RUART_ADAPTER pHalRuartAdapter=(PHAL_RUART_ADAPTER)&(obj->hal_uart_adp);
u8 uart_idx = pHalRuartAdapter->UartIndex; u8 uart_idx = pHalRuartAdapter->UartIndex;
int32_t ret; int32_t ret;
pHalRuartOp = &(obj->hal_uart_op); // pHalRuartOp = &(obj->hal_uart_op);
if ((serial_dma_en[uart_idx] & SERIAL_TX_DMA_EN)==0) { if ((serial_dma_en[uart_idx] & SERIAL_TX_DMA_EN)==0) {
PUART_DMA_CONFIG pHalRuartDmaCfg; PUART_DMA_CONFIG pHalRuartDmaCfg;

8
USDK/component/common/mbed/targets/hal/rtl8195a/spi_api.c
View file

@ -58,13 +58,13 @@ void spi_init (spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName sse
_memset((void*)obj, 0, sizeof(spi_t)); _memset((void*)obj, 0, sizeof(spi_t));
obj->state = 0; obj->state = 0;
uint32_t SystemClock = SystemGetCpuClk(); // uint32_t SystemClock = SystemGetCpuClk();
uint32_t MaxSsiFreq = (SystemClock >> 2) >> 1; // uint32_t MaxSsiFreq = (SystemClock >> 2) >> 1;
/* SsiClockDivider doesn't support odd number */ /* SsiClockDivider doesn't support odd number */
DBG_SSI_INFO("SystemClock: %d\n", SystemClock); DBG_SSI_INFO("SystemClock: %d\n", SystemGetCpuClk());
DBG_SSI_INFO("MaxSsiFreq : %d\n", MaxSsiFreq); DBG_SSI_INFO("MaxSsiFreq : %d\n", (SystemClock >> 2) >> 1);
ssi_mosi = pinmap_peripheral(mosi, PinMap_SSI_MOSI); ssi_mosi = pinmap_peripheral(mosi, PinMap_SSI_MOSI);
ssi_miso = pinmap_peripheral(miso, PinMap_SSI_MISO); ssi_miso = pinmap_peripheral(miso, PinMap_SSI_MISO);

19
USDK/component/common/network/lwip/lwip_v1.4.1/src/api/sockets.c
View file

@ -105,7 +105,7 @@ struct lwip_select_cb {
struct lwip_setgetsockopt_data { struct lwip_setgetsockopt_data {
/** socket struct for which to change options */ /** socket struct for which to change options */
struct lwip_sock *sock; struct lwip_sock *sock;
#ifdef LWIP_DEBUG #if defined(LWIP_DEBUG) && (LWIP_DEBUG != 0)
/** socket index for which to change options */ /** socket index for which to change options */
int s; int s;
#endif /* LWIP_DEBUG */ #endif /* LWIP_DEBUG */
@ -1641,7 +1641,7 @@ lwip_getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen)
/* Now do the actual option processing */ /* Now do the actual option processing */
data.sock = sock; data.sock = sock;
#ifdef LWIP_DEBUG #if defined(LWIP_DEBUG) && (LWIP_DEBUG != 0)
data.s = s; data.s = s;
#endif /* LWIP_DEBUG */ #endif /* LWIP_DEBUG */
data.level = level; data.level = level;
@ -1662,9 +1662,6 @@ static void
lwip_getsockopt_internal(void *arg) lwip_getsockopt_internal(void *arg)
{ {
struct lwip_sock *sock; struct lwip_sock *sock;
#ifdef LWIP_DEBUG
int s;
#endif /* LWIP_DEBUG */
int level, optname; int level, optname;
void *optval; void *optval;
struct lwip_setgetsockopt_data *data; struct lwip_setgetsockopt_data *data;
@ -1673,8 +1670,8 @@ lwip_getsockopt_internal(void *arg)
data = (struct lwip_setgetsockopt_data*)arg; data = (struct lwip_setgetsockopt_data*)arg;
sock = data->sock; sock = data->sock;
#ifdef LWIP_DEBUG #if defined(LWIP_DEBUG) && (LWIP_DEBUG != 0)
s = data->s; int s = data->s;
#endif /* LWIP_DEBUG */ #endif /* LWIP_DEBUG */
level = data->level; level = data->level;
optname = data->optname; optname = data->optname;
@ -1699,8 +1696,10 @@ lwip_getsockopt_internal(void *arg)
#endif /* SO_REUSE */ #endif /* SO_REUSE */
/*case SO_USELOOPBACK: UNIMPL */ /*case SO_USELOOPBACK: UNIMPL */
*(int*)optval = ip_get_option(sock->conn->pcb.ip, optname); *(int*)optval = ip_get_option(sock->conn->pcb.ip, optname);
#if defined(LWIP_DEBUG) && (LWIP_DEBUG != 0)
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, SOL_SOCKET, optname=0x%x, ..) = %s\n", LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, SOL_SOCKET, optname=0x%x, ..) = %s\n",
s, optname, (*(int*)optval?"on":"off"))); s, optname, (*(int*)optval?"on":"off")));
#endif /* LWIP_DEBUG */
break; break;
case SO_TYPE: case SO_TYPE:
@ -2059,7 +2058,7 @@ lwip_setsockopt(int s, int level, int optname, const void *optval, socklen_t opt
/* Now do the actual option processing */ /* Now do the actual option processing */
data.sock = sock; data.sock = sock;
#ifdef LWIP_DEBUG #if defined(LWIP_DEBUG) && (LWIP_DEBUG != 0)
data.s = s; data.s = s;
#endif /* LWIP_DEBUG */ #endif /* LWIP_DEBUG */
data.level = level; data.level = level;
@ -2080,7 +2079,7 @@ static void
lwip_setsockopt_internal(void *arg) lwip_setsockopt_internal(void *arg)
{ {
struct lwip_sock *sock; struct lwip_sock *sock;
#ifdef LWIP_DEBUG #if defined(LWIP_DEBUG) && (LWIP_DEBUG != 0)
int s; int s;
#endif /* LWIP_DEBUG */ #endif /* LWIP_DEBUG */
int level, optname; int level, optname;
@ -2091,7 +2090,7 @@ lwip_setsockopt_internal(void *arg)
data = (struct lwip_setgetsockopt_data*)arg; data = (struct lwip_setgetsockopt_data*)arg;
sock = data->sock; sock = data->sock;
#ifdef LWIP_DEBUG #if defined(LWIP_DEBUG) && (LWIP_DEBUG != 0)
s = data->s; s = data->s;
#endif /* LWIP_DEBUG */ #endif /* LWIP_DEBUG */
level = data->level; level = data->level;

2
USDK/component/common/network/lwip/lwip_v1.4.1/src/core/dhcp.c
View file

@ -1008,7 +1008,7 @@ dhcp_bind(struct netif *netif)
ip_addr_copy(gw_addr, dhcp->offered_gw_addr); ip_addr_copy(gw_addr, dhcp->offered_gw_addr);
/* gateway address not given? */ /* gateway address not given? */
if (ip_addr_isany(&gw_addr)) { if (gw_addr.addr == IPADDR_ANY) {
/* copy network address */ /* copy network address */
ip_addr_get_network(&gw_addr, &dhcp->offered_ip_addr, &sn_mask); ip_addr_get_network(&gw_addr, &dhcp->offered_ip_addr, &sn_mask);
/* use first host address on network as gateway */ /* use first host address on network as gateway */

7
USDK/component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/icmp.c
View file

@ -77,9 +77,6 @@ void
icmp_input(struct pbuf *p, struct netif *inp) icmp_input(struct pbuf *p, struct netif *inp)
{ {
u8_t type; u8_t type;
#ifdef LWIP_DEBUG
u8_t code;
#endif /* LWIP_DEBUG */
struct icmp_echo_hdr *iecho; struct icmp_echo_hdr *iecho;
struct ip_hdr *iphdr; struct ip_hdr *iphdr;
s16_t hlen; s16_t hlen;
@ -96,8 +93,8 @@ icmp_input(struct pbuf *p, struct netif *inp)
} }
type = *((u8_t *)p->payload); type = *((u8_t *)p->payload);
#ifdef LWIP_DEBUG #if defined(LWIP_DEBUG) && (LWIP_DEBUG != 0)
code = *(((u8_t *)p->payload)+1); u8_t code = *(((u8_t *)p->payload)+1);
#endif /* LWIP_DEBUG */ #endif /* LWIP_DEBUG */
switch (type) { switch (type) {
case ICMP_ER: case ICMP_ER:

2
USDK/component/common/network/lwip/lwip_v1.4.1/src/core/ipv4/ip.c
View file

@ -500,7 +500,7 @@ ip_input(struct pbuf *p, struct netif *inp)
/* broadcast or multicast packet source address? Compliant with RFC 1122: 3.2.1.3 */ /* broadcast or multicast packet source address? Compliant with RFC 1122: 3.2.1.3 */
#if IP_ACCEPT_LINK_LAYER_ADDRESSING #if IP_ACCEPT_LINK_LAYER_ADDRESSING
/* DHCP servers need 0.0.0.0 to be allowed as source address (RFC 1.1.2.2: 3.2.1.3/a) */ /* DHCP servers need 0.0.0.0 to be allowed as source address (RFC 1.1.2.2: 3.2.1.3/a) */
if (check_ip_src && !ip_addr_isany(&current_iphdr_src)) if (check_ip_src && current_iphdr_src.addr != IPADDR_ANY) // !ip_addr_isany(&current_iphdr_src))
#endif /* IP_ACCEPT_LINK_LAYER_ADDRESSING */ #endif /* IP_ACCEPT_LINK_LAYER_ADDRESSING */
{ if ((ip_addr_isbroadcast(&current_iphdr_src, inp)) || { if ((ip_addr_isbroadcast(&current_iphdr_src, inp)) ||
(ip_addr_ismulticast(&current_iphdr_src))) { (ip_addr_ismulticast(&current_iphdr_src))) {

12
USDK/component/os/freertos/cmsis_os.c
View file

@ -74,7 +74,7 @@ static int inHandlerMode (void)
#if configSignalManagementSupport // the older FreeRTOS version didn't support Signal Management functions #if configSignalManagementSupport // the older FreeRTOS version didn't support Signal Management functions
static void add_thread_signal_map (osThreadId thread_id, EventGroupHandle_t signals) static void add_thread_signal_map (osThreadId thread_id, EventGroupHandle_t signals)
{ {
int dummy; int dummy = 0;
// uint32_t i; // uint32_t i;
ThreadSignalRec *prec_entity; ThreadSignalRec *prec_entity;
@ -134,8 +134,7 @@ static void add_thread_signal_map (osThreadId thread_id, EventGroupHandle_t sign
static EventGroupHandle_t find_signal_by_thread (osThreadId thread_id) static EventGroupHandle_t find_signal_by_thread (osThreadId thread_id)
{ {
EventGroupHandle_t signals_hdl=NULL; EventGroupHandle_t signals_hdl=NULL;
// uint32_t i; int dummy = 0;
int dummy;
ThreadSignalRec *prec_entity; ThreadSignalRec *prec_entity;
if (inHandlerMode()) { if (inHandlerMode()) {
@ -157,6 +156,7 @@ static EventGroupHandle_t find_signal_by_thread (osThreadId thread_id)
} }
#if 0 #if 0
// uint32_t i;
for (i=0;i<THREAD_SIGNAL_MAP_SIZE;i++) for (i=0;i<THREAD_SIGNAL_MAP_SIZE;i++)
{ {
if ((ThreadSignalMapTable[i].is_in_use) && if ((ThreadSignalMapTable[i].is_in_use) &&
@ -185,7 +185,7 @@ static EventGroupHandle_t remove_thread_signal_map (osThreadId thread_id)
{ {
EventGroupHandle_t signals_hdl=NULL; EventGroupHandle_t signals_hdl=NULL;
// uint32_t i; // uint32_t i;
int dummy; int dummy = 0;
ThreadSignalRec *prec_entity; ThreadSignalRec *prec_entity;
ThreadSignalRec *pprev_entity; ThreadSignalRec *pprev_entity;
@ -989,7 +989,7 @@ osPoolId osPoolCreate (const osPoolDef_t *pool_def)
/// \note MUST REMAIN UNCHANGED: \b osPoolAlloc shall be consistent in every CMSIS-RTOS. /// \note MUST REMAIN UNCHANGED: \b osPoolAlloc shall be consistent in every CMSIS-RTOS.
void *osPoolAlloc (osPoolId pool_id) void *osPoolAlloc (osPoolId pool_id)
{ {
int dummy; int dummy = 0;
void *p = NULL; void *p = NULL;
uint32_t i; uint32_t i;
uint32_t index; uint32_t index;
@ -1047,7 +1047,7 @@ void *osPoolCAlloc (osPoolId pool_id)
/// \note MUST REMAIN UNCHANGED: \b osPoolFree shall be consistent in every CMSIS-RTOS. /// \note MUST REMAIN UNCHANGED: \b osPoolFree shall be consistent in every CMSIS-RTOS.
osStatus osPoolFree (osPoolId pool_id, void *block) osStatus osPoolFree (osPoolId pool_id, void *block)
{ {
int dummy; int dummy = 0;
uint32_t index; uint32_t index;
if (pool_id == NULL) { if (pool_id == NULL) {

3
USDK/component/os/os_dep/device_lock.c
View file

@ -34,6 +34,7 @@ static void device_mutex_init(RT_DEV_LOCK_E device)
} }
//====================================================== //======================================================
/*
static void device_mutex_free(RT_DEV_LOCK_E device) static void device_mutex_free(RT_DEV_LOCK_E device)
{ {
if(DEVICE_MUTEX_IS_INIT(device)){ if(DEVICE_MUTEX_IS_INIT(device)){
@ -47,7 +48,7 @@ static void device_mutex_free(RT_DEV_LOCK_E device)
rtw_exit_critical(&lock, &irqL); rtw_exit_critical(&lock, &irqL);
} }
} }
*/
//====================================================== //======================================================
void device_mutex_lock(RT_DEV_LOCK_E device) void device_mutex_lock(RT_DEV_LOCK_E device)
{ {

4
USDK/component/os/os_dep/tcm_heap.c
View file

@ -57,10 +57,9 @@ void tcm_heap_dump(void)
{ {
#if CONFIG_DEBUG_LOG > 1 #if CONFIG_DEBUG_LOG > 1
if(!g_heap_inited) tcm_heap_init(); if(!g_heap_inited) tcm_heap_init();
MemChunk *chunk, *prev; MemChunk *chunk;
struct Heap* h = &g_tcm_heap; struct Heap* h = &g_tcm_heap;
int count = 0; int count = 0;
int free_mem;
DBG_8195A("TCM Free Heap Memory List:\n"); DBG_8195A("TCM Free Heap Memory List:\n");
for (chunk = h->FreeList; chunk; chunk = chunk->next) { for (chunk = h->FreeList; chunk; chunk = chunk->next) {
@ -68,6 +67,7 @@ void tcm_heap_dump(void)
} }
/* /*
MemChunk *prev;
for (prev = (MemChunk *)&h->FreeList, chunk = h->FreeList; for (prev = (MemChunk *)&h->FreeList, chunk = h->FreeList;
chunk; chunk;
prev = chunk, chunk = chunk->next) prev = chunk, chunk = chunk->next)

8
USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_ssi.c
View file

@ -245,7 +245,6 @@ HAL_Status HalSsiInitRtl8195a_Patch(VOID *Adaptor)
u32 IRQ_UNKNOWN = 999; u32 IRQ_UNKNOWN = 999;
u32 Ctrlr0Value = 0; u32 Ctrlr0Value = 0;
u32 Ctrlr1Value = 0; u32 Ctrlr1Value = 0;
u32 SerValue;
u32 BaudrValue = 0; u32 BaudrValue = 0;
u32 TxftlrValue = 0; u32 TxftlrValue = 0;
u32 RxftlrValue = 0; u32 RxftlrValue = 0;
@ -318,8 +317,7 @@ HAL_Status HalSsiInitRtl8195a_Patch(VOID *Adaptor)
HAL_SSI_READ32(Index, REG_DW_SSI_CTRLR1)); HAL_SSI_READ32(Index, REG_DW_SSI_CTRLR1));
} }
SerValue = BIT_SER_SER(1 << (pHalSsiAdaptor->SlaveSelectEnable)); SSI_DBG_INIT("[1] Set SSI%d REG_DW_SSI_SER Value: %X\n", Index, BIT_SER_SER(1 << (pHalSsiAdaptor->SlaveSelectEnable)));
SSI_DBG_INIT("[1] Set SSI%d REG_DW_SSI_SER Value: %X\n", Index, SerValue);
//HAL_SSI_WRITE32(Index, REG_DW_SSI_SER, SerValue); //HAL_SSI_WRITE32(Index, REG_DW_SSI_SER, SerValue);
HalSsiSetSlaveEnableRegisterRtl8195a(Adaptor, pHalSsiAdaptor->SlaveSelectEnable); HalSsiSetSlaveEnableRegisterRtl8195a(Adaptor, pHalSsiAdaptor->SlaveSelectEnable);
@ -617,7 +615,6 @@ HAL_Status HalSsiSetFormatRtl8195a(VOID *Adaptor)
u32 RxftlrValue = 0; u32 RxftlrValue = 0;
u8 Index = pHalSsiAdaptor->Index; u8 Index = pHalSsiAdaptor->Index;
u8 Role = pHalSsiAdaptor->Role; u8 Role = pHalSsiAdaptor->Role;
u32 Spi_mode;
if (Index > 2) { if (Index > 2) {
DBG_SSI_ERR("HalSsiSetFormatRtl8195a: Invalid SSI Idx %d\r\n", Index); DBG_SSI_ERR("HalSsiSetFormatRtl8195a: Invalid SSI Idx %d\r\n", Index);
@ -639,10 +636,9 @@ HAL_Status HalSsiSetFormatRtl8195a(VOID *Adaptor)
HAL_SSI_WRITE32(Index, REG_DW_SSI_CTRLR0, Ctrlr0Value); HAL_SSI_WRITE32(Index, REG_DW_SSI_CTRLR0, Ctrlr0Value);
Spi_mode = (HAL_SSI_READ32(Index, REG_DW_SSI_CTRLR0) >>6) & 0x3;
SSI_DBG_INIT("[2] SSI%d REG_DW_SSI_CTRLR0(%X) = %X, SPI Mode = %X\n", Index, SSI_DBG_INIT("[2] SSI%d REG_DW_SSI_CTRLR0(%X) = %X, SPI Mode = %X\n", Index,
SSI0_REG_BASE + (SSI_REG_OFF * Index) + REG_DW_SSI_CTRLR0, SSI0_REG_BASE + (SSI_REG_OFF * Index) + REG_DW_SSI_CTRLR0,
HAL_SSI_READ32(Index, REG_DW_SSI_CTRLR0), Spi_mode); HAL_SSI_READ32(Index, REG_DW_SSI_CTRLR0), (HAL_SSI_READ32(Index, REG_DW_SSI_CTRLR0) >>6) & 0x3);
//The tx threshold and rx threshold value will be reset after the spi changes its role //The tx threshold and rx threshold value will be reset after the spi changes its role
/* REG_DW_SSI_TXFTLR */ /* REG_DW_SSI_TXFTLR */
TxftlrValue = BIT_TXFTLR_TFT(pHalSsiAdaptor->TxThresholdLevel); TxftlrValue = BIT_TXFTLR_TFT(pHalSsiAdaptor->TxThresholdLevel);

17
USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_uart.c
View file

@ -152,9 +152,8 @@ HalRuartGenBaudRateRtl8195a(
u32 min_divisor=0; u32 min_divisor=0;
u32 min_err=0xffffffff; u32 min_err=0xffffffff;
u32 uart_ovsr; u32 uart_ovsr;
u32 uart_ovsr_mod; u32 min_uart_ovsr = 0; // ovsr with mini err
u32 min_uart_ovsr; // ovsr with mini err u32 min_uart_ovsr_mod = 0;
u32 min_uart_ovsr_mod;
u64 uart_clock; u64 uart_clock;
u32 divisor_temp; u32 divisor_temp;
u32 max_jitter_temp; u32 max_jitter_temp;
@ -201,7 +200,7 @@ HalRuartGenBaudRateRtl8195a(
min_uart_ovsr = uart_ovsr/100; min_uart_ovsr = uart_ovsr/100;
min_uart_ovsr_mod = uart_ovsr%100; min_uart_ovsr_mod = uart_ovsr%100;
} else if (err_temp == min_err) { } else if (err_temp == min_err) {
uart_ovsr_mod = uart_ovsr%100; u32 uart_ovsr_mod = uart_ovsr%100;
// we perfer OVSR bigger and adj bits smaller // we perfer OVSR bigger and adj bits smaller
if (((uart_ovsr/100) >= min_uart_ovsr) && (uart_ovsr_mod < min_uart_ovsr_mod)) { if (((uart_ovsr/100) >= min_uart_ovsr) && (uart_ovsr_mod < min_uart_ovsr_mod)) {
min_err = err_temp; min_err = err_temp;
@ -1284,7 +1283,7 @@ HalRuartStopRecvRtl8195a_Patch(
if (NULL != pUartGdmaConfig) { if (NULL != pUartGdmaConfig) {
PHAL_GDMA_ADAPTER pHalGdmaAdapter; PHAL_GDMA_ADAPTER pHalGdmaAdapter;
PHAL_GDMA_OP pHalGdmaOp; PHAL_GDMA_OP pHalGdmaOp;
u8 IsrTypeMap;
pHalGdmaAdapter = (PHAL_GDMA_ADAPTER)pUartGdmaConfig->pRxHalGdmaAdapter; pHalGdmaAdapter = (PHAL_GDMA_ADAPTER)pUartGdmaConfig->pRxHalGdmaAdapter;
pHalGdmaOp = (PHAL_GDMA_OP)pUartGdmaConfig->pHalGdmaOp; pHalGdmaOp = (PHAL_GDMA_OP)pUartGdmaConfig->pHalGdmaOp;
@ -1294,7 +1293,8 @@ HalRuartStopRecvRtl8195a_Patch(
// Clean Auto Reload Bit // Clean Auto Reload Bit
pHalGdmaOp->HalGdmaChCleanAutoDst((VOID*)pHalGdmaAdapter); pHalGdmaOp->HalGdmaChCleanAutoDst((VOID*)pHalGdmaAdapter);
// Clear Pending ISR // Clear Pending ISR
IsrTypeMap = pHalGdmaOp->HalGdmaChIsrClean((VOID*)pHalGdmaAdapter); // u8 IsrTypeMap =
pHalGdmaOp->HalGdmaChIsrClean((VOID*)pHalGdmaAdapter);
pHalGdmaOp->HalGdmaChDis((VOID*)(pHalGdmaAdapter)); pHalGdmaOp->HalGdmaChDis((VOID*)(pHalGdmaAdapter));
DMA_Dar = HalGdmaQueryDArRtl8195a((VOID*)pHalGdmaAdapter); DMA_Dar = HalGdmaQueryDArRtl8195a((VOID*)pHalGdmaAdapter);
@ -1359,7 +1359,7 @@ HalRuartStopSendRtl8195a_Patch(
if (NULL != pUartGdmaConfig) { if (NULL != pUartGdmaConfig) {
PHAL_GDMA_ADAPTER pHalGdmaAdapter; PHAL_GDMA_ADAPTER pHalGdmaAdapter;
PHAL_GDMA_OP pHalGdmaOp; PHAL_GDMA_OP pHalGdmaOp;
u8 IsrTypeMap;
pHalGdmaAdapter = (PHAL_GDMA_ADAPTER)pUartGdmaConfig->pTxHalGdmaAdapter; pHalGdmaAdapter = (PHAL_GDMA_ADAPTER)pUartGdmaConfig->pTxHalGdmaAdapter;
pHalGdmaOp = (PHAL_GDMA_OP)pUartGdmaConfig->pHalGdmaOp; pHalGdmaOp = (PHAL_GDMA_OP)pUartGdmaConfig->pHalGdmaOp;
@ -1369,7 +1369,8 @@ HalRuartStopSendRtl8195a_Patch(
// Clean Auto Reload Bit // Clean Auto Reload Bit
pHalGdmaOp->HalGdmaChCleanAutoDst((VOID*)pHalGdmaAdapter); pHalGdmaOp->HalGdmaChCleanAutoDst((VOID*)pHalGdmaAdapter);
// Clear Pending ISR // Clear Pending ISR
IsrTypeMap = pHalGdmaOp->HalGdmaChIsrClean((VOID*)pHalGdmaAdapter); // u8 IsrTypeMap =
pHalGdmaOp->HalGdmaChIsrClean((VOID*)pHalGdmaAdapter);
pHalGdmaOp->HalGdmaChDis((VOID*)(pHalGdmaAdapter)); pHalGdmaOp->HalGdmaChDis((VOID*)(pHalGdmaAdapter));
DMA_Sar = HalGdmaQuerySArRtl8195a((VOID*)pHalGdmaAdapter); DMA_Sar = HalGdmaQuerySArRtl8195a((VOID*)pHalGdmaAdapter);

8
USDK/component/soc/realtek/8195a/fwlib/src/hal_adc.c
View file

@ -533,16 +533,16 @@ ADCISRHandle(
PSAL_ADC_MNGT_ADPT pSalADCMngtAdpt = NULL; PSAL_ADC_MNGT_ADPT pSalADCMngtAdpt = NULL;
PHAL_ADC_INIT_DAT pHalADCInitDat = NULL; PHAL_ADC_INIT_DAT pHalADCInitDat = NULL;
PHAL_ADC_OP pHalADCOP = NULL; PHAL_ADC_OP pHalADCOP = NULL;
PSAL_ADC_USER_CB pSalADCUserCB = NULL; // PSAL_ADC_USER_CB pSalADCUserCB = NULL;
u8 ADCIrqIdx; // u8 ADCIrqIdx;
/* To get the SAL_I2C_MNGT_ADPT pointer, and parse the rest pointers */ /* To get the SAL_I2C_MNGT_ADPT pointer, and parse the rest pointers */
pSalADCHNDPriv = CONTAINER_OF(pSalADCHND, SAL_ADC_HND_PRIV, SalADCHndPriv); pSalADCHNDPriv = CONTAINER_OF(pSalADCHND, SAL_ADC_HND_PRIV, SalADCHndPriv);
pSalADCMngtAdpt = CONTAINER_OF(pSalADCHNDPriv->ppSalADCHnd, SAL_ADC_MNGT_ADPT, pSalHndPriv); pSalADCMngtAdpt = CONTAINER_OF(pSalADCHNDPriv->ppSalADCHnd, SAL_ADC_MNGT_ADPT, pSalHndPriv);
pHalADCInitDat = pSalADCMngtAdpt->pHalInitDat; pHalADCInitDat = pSalADCMngtAdpt->pHalInitDat;
pHalADCOP = pSalADCMngtAdpt->pHalOp; pHalADCOP = pSalADCMngtAdpt->pHalOp;
ADCIrqIdx = pHalADCInitDat->ADCIdx; // ADCIrqIdx = pHalADCInitDat->ADCIdx;
pSalADCUserCB = pSalADCHND->pUserCB; // pSalADCUserCB = pSalADCHND->pUserCB;
DBG_8195A_ADC_LVL(HAL_ADC_LVL,"ADC INTR STS:%x\n",pHalADCOP->HalADCReadReg(pHalADCInitDat, REG_ADC_INTR_STS)); DBG_8195A_ADC_LVL(HAL_ADC_LVL,"ADC INTR STS:%x\n",pHalADCOP->HalADCReadReg(pHalADCInitDat, REG_ADC_INTR_STS));
#else #else

32
USDK/component/soc/realtek/8195a/fwlib/src/hal_gpio.c
View file

@ -85,7 +85,7 @@ HAL_GPIO_Init(
u8 port_num; u8 port_num;
u8 pin_num; u8 pin_num;
u32 chip_pin; u32 chip_pin;
HAL_Status ret;
if (_pHAL_Gpio_Adapter == NULL) { if (_pHAL_Gpio_Adapter == NULL) {
_pHAL_Gpio_Adapter = &gHAL_Gpio_Adapter; _pHAL_Gpio_Adapter = &gHAL_Gpio_Adapter;
@ -107,7 +107,8 @@ HAL_GPIO_Init(
// Make the pin pull control default as High-Z // Make the pin pull control default as High-Z
GPIO_PullCtrl_8195a(chip_pin, HAL_GPIO_HIGHZ); GPIO_PullCtrl_8195a(chip_pin, HAL_GPIO_HIGHZ);
ret = HAL_GPIO_Init_8195a(GPIO_Pin); // HAL_Status ret =
HAL_GPIO_Init_8195a(GPIO_Pin);
#if CONFIG_DEBUG_LOG > 3 #if CONFIG_DEBUG_LOG > 3
if (ret != HAL_OK) { if (ret != HAL_OK) {
GpioFunctionChk(chip_pin, DISABLE); GpioFunctionChk(chip_pin, DISABLE);
@ -127,11 +128,6 @@ HAL_GPIO_Irq_Init(
HAL_GPIO_PIN *GPIO_Pin HAL_GPIO_PIN *GPIO_Pin
) )
{ {
u8 port_num;
u8 pin_num;
u32 chip_pin;
HAL_Status ret;
if (_pHAL_Gpio_Adapter == NULL) { if (_pHAL_Gpio_Adapter == NULL) {
_pHAL_Gpio_Adapter = &gHAL_Gpio_Adapter; _pHAL_Gpio_Adapter = &gHAL_Gpio_Adapter;
// DBG_GPIO_INFO("%s: Initial GPIO Adapter\n ", __FUNCTION__); // DBG_GPIO_INFO("%s: Initial GPIO Adapter\n ", __FUNCTION__);
@ -145,10 +141,10 @@ HAL_GPIO_Irq_Init(
// DBG_GPIO_INFO("%s: Initial GPIO IRQ Adapter\n ", __FUNCTION__); // DBG_GPIO_INFO("%s: Initial GPIO IRQ Adapter\n ", __FUNCTION__);
} }
port_num = HAL_GPIO_GET_PORT_BY_NAME(GPIO_Pin->pin_name);
pin_num = HAL_GPIO_GET_PIN_BY_NAME(GPIO_Pin->pin_name);
chip_pin = GPIO_GetChipPinName_8195a(port_num, pin_num);
#if CONFIG_DEBUG_LOG > 3 #if CONFIG_DEBUG_LOG > 3
u8 port_num = HAL_GPIO_GET_PORT_BY_NAME(GPIO_Pin->pin_name);
u8 pin_num = HAL_GPIO_GET_PIN_BY_NAME(GPIO_Pin->pin_name);
u32 chip_pin = GPIO_GetChipPinName_8195a(port_num, pin_num);
if (GpioFunctionChk(chip_pin, ENABLE) == _FALSE) { if (GpioFunctionChk(chip_pin, ENABLE) == _FALSE) {
DBG_GPIO_ERR("HAL_GPIO_Irq_Init: GPIO Pin(%x) Unavailable\n ", chip_pin); DBG_GPIO_ERR("HAL_GPIO_Irq_Init: GPIO Pin(%x) Unavailable\n ", chip_pin);
return; return;
@ -157,7 +153,8 @@ HAL_GPIO_Irq_Init(
DBG_GPIO_INFO("HAL_GPIO_Irq_Init: GPIO(name=0x%x)(mode=%d)\n ", GPIO_Pin->pin_name, DBG_GPIO_INFO("HAL_GPIO_Irq_Init: GPIO(name=0x%x)(mode=%d)\n ", GPIO_Pin->pin_name,
GPIO_Pin->pin_mode); GPIO_Pin->pin_mode);
HAL_GPIO_MaskIrq_8195a(GPIO_Pin); HAL_GPIO_MaskIrq_8195a(GPIO_Pin);
ret = HAL_GPIO_Init_8195a(GPIO_Pin); // HAL_Status ret =
HAL_GPIO_Init_8195a(GPIO_Pin);
#if CONFIG_DEBUG_LOG > 3 #if CONFIG_DEBUG_LOG > 3
if (ret != HAL_OK) { if (ret != HAL_OK) {
GpioFunctionChk(chip_pin, DISABLE); GpioFunctionChk(chip_pin, DISABLE);
@ -196,16 +193,13 @@ HAL_GPIO_DeInit(
HAL_GPIO_PIN *GPIO_Pin HAL_GPIO_PIN *GPIO_Pin
) )
{ {
u8 port_num; #if CONFIG_DEBUG_LOG > 3
u8 pin_num; u8 port_num = HAL_GPIO_GET_PORT_BY_NAME(GPIO_Pin->pin_name);
u32 chip_pin; u8 pin_num = HAL_GPIO_GET_PIN_BY_NAME(GPIO_Pin->pin_name);
#endif
port_num = HAL_GPIO_GET_PORT_BY_NAME(GPIO_Pin->pin_name);
pin_num = HAL_GPIO_GET_PIN_BY_NAME(GPIO_Pin->pin_name);
chip_pin = GPIO_GetChipPinName_8195a(port_num, pin_num);
HAL_GPIO_DeInit_8195a(GPIO_Pin); HAL_GPIO_DeInit_8195a(GPIO_Pin);
#if CONFIG_DEBUG_LOG > 3 #if CONFIG_DEBUG_LOG > 3
GpioFunctionChk(chip_pin, DISABLE); GpioFunctionChk(GPIO_GetChipPinName_8195a(port_num, pin_num), DISABLE);
#endif #endif
} }

19
USDK/component/soc/realtek/8195a/fwlib/src/hal_sdr_controller.c
View file

@ -150,11 +150,13 @@ unsigned int rand_x = 123456789;
*/ */
#ifdef CONFIG_SDR_EN #ifdef CONFIG_SDR_EN
#ifndef __GNUC__
//#pragma arm section code = ".hal.sdrc.text" //#pragma arm section code = ".hal.sdrc.text"
#pragma arm section rodata = ".rodata.hal.sdrc" #pragma arm section rodata = ".rodata.hal.sdrc"
//, rwdata = ".hal.sdrc.data" //, rwdata = ".hal.sdrc.data"
//, zidata = ".hal.sdrc.bss" //, zidata = ".hal.sdrc.bss"
//#pragma arm section bss = ".hal.sdrc.bss" //#pragma arm section bss = ".hal.sdrc.bss"
#endif
#ifdef CONFIG_SDR_VERIFY #ifdef CONFIG_SDR_VERIFY
enum{ enum{
@ -448,13 +450,10 @@ DramInit (
u32 CrTwr, DramMaxWr, DramWr; u32 CrTwr, DramMaxWr, DramWr;
u32 CrTrtw = 0, CrTrtwT = 0; u32 CrTrtw = 0, CrTrtwT = 0;
u32 DrmaPeriod; u32 DrmaPeriod;
DRAM_TYPE DdrType; DRAM_TYPE DdrType = DRAM_SDR;
DRAM_DQ_WIDTH DqWidth; DRAM_DQ_WIDTH DqWidth;
DRAM_COLADDR_WTH Page; DRAM_COLADDR_WTH Page;
u32 DfiRate; u32 DfiRate;
volatile struct ms_rxi310_portmap *ms_ctrl_0_map;
ms_ctrl_0_map = (struct ms_rxi310_portmap*) SDR_CTRL_BASE;
// ms_ctrl_0_map = ms_ctrl_0_map;
DfiRate = 1 << (u32) (DramInfo->DfiRate); DfiRate = 1 << (u32) (DramInfo->DfiRate);
DrmaPeriod = (DramInfo->DdrPeriodPs)*(DfiRate); // according DFI_RATE to setting DrmaPeriod = (DramInfo->DdrPeriodPs)*(DfiRate); // according DFI_RATE to setting
@ -658,6 +657,9 @@ DramInit (
// enter mem_mode // enter mem_mode
HAL_SDR_WRITE32(REG_SDR_CSR,0x600); HAL_SDR_WRITE32(REG_SDR_CSR,0x600);
#else #else
volatile struct ms_rxi310_portmap *ms_ctrl_0_map;
ms_ctrl_0_map = (struct ms_rxi310_portmap*) SDR_CTRL_BASE;
// ms_ctrl_0_map = ms_ctrl_0_map;
// WRAP_MISC setting // WRAP_MISC setting
ms_ctrl_0_map->misc = //0x12; ms_ctrl_0_map->misc = //0x12;
( (
@ -753,7 +755,8 @@ SdrCalibration(
DBG_8195A("%s()\n", __func__); DBG_8195A("%s()\n", __func__);
u32 RdPipe = 0, TapCnt = 0, Pass = 0, AvaWdsCnt = 0; u32 RdPipe = 0, TapCnt = 0, Pass = 0, AvaWdsCnt = 0;
u32 RdPipeCounter, RecNum[2], RecRdPipe[2];//, AvaWds[2][REC_NUM]; u32 RdPipeCounter, RecNum[2], RecRdPipe[2];//, AvaWds[2][REC_NUM];
BOOL RdPipeFlag, PassFlag = 0, Result; BOOL RdPipeFlag, Result;
// BOOL PassFlag = 0;
u8 flashtype = 0; u8 flashtype = 0;
flashtype = SpicInitParaAllClk[0][0].flashtype; flashtype = SpicInitParaAllClk[0][0].flashtype;
@ -829,7 +832,7 @@ SdrCalibration(
#endif #endif
RdPipeFlag = _FALSE; RdPipeFlag = _FALSE;
PassFlag = _FALSE; // PassFlag = _FALSE;
AvaWdsCnt = 0; AvaWdsCnt = 0;
for(TapCnt=0; TapCnt < (MAX_TAP_DLY+1); TapCnt++) { for(TapCnt=0; TapCnt < (MAX_TAP_DLY+1); TapCnt++) {
@ -853,7 +856,7 @@ SdrCalibration(
#endif #endif
Pass = MemTest(10000); Pass = MemTest(10000);
PassFlag = _FALSE; // PassFlag = _FALSE;
if(Pass==_TRUE) { // PASS if(Pass==_TRUE) { // PASS
@ -876,7 +879,7 @@ SdrCalibration(
break; break;
} }
PassFlag = _TRUE; // PassFlag = _TRUE;
DBG_SDR_INFO("Verify Pass => RdPipe:%d; TapCnt: %d\n", RdPipe, TapCnt); DBG_SDR_INFO("Verify Pass => RdPipe:%d; TapCnt: %d\n", RdPipe, TapCnt);

9
USDK/component/soc/realtek/8195a/fwlib/src/hal_soc_ps_monitor.c
View file

@ -553,7 +553,7 @@ VOID SleepPwrGatted(
//3 1.1 Set TU timer timescale //3 1.1 Set TU timer timescale
//0x4000_0090[21:16] = 6'h1F //0x4000_0090[21:16] = 6'h1F
//0x4000_0090[15] = 1'b0 => Disable timer //0x4000_0090[15] = 1'b0 => Disable timer
u32 CalTemp = (CLKCal(ANACK) << 16); // u32 CalTemp = (CLKCal(ANACK) << 16);
Rtemp = (HAL_READ32(SYSTEM_CTRL_BASE, REG_SYS_ANA_TIM_CTRL) Rtemp = (HAL_READ32(SYSTEM_CTRL_BASE, REG_SYS_ANA_TIM_CTRL)
& (~((BIT_MASK_SYS_DSTDY_TIM_SCAL << BIT_SHIFT_SYS_DSTDY_TIM_SCAL) | (BIT_MASK_SYS_ANACK_TU_TIME << BIT_SHIFT_SYS_ANACK_TU_TIME)))) & (~((BIT_MASK_SYS_DSTDY_TIM_SCAL << BIT_SHIFT_SYS_DSTDY_TIM_SCAL) | (BIT_MASK_SYS_ANACK_TU_TIME << BIT_SHIFT_SYS_ANACK_TU_TIME))))
| ScaleTemp; | ScaleTemp;
@ -620,7 +620,7 @@ DStandby(
//3 1.1 Set TU timer timescale //3 1.1 Set TU timer timescale
//0x4000_0090[21:16] = 6'h1F //0x4000_0090[21:16] = 6'h1F
//0x4000_0090[15] = 1'b0 => Disable timer //0x4000_0090[15] = 1'b0 => Disable timer
u32 CalTemp = (CLKCal(ANACK) << 16); // u32 CalTemp = (CLKCal(ANACK) << 16);
Rtemp = (HAL_READ32(SYSTEM_CTRL_BASE, REG_SYS_ANA_TIM_CTRL) Rtemp = (HAL_READ32(SYSTEM_CTRL_BASE, REG_SYS_ANA_TIM_CTRL)
& (~((BIT_MASK_SYS_DSTDY_TIM_SCAL << BIT_SHIFT_SYS_DSTDY_TIM_SCAL) | (BIT_MASK_SYS_ANACK_TU_TIME << BIT_SHIFT_SYS_ANACK_TU_TIME)))) & (~((BIT_MASK_SYS_DSTDY_TIM_SCAL << BIT_SHIFT_SYS_DSTDY_TIM_SCAL) | (BIT_MASK_SYS_ANACK_TU_TIME << BIT_SHIFT_SYS_ANACK_TU_TIME))))
| ScaleTemp; | ScaleTemp;
@ -678,8 +678,6 @@ DSleep(
u32 UTemp = 0; u32 UTemp = 0;
u32 MaxTemp = 0; u32 MaxTemp = 0;
u32 Reada335;
//2 Deep Sleep mode: //2 Deep Sleep mode:
//3 2.1 Set TU timer timescale //3 2.1 Set TU timer timescale
@ -729,9 +727,8 @@ DSleep(
HAL_WRITE32(SYSTEM_CTRL_BASE, REG_SYS_DSLP_TIM_CTRL, Rtemp); HAL_WRITE32(SYSTEM_CTRL_BASE, REG_SYS_DSLP_TIM_CTRL, Rtemp);
HalDelayUs(1000); HalDelayUs(1000);
Reada335 = HAL_READ32(SYSTEM_CTRL_BASE, REG_SYS_DSLP_TIM_CAL_CTRL);
#if CONFIG_DEBUG_LOG > 3 #if CONFIG_DEBUG_LOG > 3
DiagPrintf("a33 timer : 0x%x\n", Reada335); DiagPrintf("a33 timer : 0x%x\n", HAL_READ32(SYSTEM_CTRL_BASE, REG_SYS_DSLP_TIM_CAL_CTRL));
#endif #endif
HalDelayUs(8000); HalDelayUs(8000);

2
USDK/component/soc/realtek/8195a/fwlib/src/hal_ssi.c
View file

@ -527,7 +527,7 @@ HalSsiInit(VOID *Data)
{ {
HAL_Status ret; HAL_Status ret;
PHAL_SSI_ADAPTOR pHalSsiAdapter = (PHAL_SSI_ADAPTOR) Data; PHAL_SSI_ADAPTOR pHalSsiAdapter = (PHAL_SSI_ADAPTOR) Data;
u32 Function; u32 Function = SPI0;
u8 PinmuxSelect; u8 PinmuxSelect;
u8 Index; u8 Index;

4
USDK/component/soc/realtek/8195a/fwlib/src/hal_uart.c
View file

@ -1021,7 +1021,7 @@ HalRuartDmaSend(
u32 BlockSize; u32 BlockSize;
HAL_Status ret; HAL_Status ret;
PUART_DMA_CONFIG pUartGdmaConfig; PUART_DMA_CONFIG pUartGdmaConfig;
PHAL_GDMA_ADAPTER pHalGdmaAdapter; // PHAL_GDMA_ADAPTER pHalGdmaAdapter;
if (((Length & 0x03)==0) && if (((Length & 0x03)==0) &&
(((u32)(pTxBuf) & 0x03)==0)) { (((u32)(pTxBuf) & 0x03)==0)) {
@ -1078,7 +1078,7 @@ HalRuartDmaRecv(
// u32 BlockSize; // u32 BlockSize;
HAL_Status ret; HAL_Status ret;
PUART_DMA_CONFIG pUartGdmaConfig; PUART_DMA_CONFIG pUartGdmaConfig;
PHAL_GDMA_ADAPTER pHalGdmaAdapter; // PHAL_GDMA_ADAPTER pHalGdmaAdapter;
if (Length < 4096) { if (Length < 4096) {
#if CONFIG_CHIP_E_CUT #if CONFIG_CHIP_E_CUT

8
USDK/component/soc/realtek/8195a/misc/os/freertos_pmu_8195a.c
View file

@ -253,7 +253,7 @@ extern int sprintf(char* str, const char* fmt, ...);
extern size_t strlen(const char *str); extern size_t strlen(const char *str);
//#define sprintf rtl_sprintf //#define sprintf rtl_sprintf
void pmu_get_wakelock_hold_stats( char *pcWriteBuffer ) { void pmu_get_wakelock_hold_stats( char *pcWriteBuffer ) {
uint32_t i; int i;
uint32_t current_timestamp = osKernelSysTick(); uint32_t current_timestamp = osKernelSysTick();
*pcWriteBuffer = 0x00; *pcWriteBuffer = 0x00;
@ -265,15 +265,15 @@ void pmu_get_wakelock_hold_stats( char *pcWriteBuffer ) {
for (i=0; i<32; i++) { for (i=0; i<32; i++) {
if (last_wakelock_state[i] == 1) { if (last_wakelock_state[i] == 1) {
sprintf(pcWriteBuffer, "%x\t\t%d\r\n", i, hold_wakelock_time[i] + (current_timestamp - last_acquire_wakelock_time[i])); sprintf(pcWriteBuffer, "%x\t\t%u\r\n", i, (unsigned int)( hold_wakelock_time[i] + (current_timestamp - last_acquire_wakelock_time[i])));
} else { } else {
if (hold_wakelock_time[i] > 0) { if (hold_wakelock_time[i] > 0) {
sprintf(pcWriteBuffer, "%x\t\t%d\r\n", i, hold_wakelock_time[i]); sprintf(pcWriteBuffer, "%x\t\t%u\r\n", i, (unsigned int)hold_wakelock_time[i]);
} }
} }
pcWriteBuffer += strlen( pcWriteBuffer ); pcWriteBuffer += strlen( pcWriteBuffer );
} }
sprintf(pcWriteBuffer, "time passed: %d ms, system sleep %d ms\r\n", current_timestamp - base_sys_time, sys_sleep_time); sprintf(pcWriteBuffer, "time passed: %u ms, system sleep %u ms\r\n", (unsigned int)(current_timestamp - base_sys_time), (unsigned int)sys_sleep_time);
} }
} }

7
USDK/component/soc/realtek/8195a/misc/rtl_std_lib/lib_rtlstd/c_stdio.c
View file

@ -373,7 +373,7 @@ llatob(u_quad_t *vp, char *p, int base)
char * char *
btoa(char *dst, u_int value, int base) btoa(char *dst, u_int value, int base)
{ {
char buf[34], digit; char buf[34], digit = 0;
int i, j, rem, neg; int i, j, rem, neg;
if (value == 0) { if (value == 0) {
@ -419,7 +419,7 @@ btoa(char *dst, u_int value, int base)
char * char *
llbtoa(char *dst, u_quad_t value, int base) llbtoa(char *dst, u_quad_t value, int base)
{ {
char buf[66], digit; char buf[66], digit = 0;
int i, j, rem, neg; int i, j, rem, neg;
if (value == 0) { if (value == 0) {
@ -538,7 +538,7 @@ c_vsprintf (char *d, const char *s, va_list ap)
const char *t; const char *t;
char *p, *dst, tmp[40]; char *p, *dst, tmp[40];
unsigned int n; unsigned int n;
int fmt, trunc, haddot, width, base, longlong; int fmt, trunc, haddot, width, base = 0, longlong;
double dbl; double dbl;
#ifndef NEWFP #ifndef NEWFP
EP ex; EP ex;
@ -1081,6 +1081,7 @@ int puts (const char *s)
while(*s) { while(*s) {
HalSerialPutcRtl8195a(*s++); HalSerialPutcRtl8195a(*s++);
} }
return 0; // -1 -> EOF
} }
void vTaskDelete(void *); void vTaskDelete(void *);

8
USDK/sdkset.mk
View file

@ -21,10 +21,10 @@
CFLAGS = -DM3 -DCONFIG_PLATFORM_8195A -DGCC_ARMCM3 -DARDUINO_SDK -DF_CPU=166666666L -DNDEBUG CFLAGS = -DM3 -DCONFIG_PLATFORM_8195A -DGCC_ARMCM3 -DARDUINO_SDK -DF_CPU=166666666L -DNDEBUG
CFLAGS += -mcpu=cortex-m3 -mthumb -g2 -Os -std=gnu99 CFLAGS += -mcpu=cortex-m3 -mthumb -g2 -Os -std=gnu99
CFLAGS += -fno-common -fmessage-length=0 -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-short-enums -fsigned-char CFLAGS += -fno-common -fmessage-length=0 -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-short-enums -fsigned-char
CFLAGS += -Wall CFLAGS += -Wall -Werror
CFLAGS += -Wno-old-style-declaration -Wno-pointer-sign -Wno-strict-aliasing CFLAGS += -Wno-old-style-declaration -Wno-pointer-sign -Wno-strict-aliasing
CFLAGS += -Wno-variadic-macros -Wno-empty-body CFLAGS += -Wno-variadic-macros -Wno-empty-body
#CFLAGS += -Werror -Wpedantic -Wno-char-subscripts -Wno-unused-parameter #CFLAGS += -Wno-char-subscripts -Wno-unused-parameter
ifdef USE_GCC_LIB ifdef USE_GCC_LIB
LFLAGS = -mcpu=cortex-m3 -mthumb -g -Os -nostartfiles --specs=nano.specs LFLAGS = -mcpu=cortex-m3 -mthumb -g -Os -nostartfiles --specs=nano.specs