Skip to content

Commit 6a8b501

Browse files
actions-useractions-user
committed
Uncrustify: triggered by comment.
1 parent bf49f4f commit 6a8b501

File tree

19 files changed

+90
-82
lines changed

19 files changed

+90
-82
lines changed

‎source/FreeRTOS_ARP.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@
9595
* Lookup an MAC address in the ARP cache from the IP address.
9696
*/
9797
static eResolutionLookupResult_t prvCacheLookup( uint32_t ulAddressToLookup,
98-
MACAddress_t * const pxMACAddress,
99-
NetworkEndPoint_t ** ppxEndPoint );
98+
MACAddress_t * const pxMACAddress,
99+
NetworkEndPoint_t ** ppxEndPoint );
100100

101101
static eResolutionLookupResult_t eARPGetCacheEntryGateWay( uint32_t * pulIPAddress,
102-
MACAddress_t * const pxMACAddress,
103-
struct xNetworkEndPoint ** ppxEndPoint );
102+
MACAddress_t * const pxMACAddress,
103+
struct xNetworkEndPoint ** ppxEndPoint );
104104

105105
static BaseType_t prvFindCacheEntry( const MACAddress_t * pxMACAddress,
106106
const uint32_t ulIPAddress,
@@ -822,8 +822,8 @@
822822
* @return Either eResolutionCacheMiss or eResolutionCacheHit.
823823
*/
824824
eResolutionLookupResult_t eARPGetCacheEntryByMac( const MACAddress_t * const pxMACAddress,
825-
uint32_t * pulIPAddress,
826-
struct xNetworkInterface ** ppxInterface )
825+
uint32_t * pulIPAddress,
826+
struct xNetworkInterface ** ppxInterface )
827827
{
828828
BaseType_t x;
829829
eResolutionLookupResult_t eReturn = eResolutionCacheMiss;
@@ -878,8 +878,8 @@
878878
* eResolutionFailed.
879879
*/
880880
eResolutionLookupResult_t eARPGetCacheEntry( uint32_t * pulIPAddress,
881-
MACAddress_t * const pxMACAddress,
882-
struct xNetworkEndPoint ** ppxEndPoint )
881+
MACAddress_t * const pxMACAddress,
882+
struct xNetworkEndPoint ** ppxEndPoint )
883883
{
884884
eResolutionLookupResult_t eReturn;
885885
uint32_t ulAddressToLookup;
@@ -945,8 +945,8 @@
945945
* @param[out] ppxEndPoint The end-point of the gateway will be copy to the pointee.
946946
*/
947947
static eResolutionLookupResult_t eARPGetCacheEntryGateWay( uint32_t * pulIPAddress,
948-
MACAddress_t * const pxMACAddress,
949-
struct xNetworkEndPoint ** ppxEndPoint )
948+
MACAddress_t * const pxMACAddress,
949+
struct xNetworkEndPoint ** ppxEndPoint )
950950
{
951951
eResolutionLookupResult_t eReturn = eResolutionCacheMiss;
952952
uint32_t ulAddressToLookup = *( pulIPAddress );
@@ -1040,8 +1040,8 @@
10401040
* and when waiting for a ARP reply: eResolutionFailed.
10411041
*/
10421042
static eResolutionLookupResult_t prvCacheLookup( uint32_t ulAddressToLookup,
1043-
MACAddress_t * const pxMACAddress,
1044-
NetworkEndPoint_t ** ppxEndPoint )
1043+
MACAddress_t * const pxMACAddress,
1044+
NetworkEndPoint_t ** ppxEndPoint )
10451045
{
10461046
BaseType_t x;
10471047
eResolutionLookupResult_t eReturn = eResolutionCacheMiss;

‎source/FreeRTOS_IP.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1793,9 +1793,10 @@ static void prvProcessEthernetPacket( NetworkBufferDescriptor_t * const pxNetwor
17931793

17941794
iptraceDELAYED_ARP_BUFFER_FULL();
17951795
}
1796+
17961797
break;
17971798
}
1798-
#endif
1799+
#endif /* if ipconfigIS_ENABLED( ipconfigUSE_IPv4 ) */
17991800

18001801
#if ipconfigIS_ENABLED( ipconfigUSE_IPv6 )
18011802
if( pxEthernetHeader->usFrameType == ipIPv6_FRAME_TYPE )
@@ -1814,9 +1815,10 @@ static void prvProcessEthernetPacket( NetworkBufferDescriptor_t * const pxNetwor
18141815

18151816
iptraceDELAYED_ND_BUFFER_FULL();
18161817
}
1818+
18171819
break;
18181820
}
1819-
#endif
1821+
#endif /* if ipconfigIS_ENABLED( ipconfigUSE_IPv6 ) */
18201822

