Skip to content

Cleanup of NXP1060 network driver #801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 22, 2023
Merged

Cleanup of NXP1060 network driver #801

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
750899d
Update PR template to include checkbox for ut change
AniruddhaKanhere Feb 17, 2023
e2919f3
Merge branch 'FreeRTOS:main' into main
AniruddhaKanhere Mar 10, 2023
d1695e1
Empty-Commit to trigger workflow
AniruddhaKanhere Mar 10, 2023
76945ee
Fix issues pointed out in PR comments
AniruddhaKanhere Mar 17, 2023
b9d06f5
Merge branch 'main' into NXP1060NetworkInterface
AniruddhaKanhere Mar 18, 2023
2e34706
Uncrustify: triggered by comment.
actions-user Mar 18, 2023
7d4094b
Empty-Commit to trigger workflow
AniruddhaKanhere Mar 18, 2023
fee838c
Merge branch 'main' into NXP1060NetworkInterface
AniruddhaKanhere Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 15 additions & 21 deletions source/portable/NetworkInterface/NXP1060/NetworkInterface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,6 @@
/* ENET clock frequency. */
#define EXAMPLE_CLOCK_FREQ CLOCK_GetFreq( kCLOCK_IpgClk )

/*
* Padding of ethernet frames has to be disabled for zero-copy functionality
* since ENET driver requires the starting buffer addresses to be aligned.
*/
#if ETH_PAD_SIZE != 0
#error "ETH_PAD_SIZE != 0"
#endif /* ETH_PAD_SIZE != 0 */

/*******************************************************************************
* Definitions
Expand Down Expand Up @@ -235,8 +228,9 @@ static phy_config_t xConfig =
.speed = kPHY_Speed100M, /* Use 100 Mbps configuration (maximum possible
* for this PHY). In case auto-negotiation is
* turned on, this is not used. */
.enableEEE = pdFALSE
}; /* Disable the energy efficient PHY. */
.enableEEE = pdFALSE /* Disable the energy efficient PHY. */
};

/*-----------------------------------------------------------*/
/*-----------------------------------------------------------*/

Expand Down Expand Up @@ -409,7 +403,7 @@ BaseType_t xNetworkInterfaceOutput( NetworkBufferDescriptor_t * const pxNetworkB

static void prvEMACHandlerTask( void * parameter )
{
bool LinkUp = false;
bool bLinkUp = false;
status_t readStatus;

/* Wait for the driver to finish starting. */
Expand All @@ -424,11 +418,11 @@ static void prvEMACHandlerTask( void * parameter )

do
{
readStatus = PHY_GetLinkStatus( &phyHandle, &LinkUp );
readStatus = PHY_GetLinkStatus( &phyHandle, &bLinkUp );

if( readStatus == kStatus_Success )
{
if( LinkUp == pdFALSE )
if( bLinkUp == pdFALSE )
{
/* The link is down. */
bGlobalLinkStatus = false;
Expand Down Expand Up @@ -625,15 +619,15 @@ static status_t xSetupPHY( phy_config_t * pxConfig )
static status_t xWaitPHY( phy_config_t xConfig )
{
status_t xStatus;
bool LinkUp;
bool autoNegotiationComplete;
bool bLinkUp;
bool bAutoNegotiationComplete;
uint8_t ucCounter = 0;

do
{
xStatus = PHY_GetLinkStatus( &phyHandle, &LinkUp );
xStatus = PHY_GetLinkStatus( &phyHandle, &bLinkUp );

if( LinkUp == true )
if( bLinkUp == true )
{
break;
}
Expand All @@ -648,7 +642,7 @@ static status_t xWaitPHY( phy_config_t xConfig )
}
while( xStatus == kStatus_Success );

if( LinkUp == false )
if( bLinkUp == false )
{
FreeRTOS_printf( ( "Failed to get the link up." ) );
xStatus = kStatus_Fail;
Expand All @@ -659,7 +653,7 @@ static status_t xWaitPHY( phy_config_t xConfig )
}

if( ( xStatus == kStatus_Success ) &&
( LinkUp == true ) &&
( bLinkUp == true ) &&
( xConfig.autoNeg == true ) )
{
/* Reset the counter for next use. */
Expand All @@ -669,9 +663,9 @@ static status_t xWaitPHY( phy_config_t xConfig )

do
{
xStatus = PHY_GetAutoNegotiationStatus( &phyHandle, &autoNegotiationComplete );
xStatus = PHY_GetAutoNegotiationStatus( &phyHandle, &bAutoNegotiationComplete );

if( autoNegotiationComplete == true )
if( bAutoNegotiationComplete == true )
{
break;
}
Expand All @@ -686,7 +680,7 @@ static status_t xWaitPHY( phy_config_t xConfig )
}
while( xStatus == kStatus_Success );

if( autoNegotiationComplete == false )
if( bAutoNegotiationComplete == false )
{
FreeRTOS_printf( ( "Failed to complete auto-negotiation." ) );
xStatus = kStatus_Fail;
Expand Down