Skip to content

Commit f000eb3

Browse files
Archcady0xc0170
authored andcommitted
Restore TCPIP_THREAD_STACKSIZE and thread_stack_main
move some TCPIP stack data to heap; switch off GDMA for SPI (only for SPI); TCPIP_THREAD_STACKSIZE and thread_stack_main are identical to ARMmbed
1 parent c3bf1c5 commit f000eb3

File tree

11 files changed

+18
-426
lines changed

11 files changed

+18
-426
lines changed

features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Realtek/lwipopts_conf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#define TCP_SND_BUF (10 * TCP_MSS)
3333
#define TCP_WND (6 * TCP_MSS)
3434
#define PBUF_POOL_SIZE 10
35-
#define TCPIP_THREAD_STACKSIZE 1600
35+
3636
#endif
3737

3838

targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/platform_autoconf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
#define CONFIG_WDG 1
7474
#undef CONFIG_WDG_NON
7575
#define CONFIG_WDG_NORMAL 1
76-
#define CONFIG_GDMA_EN 1
76+
#define CONFIG_GDMA_EN 0
7777
#define CONFIG_GDMA_NORMAL 1
7878
#undef CONFIG_GDMA_TEST
7979
#define CONFIG_GDMA_MODULE 1

targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/device/rtl8195a_ssi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ HAL_Status HalSsiDmaRecvMultiBlockRtl8195a_V04(VOID * Adapter, u8 * pRxData, u32
554554

555555
#endif
556556

557-
#ifdef CONFIG_GDMA_EN
557+
#if CONFIG_GDMA_EN
558558
VOID HalSsiTxGdmaLoadDefRtl8195a(VOID *Adapter);
559559
VOID HalSsiRxGdmaLoadDefRtl8195a(VOID *Adapter);
560560
VOID HalSsiDmaInitRtl8195a(VOID *Adapter);

targets/TARGET_Realtek/TARGET_AMEBA/rtw_emac.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ static void wlan_set_hwaddr(emac_interface_t *emac, uint8_t *addr)
7474

7575
static bool wlan_link_out(emac_interface_t *emac, emac_stack_mem_t *buf)
7676
{
77-
struct eth_drv_sg sg_list[MAX_ETH_DRV_SG];
77+
struct eth_drv_sg * sg_list=0;
7878
int sg_len = 0;
7979
int tot_len;
8080
struct pbuf *p;
@@ -84,6 +84,10 @@ static bool wlan_link_out(emac_interface_t *emac, emac_stack_mem_t *buf)
8484
return false;
8585
}
8686

87+
sg_list = (struct eth_drv_sg *)malloc(sizeof(struct eth_drv_sg)*MAX_ETH_DRV_SG);
88+
if(sg_list == 0){//malloc fail
89+
return false;
90+
}
8791
emac_stack_mem_ref(emac, buf);
8892

8993
p = (struct pbuf *)buf;
@@ -101,6 +105,7 @@ static bool wlan_link_out(emac_interface_t *emac, emac_stack_mem_t *buf)
101105
}
102106

103107
emac_stack_mem_free(emac, buf);
108+
free(sg_list);
104109
return ret;
105110
}
106111

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

targets/TARGET_Realtek/TARGET_AMEBA/sdk/soc/realtek/8195a/fwlib/hal_ssi.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ typedef uint32_t *PSSI_DBG_TYPE_LIST;
136136
IRQ_HANDLE TxGdmaIrqHandle;
137137
}SSI_DMA_CONFIG, *PSSI_DMA_CONFIG;
138138

139-
#ifdef CONFIG_GDMA_EN
139+
#if CONFIG_GDMA_EN
140140
typedef struct _HAL_SSI_DMA_MULTIBLK_ {
141141
volatile GDMA_CH_LLI_ELE GdmaChLli[16];
142142
struct GDMA_CH_LLI Lli[16];
@@ -191,7 +191,7 @@ typedef struct _HAL_SSI_ADAPTOR_ {
191191
u8 HaveTxChannel;
192192
u8 HaveRxChannel;
193193
u8 DefaultRxThresholdLevel;
194-
#ifdef CONFIG_GDMA_EN
194+
#if CONFIG_GDMA_EN
195195
SSI_DMA_MULTIBLK DmaTxMultiBlk, DmaRxMultiBlk;
196196
#endif
197197
u32 ReservedDummy;
@@ -278,7 +278,7 @@ struct spi_s {
278278
u32 dma_en;
279279
volatile u32 state;
280280
u8 sclk;
281-
#ifdef CONFIG_GDMA_EN
281+
#if CONFIG_GDMA_EN
282282
HAL_GDMA_ADAPTER spi_gdma_adp_tx;
283283
HAL_GDMA_ADAPTER spi_gdma_adp_rx;
284284
#endif
@@ -304,7 +304,7 @@ HAL_Status HalSsiTimeout(u32 StartCount, u32 TimeoutCnt);
304304
HAL_Status HalSsiStopRecv(VOID * Data);
305305
HAL_Status HalSsiSetFormat(VOID * Data);
306306
VOID HalSsiClearFIFO(VOID * Data);
307-
#ifdef CONFIG_GDMA_EN
307+
#if CONFIG_GDMA_EN
308308
HAL_Status HalSsiTxGdmaInit(PHAL_SSI_OP pHalSsiOp, PHAL_SSI_ADAPTOR pHalSsiAdapter);
309309
VOID HalSsiTxGdmaDeInit(PHAL_SSI_ADAPTOR pHalSsiAdapter);
310310
HAL_Status HalSsiRxGdmaInit(PHAL_SSI_OP pHalSsiOp, PHAL_SSI_ADAPTOR pHalSsiAdapter);

0 commit comments

Comments
 (0)