Skip to content

Commit 556bbb6

Browse files
MCHP-ShanMCHP-Shan
committed
Regenerated and tested with net repo 3.7 updates.
1 parent a54ebda commit 556bbb6

File tree

230 files changed

+22289
-16080
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+22289
-16080
lines changed

‎libraries/freertos_plus/standard/freertos_plus_tcp/source/portable/NetworkInterface/pic32mzef_h3/NetworkInterface_eth.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
// *****************************************************************************
107107
// *****************************************************************************
108108

109-
110109
#define TCPIP_STACK_TICK_RATE 5
111110
#define TCPIP_STACK_SECURE_PORT_ENTRIES 10
112111

@@ -161,7 +160,7 @@ const DRV_ETHPHY_INIT tcpipPhyInitData =
161160

162161
};
163162

164-
/*** GMAC MAC Initialization Data ***/
163+
/*** ETH MAC Initialization Data ***/
165164
const TCPIP_MODULE_MAC_PIC32INT_CONFIG tcpipMACPIC32INTInitData =
166165
{
167166
.nTxDescriptors = TCPIP_EMAC_TX_DESCRIPTORS,
@@ -178,7 +177,6 @@ const TCPIP_MODULE_MAC_PIC32INT_CONFIG tcpipMACPIC32INTInitData =
178177
.pPhyInit = &tcpipPhyInitData,
179178
};
180179

181-
182180
#ifdef PIC32_USE_ETHERNET
183181

184182
/* local definitions and data */
@@ -642,6 +640,7 @@ const TCPIP_MODULE_MAC_PIC32INT_CONFIG tcpipMACPIC32INTInitData =
642640
pMacCtrl->netIx = 0;
643641
pMacCtrl->macAction = TCPIP_MAC_ACTION_INIT;
644642
pMacCtrl->powerMode = TCPIP_MAC_POWER_FULL;
643+
pMacCtrl->segLoadOffset = TCPIP_PKT_SegLoadOffset();
645644

646645
macAdd.v[ 0 ] = configMAC_ADDR0;
647646
macAdd.v[ 1 ] = configMAC_ADDR1;

‎libraries/freertos_plus/standard/freertos_plus_tcp/source/portable/NetworkInterface/same54/NetworkInterface_eth.c

+13-1
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,22 @@ const DRV_ETHPHY_INIT tcpipPhyInitData =
122122

123123
};
124124

125+
const DRV_GMAC_RXQUE_FILTER_INIT DRV_GMAC_Rx_Filt_Init =
126+
{
127+
.type1FiltCount = TCPIP_GMAC_SCREEN1_COUNT_QUE,
128+
.type2FiltCount = TCPIP_GMAC_SCREEN2_COUNT_QUE,
129+
};
125130
/*** GMAC MAC Initialization Data ***/
126131
const TCPIP_MODULE_MAC_PIC32C_CONFIG tcpipMACPIC32CINTInitData =
127132
{
128133
/** QUEUE 0 Intialization**/
129-
.gmac_queue_config[0].queueEnable = true,
134+
.gmac_queue_config[0].queueTxEnable = true,
135+
.gmac_queue_config[0].queueRxEnable = true,
130136
.gmac_queue_config[0].nRxDescCnt = TCPIP_GMAC_RX_DESCRIPTORS_COUNT_QUE0,
131137
.gmac_queue_config[0].nTxDescCnt = TCPIP_GMAC_TX_DESCRIPTORS_COUNT_QUE0,
132138
.gmac_queue_config[0].rxBufferSize = TCPIP_GMAC_RX_BUFF_SIZE_QUE0,
133139
.gmac_queue_config[0].txBufferSize = TCPIP_GMAC_TX_BUFF_SIZE_QUE0,
140+
.gmac_queue_config[0].txMaxPktSize = TCPIP_GMAC_MAX_TX_PKT_SIZE_QUE0,
134141
.gmac_queue_config[0].nRxBuffCount = TCPIP_GMAC_RX_BUFF_COUNT_QUE0,
135142
.gmac_queue_config[0].nRxBuffCntThres = TCPIP_GMAC_RX_BUFF_COUNT_THRESHOLD_QUE0,
136143
.gmac_queue_config[0].nRxBuffAllocCnt = TCPIP_GMAC_RX_BUFF_ALLOC_COUNT_QUE0,
@@ -141,6 +148,11 @@ const TCPIP_MODULE_MAC_PIC32C_CONFIG tcpipMACPIC32CINTInitData =
141148
.ethModuleId = TCPIP_INTMAC_MODULE_ID,
142149
.pPhyBase = &DRV_ETHPHY_OBJECT_BASE_Default,
143150
.pPhyInit = &tcpipPhyInitData,
151+
.checksumOffloadRx = DRV_GMAC_RX_CHKSM_OFFLOAD,
152+
.checksumOffloadTx = DRV_GMAC_TX_CHKSM_OFFLOAD,
153+
.macTxPrioNum = TCPIP_GMAC_TX_PRIO_COUNT,
154+
.macRxPrioNum = TCPIP_GMAC_RX_PRIO_COUNT,
155+
.pRxQueFiltInit = &DRV_GMAC_Rx_Filt_Init,
144156
};
145157

