Skip to content

Commit

Permalink
Regenerated and tested with net repo 3.7 updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
@MCHP-Shan
MCHP-Shan committed Jan 11, 2021
1 parent a54ebda commit 556bbb6
Show file tree
Hide file tree
Showing 230 changed files with 22,289 additions and 16,080 deletions.
5 changes: 2 additions & 3 deletions ...rd/freertos_plus_tcp/source/portable/NetworkInterface/pic32mzef_h3/NetworkInterface_eth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@
// *****************************************************************************
// *****************************************************************************


#define TCPIP_STACK_TICK_RATE 5
#define TCPIP_STACK_SECURE_PORT_ENTRIES 10

Expand Down Expand Up @@ -161,7 +160,7 @@ const DRV_ETHPHY_INIT tcpipPhyInitData =

};

/*** GMAC MAC Initialization Data ***/
/*** ETH MAC Initialization Data ***/
const TCPIP_MODULE_MAC_PIC32INT_CONFIG tcpipMACPIC32INTInitData =
{
.nTxDescriptors = TCPIP_EMAC_TX_DESCRIPTORS,
Expand All @@ -178,7 +177,6 @@ const TCPIP_MODULE_MAC_PIC32INT_CONFIG tcpipMACPIC32INTInitData =
.pPhyInit = &tcpipPhyInitData,
};


#ifdef PIC32_USE_ETHERNET

/* local definitions and data */
Expand Down Expand Up @@ -642,6 +640,7 @@ const TCPIP_MODULE_MAC_PIC32INT_CONFIG tcpipMACPIC32INTInitData =
pMacCtrl->netIx = 0;
pMacCtrl->macAction = TCPIP_MAC_ACTION_INIT;
pMacCtrl->powerMode = TCPIP_MAC_POWER_FULL;
pMacCtrl->segLoadOffset = TCPIP_PKT_SegLoadOffset();

macAdd.v[ 0 ] = configMAC_ADDR0;
macAdd.v[ 1 ] = configMAC_ADDR1;
Expand Down
14 changes: 13 additions & 1 deletion ...standard/freertos_plus_tcp/source/portable/NetworkInterface/same54/NetworkInterface_eth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,22 @@ const DRV_ETHPHY_INIT tcpipPhyInitData =

};

const DRV_GMAC_RXQUE_FILTER_INIT DRV_GMAC_Rx_Filt_Init =
{
.type1FiltCount = TCPIP_GMAC_SCREEN1_COUNT_QUE,
.type2FiltCount = TCPIP_GMAC_SCREEN2_COUNT_QUE,
};
/*** GMAC MAC Initialization Data ***/
const TCPIP_MODULE_MAC_PIC32C_CONFIG tcpipMACPIC32CINTInitData =
{
/** QUEUE 0 Intialization**/
.gmac_queue_config[0].queueEnable = true,
.gmac_queue_config[0].queueTxEnable = true,
.gmac_queue_config[0].queueRxEnable = true,
.gmac_queue_config[0].nRxDescCnt = TCPIP_GMAC_RX_DESCRIPTORS_COUNT_QUE0,
.gmac_queue_config[0].nTxDescCnt = TCPIP_GMAC_TX_DESCRIPTORS_COUNT_QUE0,
.gmac_queue_config[0].rxBufferSize = TCPIP_GMAC_RX_BUFF_SIZE_QUE0,
.gmac_queue_config[0].txBufferSize = TCPIP_GMAC_TX_BUFF_SIZE_QUE0,
.gmac_queue_config[0].txMaxPktSize = TCPIP_GMAC_MAX_TX_PKT_SIZE_QUE0,
.gmac_queue_config[0].nRxBuffCount = TCPIP_GMAC_RX_BUFF_COUNT_QUE0,
.gmac_queue_config[0].nRxBuffCntThres = TCPIP_GMAC_RX_BUFF_COUNT_THRESHOLD_QUE0,
.gmac_queue_config[0].nRxBuffAllocCnt = TCPIP_GMAC_RX_BUFF_ALLOC_COUNT_QUE0,
Expand All @@ -141,6 +148,11 @@ const TCPIP_MODULE_MAC_PIC32C_CONFIG tcpipMACPIC32CINTInitData =
.ethModuleId = TCPIP_INTMAC_MODULE_ID,
.pPhyBase = &DRV_ETHPHY_OBJECT_BASE_Default,
.pPhyInit = &tcpipPhyInitData,
.checksumOffloadRx = DRV_GMAC_RX_CHKSM_OFFLOAD,
.checksumOffloadTx = DRV_GMAC_TX_CHKSM_OFFLOAD,
.macTxPrioNum = TCPIP_GMAC_TX_PRIO_COUNT,
.macRxPrioNum = TCPIP_GMAC_RX_PRIO_COUNT,
.pRxQueFiltInit = &DRV_GMAC_Rx_Filt_Init,
};


Expand Down
41 changes: 34 additions & 7 deletions ...standard/freertos_plus_tcp/source/portable/NetworkInterface/same70/NetworkInterface_eth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const DRV_MIIM_INIT drvMiimInitData =