18211823
break;
18221824

‎source/FreeRTOS_IP_Timers.c‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ static void prvIPTimerReload( IPTimer_t * pxTimer,
9595
*/
9696

9797
#if ipconfigIS_ENABLED( ipconfigUSE_IPv4 )
98+
9899
/** @brief Timer to limit the maximum time a packet should be stored while
99100
* awaiting an ARP resolution. */
100101
static IPTimer_t xARPResolutionTimer;
@@ -103,6 +104,7 @@ static void prvIPTimerReload( IPTimer_t * pxTimer,
103104
static IPTimer_t xARPTimer;
104105
#endif
105106
#if ipconfigIS_ENABLED( ipconfigUSE_IPv6 )
107+
106108
/** @brief Timer to limit the maximum time a packet should be stored while
107109
* awaiting an ND resolution. */
108110
static IPTimer_t xNDResolutionTimer;
@@ -250,7 +252,7 @@ void vCheckNetworkTimers( void )
250252
iptraceDELAYED_ARP_TIMER_EXPIRED();
251253
}
252254
}
253-
#endif
255+
#endif /* if ipconfigIS_ENABLED( ipconfigUSE_IPv4 ) */
254256

255257
#if ipconfigIS_ENABLED( ipconfigUSE_IPv6 )
256258
/* Is it time for ND processing? */
@@ -277,7 +279,7 @@ void vCheckNetworkTimers( void )
277279
iptraceDELAYED_ND_TIMER_EXPIRED();
278280
}
279281
}
280-
#endif
282+
#endif /* if ipconfigIS_ENABLED( ipconfigUSE_IPv6 ) */
281283

282284
#if ( ipconfigUSE_DHCP == 1 ) || ( ipconfigUSE_RA == 1 )
283285
{
@@ -473,10 +475,10 @@ static void prvIPTimerReload( IPTimer_t * pxTimer,
473475
*
474476
* @param[in] xTime Time to be reloaded into the ARP timer.
475477
*/
476-
void vARPTimerReload( TickType_t xTime )
477-
{
478-
prvIPTimerReload( &xARPTimer, xTime );
479-
}
478+
void vARPTimerReload( TickType_t xTime )
479+
{
480+
prvIPTimerReload( &xARPTimer, xTime );
481+
}
480482
#endif
481483
/*-----------------------------------------------------------*/
482484

@@ -487,10 +489,10 @@ void vARPTimerReload( TickType_t xTime )
487489
*
488490
* @param[in] xTime Time to be reloaded into the ND timer.
489491
*/
490-
void vNDTimerReload( TickType_t xTime )
491-
{
492-
prvIPTimerReload( &xNDTimer, xTime );
493-
}
492+
void vNDTimerReload( TickType_t xTime )
493+
{
494+
prvIPTimerReload( &xNDTimer, xTime );
495+
}
494496
#endif
495497
/*-----------------------------------------------------------*/
496498

@@ -639,7 +641,7 @@ static BaseType_t prvIPTimerCheck( IPTimer_t * pxTimer )
639641
xARPResolutionTimer.bActive = pdFALSE_UNSIGNED;
640642
}
641643
}
642-
#endif
644+
#endif /* if ipconfigIS_ENABLED( ipconfigUSE_IPv4 ) */
643645
/*-----------------------------------------------------------*/
644646

645647
#if ipconfigIS_ENABLED( ipconfigUSE_IPv6 )
@@ -678,7 +680,7 @@ static BaseType_t prvIPTimerCheck( IPTimer_t * pxTimer )
678680
xNDResolutionTimer.bActive = pdFALSE_UNSIGNED;
679681
}
680682
}
681-
#endif
683+
#endif /* if ipconfigIS_ENABLED( ipconfigUSE_IPv6 ) */
682684
/*-----------------------------------------------------------*/
683685

684686
#if ( ipconfigUSE_DHCP == 1 ) || ( ipconfigUSE_RA == 1 ) || ( ipconfigUSE_DHCPv6 == 1 )

‎source/FreeRTOS_IP_Utils.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,7 @@ void prvProcessNetworkDownEvent( struct xNetworkInterface * pxInterface )
872872
#endif /* ipconfigUSE_NETWORK_EVENT_HOOK */
873873

874874
#if ipconfigIS_ENABLED( ipconfigUSE_IPv4 )
875+
875876
/* Per the ARP Cache Validation section of https://tools.ietf.org/html/rfc1122
876877
* treat network down as a "delivery problem" and flush the ARP cache for this
877878
* interface. */