146158

‎libraries/freertos_plus/standard/freertos_plus_tcp/source/portable/NetworkInterface/same70/NetworkInterface_eth.c

+34-7
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ const DRV_MIIM_INIT drvMiimInitData =
8989

9090
const TCPIP_NETWORK_CONFIG __attribute__((unused)) TCPIP_HOSTS_CONFIGURATION[] =
9191
{
92-
/*** Network Configuration Index 0 ***/
92+
/*** Network Configuration Index 0 ***/
9393
{
9494
TCPIP_NETWORK_DEFAULT_INTERFACE_NAME_IDX0, // interface
9595
TCPIP_NETWORK_DEFAULT_HOST_NAME_IDX0, // hostName
@@ -104,6 +104,8 @@ const TCPIP_NETWORK_CONFIG __attribute__((unused)) TCPIP_HOSTS_CONFIGURATION[]
104104
&TCPIP_NETWORK_DEFAULT_MAC_DRIVER_IDX0, // pMacObject
105105
},
106106
};
107+
108+
107109
const DRV_ETHPHY_INIT tcpipPhyInitData =
108110
{
109111
.ethphyId = TCPIP_INTMAC_MODULE_ID,
@@ -117,65 +119,85 @@ const DRV_ETHPHY_INIT tcpipPhyInitData =
117119

118120
};
119121