const TCPIP_NETWORK_CONFIG __attribute__((unused)) TCPIP_HOSTS_CONFIGURATION[] =
{
/*** Network Configuration Index 0 ***/
/*** Network Configuration Index 0 ***/
{
TCPIP_NETWORK_DEFAULT_INTERFACE_NAME_IDX0, // interface
TCPIP_NETWORK_DEFAULT_HOST_NAME_IDX0, // hostName
Expand All @@ -104,6 +104,8 @@ const TCPIP_NETWORK_CONFIG __attribute__((unused)) TCPIP_HOSTS_CONFIGURATION[]
&TCPIP_NETWORK_DEFAULT_MAC_DRIVER_IDX0, // pMacObject
},
};


const DRV_ETHPHY_INIT tcpipPhyInitData =
{
.ethphyId = TCPIP_INTMAC_MODULE_ID,
Expand All @@ -117,65 +119,85 @@ const DRV_ETHPHY_INIT tcpipPhyInitData =

};

const DRV_GMAC_RXQUE_FILTER_INIT DRV_GMAC_Rx_Filt_Init =
{
.type1FiltCount = TCPIP_GMAC_SCREEN1_COUNT_QUE,
.type2FiltCount = TCPIP_GMAC_SCREEN2_COUNT_QUE,
};


