Skip to content

DriverSAM/NetworkInterface.c warning cleanup - purely refactoring #1016

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 11 commits into from
Sep 7, 2023
Merged

DriverSAM/NetworkInterface.c warning cleanup - purely refactoring #1016

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b43eb50
warning cleanup - purely refactoring
Peter-Herrmann Aug 31, 2023
a715759
Incorporated PR feedback
Peter-Herrmann Sep 1, 2023
f070b20
Merge branch 'main' into dev/SAM-NetworkInterface-refactor
Skptak Sep 1, 2023
a487b00
Uncrustify: triggered by comment.
actions-user Sep 2, 2023
d5d9fdf
Fix formatting
kar-rahul-aws Sep 2, 2023
c7d4106
Merge remote-tracking branch 'upstream/main' into dev/SAM-NetworkInte…
Peter-Herrmann Sep 5, 2023
9f804af
Uncrustify: triggered by comment.
actions-user Sep 5, 2023
5bfbbb4
Un-doing uncrustify commit that breaks formatting rules
Peter-Herrmann Sep 5, 2023
c2eab71
formatting fix
Peter-Herrmann Sep 5, 2023
25d994c
formatting fix
Peter-Herrmann Sep 5, 2023
82473e8
Merge branch 'main' into dev/SAM-NetworkInterface-refactor
Peter-Herrmann Sep 6, 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
19 changes: 9 additions & 10 deletions source/portable/NetworkInterface/DriverSAM/NetworkInterface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,17 @@ static void hand_tx_errors( void );
static uint16_t prvGenerateCRC16( const uint8_t * pucAddress );
static void prvAddMulticastMACAddress( const uint8_t * ucMacAddress );

/* Checks IP queue, buffers, and semaphore and logs diagnostic info if configured */
static void vCheckBuffersAndQueue( void );

/* return 'puc_buffer' to the pool of transmission buffers. */
void returnTxBuffer( uint8_t * puc_buffer );

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

/* A copy of PHY register 1: 'PHY_REG_01_BMSR' */
static BaseType_t xGMACSwitchRequired;

/* LLMNR multicast address. */
static const uint8_t llmnr_mac_address[] = { 0x01, 0x00, 0x5E, 0x00, 0x00, 0xFC };

/* The GMAC object as defined by the ASF drivers. */
static gmac_device_t gs_gmac_dev;

Expand Down Expand Up @@ -454,8 +457,6 @@ static BaseType_t xPHY_Write( BaseType_t xAddress,

static BaseType_t prvSAM_NetworkInterfaceInitialise( NetworkInterface_t * pxInterface )
{
const TickType_t x5_Seconds = 5000UL;

if( xEMACTaskHandle == NULL )
{
prvGMACInit( pxInterface );
Expand Down Expand Up @@ -673,9 +674,7 @@ static BaseType_t prvSAM_NetworkInterfaceOutput( NetworkInterface_t * pxInterfac

static BaseType_t prvGMACInit( NetworkInterface_t * pxInterface )
{
uint32_t ncfgr;
NetworkEndPoint_t * pxEndPoint;
BaseType_t xEntry = 1;

gmac_options_t gmac_option;

Expand Down Expand Up @@ -1065,7 +1064,7 @@ volatile UBaseType_t uxLastMinBufferCount = 0;
volatile UBaseType_t uxCurrentSemCount;
volatile UBaseType_t uxLowestSemCount;

void vCheckBuffersAndQueue( void )
static void vCheckBuffersAndQueue( void )
{
static UBaseType_t uxCurrentCount;

Expand Down Expand Up @@ -1126,14 +1125,14 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB
static void prvEMACHandlerTask( void * pvParameters )
{
UBaseType_t uxCount;
UBaseType_t uxLowestSemCount = GMAC_TX_BUFFERS + 1;

uxLowestSemCount = GMAC_TX_BUFFERS + 1;

#if ( ipconfigZERO_COPY_TX_DRIVER != 0 )
NetworkBufferDescriptor_t * pxBuffer;
#endif
uint8_t * pucBuffer;
BaseType_t xResult = 0;
uint32_t xStatus;
const TickType_t ulMaxBlockTime = pdMS_TO_TICKS( EMAC_MAX_BLOCK_TIME_MS );
uint32_t ulISREvents = 0U;

Expand Down