122+
const DRV_GMAC_RXQUE_FILTER_INIT DRV_GMAC_Rx_Filt_Init =
123+
{
124+
.type1FiltCount = TCPIP_GMAC_SCREEN1_COUNT_QUE,
125+
.type2FiltCount = TCPIP_GMAC_SCREEN2_COUNT_QUE,
126+
};
127+
128+
129+
/*** GMAC MAC Initialization Data ***/
120130
/*** GMAC MAC Initialization Data ***/
121131
const TCPIP_MODULE_MAC_PIC32C_CONFIG tcpipMACPIC32CINTInitData =
122132
{
123133
/** QUEUE 0 Intialization**/
124-
.gmac_queue_config[0].queueEnable = true,
134+
.gmac_queue_config[0].queueTxEnable = true,
135+
.gmac_queue_config[0].queueRxEnable = true,
125136
.gmac_queue_config[0].nRxDescCnt = TCPIP_GMAC_RX_DESCRIPTORS_COUNT_QUE0,
126137
.gmac_queue_config[0].nTxDescCnt = TCPIP_GMAC_TX_DESCRIPTORS_COUNT_QUE0,
127138
.gmac_queue_config[0].rxBufferSize = TCPIP_GMAC_RX_BUFF_SIZE_QUE0,
128139
.gmac_queue_config[0].txBufferSize = TCPIP_GMAC_TX_BUFF_SIZE_QUE0,
140+
.gmac_queue_config[0].txMaxPktSize = TCPIP_GMAC_MAX_TX_PKT_SIZE_QUE0,
129141
.gmac_queue_config[0].nRxBuffCount = TCPIP_GMAC_RX_BUFF_COUNT_QUE0,
130142
.gmac_queue_config[0].nRxBuffCntThres = TCPIP_GMAC_RX_BUFF_COUNT_THRESHOLD_QUE0,
131143
.gmac_queue_config[0].nRxBuffAllocCnt = TCPIP_GMAC_RX_BUFF_ALLOC_COUNT_QUE0,
132144

133145
/** QUEUE 1 Intialization**/
134-
.gmac_queue_config[1].queueEnable = false,
146+
.gmac_queue_config[1].queueTxEnable = false,
147+
.gmac_queue_config[1].queueRxEnable = false,
135148
.gmac_queue_config[1].nRxDescCnt = TCPIP_GMAC_RX_DESCRIPTORS_COUNT_QUE1,
136149
.gmac_queue_config[1].nTxDescCnt = TCPIP_GMAC_TX_DESCRIPTORS_COUNT_QUE1,
137150
.gmac_queue_config[1].rxBufferSize = TCPIP_GMAC_RX_BUFF_SIZE_QUE1,
138151
.gmac_queue_config[1].txBufferSize = TCPIP_GMAC_TX_BUFF_SIZE_QUE1,
152+
.gmac_queue_config[1].txMaxPktSize = TCPIP_GMAC_MAX_TX_PKT_SIZE_QUE1,
139153
.gmac_queue_config[1].nRxBuffCount = TCPIP_GMAC_RX_BUFF_COUNT_QUE1,
140154
.gmac_queue_config[1].nRxBuffCntThres = TCPIP_GMAC_RX_BUFF_COUNT_THRESHOLD_QUE1,
141155
.gmac_queue_config[1].nRxBuffAllocCnt = TCPIP_GMAC_RX_BUFF_ALLOC_COUNT_QUE1,
142156

143157
/** QUEUE 2 Intialization**/
144-
.gmac_queue_config[2].queueEnable = false,
158+
.gmac_queue_config[2].queueTxEnable = false,
159+
.gmac_queue_config[2].queueRxEnable = false,
145160
.gmac_queue_config[2].nRxDescCnt = TCPIP_GMAC_RX_DESCRIPTORS_COUNT_QUE2,
146161
.gmac_queue_config[2].nTxDescCnt = TCPIP_GMAC_TX_DESCRIPTORS_COUNT_QUE2,
147162
.gmac_queue_config[2].rxBufferSize = TCPIP_GMAC_RX_BUFF_SIZE_QUE2,
148163
.gmac_queue_config[2].txBufferSize = TCPIP_GMAC_TX_BUFF_SIZE_QUE2,
164+
.gmac_queue_config[2].txMaxPktSize = TCPIP_GMAC_MAX_TX_PKT_SIZE_QUE2,
149165
.gmac_queue_config[2].nRxBuffCount = TCPIP_GMAC_RX_BUFF_COUNT_QUE2,
150166
.gmac_queue_config[2].nRxBuffCntThres = TCPIP_GMAC_RX_BUFF_COUNT_THRESHOLD_QUE2,
151167
.gmac_queue_config[2].nRxBuffAllocCnt = TCPIP_GMAC_RX_BUFF_ALLOC_COUNT_QUE2,
152168

153169
/** QUEUE 3 Intialization**/
154-
.gmac_queue_config[3].queueEnable = false,
170+
.gmac_queue_config[3].queueTxEnable = false,
171+
.gmac_queue_config[3].queueRxEnable = false,
155172
.gmac_queue_config[3].nRxDescCnt = TCPIP_GMAC_RX_DESCRIPTORS_COUNT_QUE3,
156173
.gmac_queue_config[3].nTxDescCnt = TCPIP_GMAC_TX_DESCRIPTORS_COUNT_QUE3,
157174
.gmac_queue_config[3].rxBufferSize = TCPIP_GMAC_RX_BUFF_SIZE_QUE3,
158175
.gmac_queue_config[3].txBufferSize = TCPIP_GMAC_TX_BUFF_SIZE_QUE3,
176+
.gmac_queue_config[3].txMaxPktSize = TCPIP_GMAC_MAX_TX_PKT_SIZE_QUE3,
159177
.gmac_queue_config[3].nRxBuffCount = TCPIP_GMAC_RX_BUFF_COUNT_QUE3,
160178
.gmac_queue_config[3].nRxBuffCntThres = TCPIP_GMAC_RX_BUFF_COUNT_THRESHOLD_QUE3,
161179
.gmac_queue_config[3].nRxBuffAllocCnt = TCPIP_GMAC_RX_BUFF_ALLOC_COUNT_QUE3,
162180

163181
/** QUEUE 4 Intialization**/
164-
.gmac_queue_config[4].queueEnable = false,
182+
.gmac_queue_config[4].queueTxEnable = false,
183+
.gmac_queue_config[4].queueRxEnable = false,
165184
.gmac_queue_config[4].nRxDescCnt = TCPIP_GMAC_RX_DESCRIPTORS_COUNT_QUE4,
166185
.gmac_queue_config[4].nTxDescCnt = TCPIP_GMAC_TX_DESCRIPTORS_COUNT_QUE4,
167186
.gmac_queue_config[4].rxBufferSize = TCPIP_GMAC_RX_BUFF_SIZE_QUE4,
168187
.gmac_queue_config[4].txBufferSize = TCPIP_GMAC_TX_BUFF_SIZE_QUE4,
188+
.gmac_queue_config[4].txMaxPktSize = TCPIP_GMAC_MAX_TX_PKT_SIZE_QUE4,
169189
.gmac_queue_config[4].nRxBuffCount = TCPIP_GMAC_RX_BUFF_COUNT_QUE4,
170190
.gmac_queue_config[4].nRxBuffCntThres = TCPIP_GMAC_RX_BUFF_COUNT_THRESHOLD_QUE4,
171191
.gmac_queue_config[4].nRxBuffAllocCnt = TCPIP_GMAC_RX_BUFF_ALLOC_COUNT_QUE4,
172192

173193
/** QUEUE 5 Intialization**/
174-
.gmac_queue_config[5].queueEnable = false,
194+
.gmac_queue_config[5].queueTxEnable = false,
195+
.gmac_queue_config[5].queueRxEnable = false,
175196
.gmac_queue_config[5].nRxDescCnt = TCPIP_GMAC_RX_DESCRIPTORS_COUNT_QUE5,
176197
.gmac_queue_config[5].nTxDescCnt = TCPIP_GMAC_TX_DESCRIPTORS_COUNT_QUE5,
177198
.gmac_queue_config[5].rxBufferSize = TCPIP_GMAC_RX_BUFF_SIZE_QUE5,
178199
.gmac_queue_config[5].txBufferSize = TCPIP_GMAC_TX_BUFF_SIZE_QUE5,
200+
.gmac_queue_config[5].txMaxPktSize = TCPIP_GMAC_MAX_TX_PKT_SIZE_QUE5,
179201
.gmac_queue_config[5].nRxBuffCount = TCPIP_GMAC_RX_BUFF_COUNT_QUE5,
180202
.gmac_queue_config[5].nRxBuffCntThres = TCPIP_GMAC_RX_BUFF_COUNT_THRESHOLD_QUE5,
181203
.gmac_queue_config[5].nRxBuffAllocCnt = TCPIP_GMAC_RX_BUFF_ALLOC_COUNT_QUE5,
@@ -184,6 +206,11 @@ const TCPIP_MODULE_MAC_PIC32C_CONFIG tcpipMACPIC32CINTInitData =
184206
.ethModuleId = TCPIP_INTMAC_MODULE_ID,
185207
.pPhyBase = &DRV_ETHPHY_OBJECT_BASE_Default,
186208
.pPhyInit = &tcpipPhyInitData,
209+
.checksumOffloadRx = DRV_GMAC_RX_CHKSM_OFFLOAD,
210+
.checksumOffloadTx = DRV_GMAC_TX_CHKSM_OFFLOAD,
211+
.macTxPrioNum = TCPIP_GMAC_TX_PRIO_COUNT,
212+
.macRxPrioNum = TCPIP_GMAC_RX_PRIO_COUNT,
213+
.pRxQueFiltInit = &DRV_GMAC_Rx_Filt_Init,
187214
};
188215

189216

0 commit comments

Comments
 (0)