/*** GMAC MAC Initialization Data ***/
/*** GMAC MAC Initialization Data ***/
const TCPIP_MODULE_MAC_PIC32C_CONFIG tcpipMACPIC32CINTInitData =
{
/** QUEUE 0 Intialization**/
.gmac_queue_config[0].queueEnable = true,
.gmac_queue_config[0].queueTxEnable = true,
.gmac_queue_config[0].queueRxEnable = true,
.gmac_queue_config[0].nRxDescCnt = TCPIP_GMAC_RX_DESCRIPTORS_COUNT_QUE0,
.gmac_queue_config[0].nTxDescCnt = TCPIP_GMAC_TX_DESCRIPTORS_COUNT_QUE0,
.gmac_queue_config[0].rxBufferSize = TCPIP_GMAC_RX_BUFF_SIZE_QUE0,
.gmac_queue_config[0].txBufferSize = TCPIP_GMAC_TX_BUFF_SIZE_QUE0,
.gmac_queue_config[0].txMaxPktSize = TCPIP_GMAC_MAX_TX_PKT_SIZE_QUE0,
.gmac_queue_config[0].nRxBuffCount = TCPIP_GMAC_RX_BUFF_COUNT_QUE0,
.gmac_queue_config[0].nRxBuffCntThres = TCPIP_GMAC_RX_BUFF_COUNT_THRESHOLD_QUE0,
.gmac_queue_config[0].nRxBuffAllocCnt = TCPIP_GMAC_RX_BUFF_ALLOC_COUNT_QUE0,

/** QUEUE 1 Intialization**/
.gmac_queue_config[1].queueEnable = false,
.gmac_queue_config[1].queueTxEnable = false,
.gmac_queue_config[1].queueRxEnable = false,
.gmac_queue_config[1].nRxDescCnt = TCPIP_GMAC_RX_DESCRIPTORS_COUNT_QUE1,
.gmac_queue_config[1].nTxDescCnt = TCPIP_GMAC_TX_DESCRIPTORS_COUNT_QUE1,
.gmac_queue_config[1].rxBufferSize = TCPIP_GMAC_RX_BUFF_SIZE_QUE1,
.gmac_queue_config[1].txBufferSize = TCPIP_GMAC_TX_BUFF_SIZE_QUE1,
.gmac_queue_config[1].txMaxPktSize = TCPIP_GMAC_MAX_TX_PKT_SIZE_QUE1,
.gmac_queue_config[1].nRxBuffCount = TCPIP_GMAC_RX_BUFF_COUNT_QUE1,
.gmac_queue_config[1].nRxBuffCntThres = TCPIP_GMAC_RX_BUFF_COUNT_THRESHOLD_QUE1,
.gmac_queue_config[1].nRxBuffAllocCnt = TCPIP_GMAC_RX_BUFF_ALLOC_COUNT_QUE1,

/** QUEUE 2 Intialization**/
.gmac_queue_config[2].queueEnable = false,
.gmac_queue_config[2].queueTxEnable = false,
.gmac_queue_config[2].queueRxEnable = false,
.gmac_queue_config[2].nRxDescCnt = TCPIP_GMAC_RX_DESCRIPTORS_COUNT_QUE2,
.gmac_queue_config[2].nTxDescCnt = TCPIP_GMAC_TX_DESCRIPTORS_COUNT_QUE2,
.gmac_queue_config[2].rxBufferSize = TCPIP_GMAC_RX_BUFF_SIZE_QUE2,
.gmac_queue_config[2].txBufferSize = TCPIP_GMAC_TX_BUFF_SIZE_QUE2,
.gmac_queue_config[2].txMaxPktSize = TCPIP_GMAC_MAX_TX_PKT_SIZE_QUE2,
.gmac_queue_config[2].nRxBuffCount = TCPIP_GMAC_RX_BUFF_COUNT_QUE2,
.gmac_queue_config[2].nRxBuffCntThres = TCPIP_GMAC_RX_BUFF_COUNT_THRESHOLD_QUE2,
.gmac_queue_config[2].nRxBuffAllocCnt = TCPIP_GMAC_RX_BUFF_ALLOC_COUNT_QUE2,

/** QUEUE 3 Intialization**/
.gmac_queue_config[3].queueEnable = false,
.gmac_queue_config[3].queueTxEnable = false,
.gmac_queue_config[3].queueRxEnable = false,
.gmac_queue_config[3].nRxDescCnt = TCPIP_GMAC_RX_DESCRIPTORS_COUNT_QUE3,
.gmac_queue_config[3].nTxDescCnt = TCPIP_GMAC_TX_DESCRIPTORS_COUNT_QUE3,
.gmac_queue_config[3].rxBufferSize = TCPIP_GMAC_RX_BUFF_SIZE_QUE3,
.gmac_queue_config[3].txBufferSize = TCPIP_GMAC_TX_BUFF_SIZE_QUE3,
.gmac_queue_config[3].txMaxPktSize = TCPIP_GMAC_MAX_TX_PKT_SIZE_QUE3,
.gmac_queue_config[3].nRxBuffCount = TCPIP_GMAC_RX_BUFF_COUNT_QUE3,
.gmac_queue_config[3].nRxBuffCntThres = TCPIP_GMAC_RX_BUFF_COUNT_THRESHOLD_QUE3,
.gmac_queue_config[3].nRxBuffAllocCnt = TCPIP_GMAC_RX_BUFF_ALLOC_COUNT_QUE3,

/** QUEUE 4 Intialization**/
.gmac_queue_config[4].queueEnable = false,
.gmac_queue_config[4].queueTxEnable = false,
.gmac_queue_config[4].queueRxEnable = false,
.gmac_queue_config[4].nRxDescCnt = TCPIP_GMAC_RX_DESCRIPTORS_COUNT_QUE4,
.gmac_queue_config[4].nTxDescCnt = TCPIP_GMAC_TX_DESCRIPTORS_COUNT_QUE4,
.gmac_queue_config[4].rxBufferSize = TCPIP_GMAC_RX_BUFF_SIZE_QUE4,
.gmac_queue_config[4].txBufferSize = TCPIP_GMAC_TX_BUFF_SIZE_QUE4,
.gmac_queue_config[4].txMaxPktSize = TCPIP_GMAC_MAX_TX_PKT_SIZE_QUE4,
.gmac_queue_config[4].nRxBuffCount = TCPIP_GMAC_RX_BUFF_COUNT_QUE4,
.gmac_queue_config[4].nRxBuffCntThres = TCPIP_GMAC_RX_BUFF_COUNT_THRESHOLD_QUE4,
.gmac_queue_config[4].nRxBuffAllocCnt = TCPIP_GMAC_RX_BUFF_ALLOC_COUNT_QUE4,

/** QUEUE 5 Intialization**/
.gmac_queue_config[5].queueEnable = false,
.gmac_queue_config[5].queueTxEnable = false,
.gmac_queue_config[5].queueRxEnable = false,
.gmac_queue_config[5].nRxDescCnt = TCPIP_GMAC_RX_DESCRIPTORS_COUNT_QUE5,
.gmac_queue_config[5].nTxDescCnt = TCPIP_GMAC_TX_DESCRIPTORS_COUNT_QUE5,
.gmac_queue_config[5].rxBufferSize = TCPIP_GMAC_RX_BUFF_SIZE_QUE5,
.gmac_queue_config[5].txBufferSize = TCPIP_GMAC_TX_BUFF_SIZE_QUE5,
.gmac_queue_config[5].txMaxPktSize = TCPIP_GMAC_MAX_TX_PKT_SIZE_QUE5,
.gmac_queue_config[5].nRxBuffCount = TCPIP_GMAC_RX_BUFF_COUNT_QUE5,
.gmac_queue_config[5].nRxBuffCntThres = TCPIP_GMAC_RX_BUFF_COUNT_THRESHOLD_QUE5,
.gmac_queue_config[5].nRxBuffAllocCnt = TCPIP_GMAC_RX_BUFF_ALLOC_COUNT_QUE5,
Expand All @@ -184,6 +206,11 @@ const TCPIP_MODULE_MAC_PIC32C_CONFIG tcpipMACPIC32CINTInitData =
.ethModuleId = TCPIP_INTMAC_MODULE_ID,
.pPhyBase = &DRV_ETHPHY_OBJECT_BASE_Default,
.pPhyInit = &tcpipPhyInitData,
.checksumOffloadRx = DRV_GMAC_RX_CHKSM_OFFLOAD,
.checksumOffloadTx = DRV_GMAC_TX_CHKSM_OFFLOAD,
.macTxPrioNum = TCPIP_GMAC_TX_PRIO_COUNT,
.macRxPrioNum = TCPIP_GMAC_RX_PRIO_COUNT,
.pRxQueFiltInit = &DRV_GMAC_Rx_Filt_Init,
};


Expand Down
Loading

0 comments on commit 556bbb6

Please sign in to comment.