Skip to content

Commit

Permalink
Fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Skptak committed Aug 29, 2023
1 parent c0780ba commit 2284793
Show file tree
Hide file tree
Showing 9 changed files with 294 additions and 271 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Check formatting
uses: FreeRTOS/CI-CD-Github-Actions/formatting@v2
uses: FreeRTOS/CI-CD-Github-Actions/clang-formatting@v2
with:
path: ./

Expand Down
16 changes: 10 additions & 6 deletions source/portable/NetworkInterface/DriverSAM/NetworkInterface.c
Original file line number Diff line number Diff line change
Expand Up @@ -728,10 +728,12 @@ static BaseType_t prvGMACInit( NetworkInterface_t * pxInterface )
GMAC->GMAC_NCR |= GMAC_NCR_MPE;

memset( &gmac_option, '\0', sizeof( gmac_option ) );
/* Note that 'gmac_option.uc_copy_all_frame' is false, do not copy all frames.
* And 'gmac_option.uc_no_boardcast' is false, meaning that broadcast is received.
* 'boardcast' is a typo. */
memcpy( gmac_option.uc_mac_addr, pxEndPoint->xMACAddress.ucBytes, sizeof( gmac_option.uc_mac_addr ) );
/* Note that 'gmac_option.uc_copy_all_frame' is false, do not copy all
* frames. And 'gmac_option.uc_no_boardcast' is false, meaning that
* broadcast is received. 'boardcast' is a typo. */
memcpy( gmac_option.uc_mac_addr,
pxEndPoint->xMACAddress.ucBytes,
sizeof( gmac_option.uc_mac_addr ) );

gs_gmac_dev.p_hw = GMAC;
gmac_dev_init( GMAC, &gs_gmac_dev, &gmac_option );
Expand Down Expand Up @@ -1097,8 +1099,10 @@ static uint32_t prvEMACRxPoll( void )

if( xSendEventStructToIPTask( &xRxEvent, xBlockTime ) != pdTRUE )
{
/* xSendEventStructToIPTask() timed out. Release the descriptor. */
FreeRTOS_printf( ( "prvEMACRxPoll: Can not queue a packet!\n" ) );
/* xSendEventStructToIPTask() timed out. Release the descriptor.
*/
FreeRTOS_printf(
( "prvEMACRxPoll: Can not queue a packet!\n" ) );
xRelease = pdTRUE;
}
}
Expand Down
Loading

0 comments on commit 2284793

Please sign in to comment.