Skip to content

Commit 913b90c

Browse files
Rename ETH_TxPacketConfig in STM32F4 to match other STMs (#1278)
1 parent 19134e1 commit 913b90c

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

source/portable/NetworkInterface/STM32/Drivers/F4/stm32f4xx_hal_eth.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293
static void ETH_DMATxDescListInit( ETH_HandleTypeDef * heth );
294294
static void ETH_DMARxDescListInit( ETH_HandleTypeDef * heth );
295295
static uint32_t ETH_Prepare_Tx_Descriptors( ETH_HandleTypeDef * heth,
296-
ETH_TxPacketConfig * pTxConfig,
296+
ETH_TxPacketConfigTypeDef * pTxConfig,
297297
uint32_t ItMode );
298298
static void ETH_UpdateDescriptor( ETH_HandleTypeDef * heth );
299299
static void ETH_FlushTransmitFIFO( ETH_HandleTypeDef * heth );
@@ -970,7 +970,7 @@
970970
* @retval HAL status
971971
*/
972972
HAL_StatusTypeDef HAL_ETH_Transmit( ETH_HandleTypeDef * heth,
973-
ETH_TxPacketConfig * pTxConfig,
973+
ETH_TxPacketConfigTypeDef * pTxConfig,
974974
uint32_t Timeout )
975975
{
976976
uint32_t tickstart;
@@ -1047,7 +1047,7 @@
10471047
* @retval HAL status
10481048
*/
10491049
HAL_StatusTypeDef HAL_ETH_Transmit_IT( ETH_HandleTypeDef * heth,
1050-
ETH_TxPacketConfig * pTxConfig )
1050+
ETH_TxPacketConfigTypeDef * pTxConfig )
10511051
{
10521052
if( pTxConfig == NULL )
10531053
{
@@ -3117,7 +3117,7 @@
31173117
* @retval Status
31183118
*/
31193119
static uint32_t ETH_Prepare_Tx_Descriptors( ETH_HandleTypeDef * heth,
3120-
ETH_TxPacketConfig * pTxConfig,
3120+
ETH_TxPacketConfigTypeDef * pTxConfig,
31213121
uint32_t ItMode )
31223122
{
31233123
ETH_TxDescListTypeDef * dmatxdesclist = &heth->TxDescList;

source/portable/NetworkInterface/STM32/Drivers/F4/stm32f4xx_hal_eth.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
* This parameter can be a value of @ref ETH_Tx_Packet_Inner_VLAN_Control */
157157

158158
void * pData; /*!< Specifies Application packet pointer to save */
159-
} ETH_TxPacketConfig;
159+
} ETH_TxPacketConfigTypeDef;
160160

161161
/**
162162
*
@@ -2049,10 +2049,10 @@
20492049
#endif /* HAL_ETH_USE_PTP */
20502050

20512051
HAL_StatusTypeDef HAL_ETH_Transmit( ETH_HandleTypeDef * heth,
2052-
ETH_TxPacketConfig * pTxConfig,
2052+
ETH_TxPacketConfigTypeDef * pTxConfig,
20532053
uint32_t Timeout );
20542054
HAL_StatusTypeDef HAL_ETH_Transmit_IT( ETH_HandleTypeDef * heth,
2055-
ETH_TxPacketConfig * pTxConfig );
2055+
ETH_TxPacketConfigTypeDef * pTxConfig );
20562056

20572057
HAL_StatusTypeDef HAL_ETH_WritePHYRegister( const ETH_HandleTypeDef * heth,
20582058
uint32_t PHYAddr,

source/portable/NetworkInterface/STM32/NetworkInterface.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,8 +602,7 @@ static BaseType_t prvNetworkInterfaceOutput( NetworkInterface_t * pxInterface,
602602
break;
603603
}
604604

605-
/* ETH_TxPacketConfigTypeDef */
606-
ETH_TxPacketConfig xTxConfig =
605+
ETH_TxPacketConfigTypeDef xTxConfig =
607606
{
608607
.CRCPadCtrl = ETH_CRC_PAD_INSERT,
609608
.Attributes = ETH_TX_PACKETS_FEATURES_CRCPAD,

0 commit comments

Comments
 (0)