‎source/FreeRTOS_ND.c‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@
7979

8080
/** @brief See if the MAC-address can be resolved because it is a multi-cast address. */
8181
static eResolutionLookupResult_t prvMACResolve( const IPv6_Address_t * pxAddressToLookup,
82-
MACAddress_t * const pxMACAddress,
83-
NetworkEndPoint_t ** ppxEndPoint );
82+
MACAddress_t * const pxMACAddress,
83+
NetworkEndPoint_t ** ppxEndPoint );
8484

8585
/** @brief Lookup an MAC address in the ND cache from the IP address. */
8686
static eResolutionLookupResult_t prvNDCacheLookup( const IPv6_Address_t * pxAddressToLookup,
87-
MACAddress_t * const pxMACAddress,
88-
NetworkEndPoint_t ** ppxEndPoint );
87+
MACAddress_t * const pxMACAddress,
88+
NetworkEndPoint_t ** ppxEndPoint );
8989

9090
#if ( ipconfigHAS_PRINTF == 1 )
9191
static const char * pcMessageType( BaseType_t xType );
@@ -147,8 +147,8 @@
147147
* @return An enum, either eResolutionCacheHit or eResolutionCacheMiss.
148148
*/
149149
static eResolutionLookupResult_t prvMACResolve( const IPv6_Address_t * pxAddressToLookup,
150-
MACAddress_t * const pxMACAddress,
151-
NetworkEndPoint_t ** ppxEndPoint )
150+
MACAddress_t * const pxMACAddress,
151+
NetworkEndPoint_t ** ppxEndPoint )
152152
{
153153
eResolutionLookupResult_t eReturn;
154154

@@ -185,8 +185,8 @@
185185
* @return An enum which says whether the address was found: eResolutionCacheHit or eResolutionCacheMiss.
186186
*/
187187
eResolutionLookupResult_t eNDGetCacheEntry( IPv6_Address_t * pxIPAddress,
188-
MACAddress_t * const pxMACAddress,
189-
struct xNetworkEndPoint ** ppxEndPoint )
188+
MACAddress_t * const pxMACAddress,
189+
struct xNetworkEndPoint ** ppxEndPoint )
190190
{
191191
eResolutionLookupResult_t eReturn;
192192
NetworkEndPoint_t * pxEndPoint;
@@ -424,6 +424,7 @@
424424
void FreeRTOS_ClearND( const struct xNetworkEndPoint * pxEndPoint )
425425
{
426426
( void ) memset( xNDCache, 0, sizeof( xNDCache ) );
427+
427428
if( pxEndPoint != NULL )
428429
{
429430
BaseType_t x;
@@ -453,8 +454,8 @@
453454
* @return An enum: either eResolutionCacheHit or eResolutionCacheMiss.
454455
*/
455456
static eResolutionLookupResult_t prvNDCacheLookup( const IPv6_Address_t * pxAddressToLookup,
456-
MACAddress_t * const pxMACAddress,
457-
NetworkEndPoint_t ** ppxEndPoint )
457+
MACAddress_t * const pxMACAddress,
458+
NetworkEndPoint_t ** ppxEndPoint )
458459
{
459460
BaseType_t x;
460461
eResolutionLookupResult_t eReturn = eResolutionCacheMiss;

‎source/FreeRTOS_TCP_Transmission_IPv4.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,11 +351,11 @@ BaseType_t prvTCPPrepareConnect_IPV4( FreeRTOS_Socket_t * pxSocket )
351351

352352
switch( eReturned )
353353
{
354-
case eResolutionCacheHit: /* An ARP table lookup found a valid entry. */
355-
break; /* We can now prepare the SYN packet. */
354+
case eResolutionCacheHit: /* An ARP table lookup found a valid entry. */
355+
break; /* We can now prepare the SYN packet. */
356356

357-
case eResolutionCacheMiss: /* An ARP table lookup did not find a valid entry. */
358-
case eResolutionFailed: /* There is no IP address, or an ARP is still in progress. */
357+
case eResolutionCacheMiss: /* An ARP table lookup did not find a valid entry. */
358+
case eResolutionFailed: /* There is no IP address, or an ARP is still in progress. */
359359
default:
360360
/* Count the number of times it could not find the ARP address. */
361361
pxSocket->u.xTCP.ucRepCount++;

‎source/FreeRTOS_TCP_Transmission_IPv6.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,11 +351,11 @@ BaseType_t prvTCPPrepareConnect_IPV6( FreeRTOS_Socket_t * pxSocket )
351351

352352
switch( eReturned )
353353
{
354-
case eResolutionCacheHit: /* An ND table lookup found a valid entry. */
355-
break; /* We can now prepare the SYN packet. */
354+
case eResolutionCacheHit: /* An ND table lookup found a valid entry. */
355+
break; /* We can now prepare the SYN packet. */
356356

357-
case eResolutionCacheMiss: /* An ND table lookup did not find a valid entry. */
358-
case eResolutionFailed: /* There is no IP address, or an ND is still in progress. */
357+
case eResolutionCacheMiss: /* An ND table lookup did not find a valid entry. */
358+
case eResolutionFailed: /* There is no IP address, or an ND is still in progress. */
359359
default:
360360
/* Count the number of times it could not find the ND address. */
361361
pxSocket->u.xTCP.ucRepCount++;

‎source/FreeRTOS_UDP_IPv6.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ static NetworkEndPoint_t * pxGetEndpoint( BaseType_t xIPType,
122122
* ( the ownership was taken ).
123123
*/
124124
static eResolutionLookupResult_t prvStartLookup( NetworkBufferDescriptor_t * const pxNetworkBuffer,
125-
BaseType_t * pxLostBuffer )
125+
BaseType_t * pxLostBuffer )
126126
{
127127
eResolutionLookupResult_t eReturned = eResolutionCacheMiss;
128128

‎source/include/FreeRTOS_ARP.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,15 @@ BaseType_t xCheckRequiresARPResolution( const NetworkBufferDescriptor_t * pxNetw
120120
* isn't a gateway defined) then return eResolutionFailed.
121121
*/
122122
eResolutionLookupResult_t eARPGetCacheEntry( uint32_t * pulIPAddress,
123-
MACAddress_t * const pxMACAddress,
124-
struct xNetworkEndPoint ** ppxEndPoint );
123+
MACAddress_t * const pxMACAddress,
124+
struct xNetworkEndPoint ** ppxEndPoint );
125125

126126
#if ( ipconfigUSE_ARP_REVERSED_LOOKUP != 0 )
127127

128128
/* Lookup an IP-address if only the MAC-address is known */
129129
eResolutionLookupResult_t eARPGetCacheEntryByMac( const MACAddress_t * const pxMACAddress,
130-
uint32_t * pulIPAddress,
131-
struct xNetworkInterface ** ppxInterface );
130+
uint32_t * pulIPAddress,
131+
struct xNetworkInterface ** ppxInterface );
132132

133133
#endif
134134

‎source/include/FreeRTOS_IP_Timers.h‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ TickType_t xCalculateSleepTime( void );
7878
void vIPSetTCPTimerExpiredState( BaseType_t xExpiredState );
7979

8080
#if ipconfigIS_ENABLED( ipconfigUSE_IPv4 )
81+
8182
/**
8283
* Sets the reload time of an ARP timer and restarts it.
8384
*/
@@ -97,29 +98,30 @@ void vIPSetTCPTimerExpiredState( BaseType_t xExpiredState );
9798
* Enable or disable the ARP resolution timer.
9899
*/
99100
void vIPSetARPResolutionTimerEnableState( BaseType_t xEnableState );
100-
#endif
101+
#endif /* if ipconfigIS_ENABLED( ipconfigUSE_IPv4 ) */
101102

102103
#if ipconfigIS_ENABLED( ipconfigUSE_IPv6 )
103-
/**
104-
* Sets the reload time of an ND timer and restarts it.
105-
*/
104+
105+
/**
106+
* Sets the reload time of an ND timer and restarts it.
107+
*/
106108
void vNDTimerReload( TickType_t xTime );
107109

108-
/*
109-
* Start an ND Resolution timer.
110-
*/
110+
/*
111+
* Start an ND Resolution timer.
112+
*/
111113
void vIPTimerStartNDResolution( TickType_t xTime );
112114

113-
/*
114-
* Enable/disable the ND timer.
115-
*/
115+
/*
116+
* Enable/disable the ND timer.
117+
*/
116118
void vIPSetNDTimerEnableState( BaseType_t xEnableState );
117119

118-
/*
119-
* Enable or disable the ARP resolution timer.
120-
*/
120+
/*
121+
* Enable or disable the ARP resolution timer.
122+
*/
121123
void vIPSetNDResolutionTimerEnableState( BaseType_t xEnableState );
122-
#endif
124+
#endif /* if ipconfigIS_ENABLED( ipconfigUSE_IPv6 ) */
123125

124126
#if ( ipconfigUSE_DHCP == 1 ) || ( ipconfigUSE_RA == 1 )
125127

0 commit comments

Comments
 (0)