Skip to content

Commit 125b153

Browse files
committed
Review Fixes
1 parent b8c0fd8 commit 125b153

File tree

1 file changed

+3
-68
lines changed

1 file changed

+3
-68
lines changed

source/portable/NetworkInterface/STM32/NetworkInterface.c

Lines changed: 3 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -635,75 +635,10 @@ static BaseType_t prvNetworkInterfaceOutput( NetworkInterface_t * pxInterface,
635635
FreeRTOS_debug_printf( ( "xNetworkInterfaceOutput: Unsupported ICMP\n" ) );
636636
#endif
637637
}
638-
else if( pxIPPacket->xIPHeader.ucProtocol == ipPROTOCOL_TCP )
639-
{
640-
#if ipconfigIS_ENABLED( ipconfigUSE_TCP )
641-
TCPPacket_t * const pxTCPPacket = ( TCPPacket_t * const ) pxDescriptor->pucEthernetBuffer;
642-
643-
/* #if defined( niEMAC_STM32HX ) && ipconfigIS_ENABLED( niEMAC_TCP_SEGMENTATION )
644-
* xTxConfig.MaxSegmentSize = ipconfigTCP_MSS;
645-
* xTxConfig.PayloadLen = pxDescriptor->xDataLength;
646-
* xTxConfig.TCPHeaderLen = ( pxTCPPacket->xIPHeader.ucVersionHeaderLength & ( uint8_t ) 0x0FU );
647-
* xTxConfig.Attributes |= ETH_TX_PACKETS_FEATURES_TSO;
648-
#endif */
649-
( void ) pxTCPPacket;
650-
#else
651-
FreeRTOS_debug_printf( ( "xNetworkInterfaceOutput: Unsupported TCP\n" ) );
652-
#endif
653-
}
654-
else if( pxIPPacket->xIPHeader.ucProtocol == ipPROTOCOL_UDP )
655-
{
656-
UDPPacket_t * const pxUDPPacket = ( UDPPacket_t * const ) pxDescriptor->pucEthernetBuffer;
657-
( void ) pxUDPPacket;
658-
}
659638
#else /* if ipconfigIS_ENABLED( ipconfigUSE_IPv4 ) */
660639
FreeRTOS_debug_printf( ( "xNetworkInterfaceOutput: Unsupported IPv4\n" ) );
661640
#endif /* if ipconfigIS_ENABLED( ipconfigUSE_IPv4 ) */
662641
}
663-
else if( pxEthHeader->usFrameType == ipIPv6_FRAME_TYPE )
664-
{
665-
#if ipconfigIS_ENABLED( ipconfigUSE_IPv6 )
666-
const IPPacket_IPv6_t * pxIPPacket_IPv6 = ( IPPacket_IPv6_t * ) pxDescriptor->pucEthernetBuffer;
667-
668-
if( pxIPPacket_IPv6->xIPHeader.ucNextHeader == ipPROTOCOL_ICMP_IPv6 )
669-
{
670-
#if ipconfigIS_ENABLED( ipconfigREPLY_TO_INCOMING_PINGS ) || ipconfigIS_ENABLED( ipconfigSUPPORT_OUTGOING_PINGS )
671-
ICMPPacket_IPv6_t * const pxICMPPacket_IPv6 = ( ICMPPacket_IPv6_t * const ) pxDescriptor->pucEthernetBuffer;
672-
#if ipconfigIS_ENABLED( ipconfigDRIVER_INCLUDED_TX_IP_CHECKSUM )
673-
pxICMPPacket_IPv6->xICMPHeaderIPv6.usChecksum = 0U;
674-
#endif
675-
( void ) pxICMPPacket_IPv6;
676-
#else
677-
FreeRTOS_debug_printf( ( "xNetworkInterfaceOutput: Unsupported ICMP\n" ) );
678-
#endif
679-
}
680-
else if( pxIPPacket_IPv6->xIPHeader.ucNextHeader == ipPROTOCOL_TCP )
681-
{
682-
#if ipconfigIS_ENABLED( ipconfigUSE_TCP )
683-
TCPPacket_IPv6_t * const pxTCPPacket_IPv6 = ( TCPPacket_IPv6_t * const ) pxDescriptor->pucEthernetBuffer;
684-
685-
/* #if defined( niEMAC_STM32HX ) && ipconfigIS_ENABLED( niEMAC_TCP_SEGMENTATION )
686-
* xTxConfig.PayloadLen = pxDescriptor->xDataLength;
687-
* xTxConfig.TCPHeaderLen = sizeof( pxTCPPacket_IPv6->xTCPHeader );
688-
* xTxConfig.Attributes |= ETH_TX_PACKETS_FEATURES_TSO;
689-
#endif */
690-
( void ) pxTCPPacket_IPv6;
691-
#else
692-
FreeRTOS_debug_printf( ( "xNetworkInterfaceOutput: Unsupported TCP\n" ) );
693-
#endif
694-
}
695-
else if( pxIPPacket_IPv6->xIPHeader.ucNextHeader == ipPROTOCOL_UDP )
696-
{
697-
UDPPacket_t * const pxUDPPacket_IPv6 = ( UDPPacket_t * const ) pxDescriptor->pucEthernetBuffer;
698-
( void ) pxUDPPacket_IPv6;
699-
}
700-
#else /* if ipconfigIS_ENABLED( ipconfigUSE_IPv6 ) */
701-
FreeRTOS_debug_printf( ( "xNetworkInterfaceOutput: Unsupported IPv6\n" ) );
702-
#endif /* if ipconfigIS_ENABLED( ipconfigUSE_IPv6 ) */
703-
}
704-
else if( pxEthHeader->usFrameType == ipARP_FRAME_TYPE )
705-
{
706-
}
707642

708643
ETH_BufferTypeDef xTxBuffer =
709644
{
@@ -1769,12 +1704,12 @@ static BaseType_t prvAcceptPacket( const NetworkBufferDescriptor_t * const pxDes
17691704

17701705
#if ipconfigIS_ENABLED( ipconfigETHERNET_DRIVER_FILTERS_PACKETS )
17711706
{
1772-
const ETH_DMADescTypeDef * const ulRxDesc = ( const ETH_DMADescTypeDef * const ) pxEthHandle->RxDescList.RxDesc[ pxEthHandle->RxDescList.RxDescIdx ];
1707+
const ETH_DMADescTypeDef * const pxRxDesc = ( const ETH_DMADescTypeDef * const ) pxEthHandle->RxDescList.RxDesc[ pxEthHandle->RxDescList.RxDescIdx ];
17731708
uint32_t ulRxDesc;
17741709
#ifdef niEMAC_STM32HX
1775-
ulRxDesc = ulRxDesc->DESC1;
1710+
ulRxDesc = pxRxDesc->DESC1;
17761711
#elif defined( niEMAC_STM32FX )
1777-
ulRxDesc = ulRxDesc->DESC4;
1712+
ulRxDesc = pxRxDesc->DESC4;
17781713
#endif
17791714

17801715
if( ( ulRxDesc & ETH_IP_HEADER_IPV4 ) != 0 )

0 commit comments

Comments
 (0)