Skip to content

Commit 60d65cd

Browse files
authored
Merge branch 'main' into FreeRTOSIPConfigDefaults_change_error_into_warning
2 parents 41c9833 + a4b6330 commit 60d65cd

File tree

1 file changed

+17
-4
lines changed

1 file changed

+17
-4
lines changed

source/portable/NetworkInterface/Zynq/NetworkInterface.c

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,23 @@
6161
#define niEMAC_HANDLER_TASK_PRIORITY configMAX_PRIORITIES - 1
6262
#endif
6363

64-
#define niBMSR_LINK_STATUS 0x0004uL
64+
#ifndef niEMAC_HANDLER_TASK_AFFINITY
65+
/* Define the affinity of the task prvEMACHandlerTask(). */
66+
#define niEMAC_HANDLER_TASK_AFFINITY 0
67+
#endif
68+
69+
#if ( configUSE_CORE_AFFINITY == 0 && niEMAC_HANDLER_TASK_AFFINITY > 0 )
70+
#error configUSE_CORE_AFFINITY must be 1 in order to use niEMAC_HANDLER_TASK_AFFINITY
71+
#endif
72+
73+
#define niBMSR_LINK_STATUS 0x0004uL
6574

6675
/* The size of each buffer when BufferAllocation_1 is used:
6776
* https://freertos.org/Documentation/03-Libraries/02-FreeRTOS-plus/02-FreeRTOS-plus-TCP/05-Buffer-management */
68-
#define niBUFFER_1_PACKET_SIZE 1536
77+
#define niBUFFER_1_PACKET_SIZE 1536
6978

7079
/* Naming and numbering of PHY registers. */
71-
#define PHY_REG_01_BMSR 0x01 /* Basic mode status register */
80+
#define PHY_REG_01_BMSR 0x01 /* Basic mode status register */
7281

7382
#ifndef iptraceEMAC_TASK_STARTING
7483
#define iptraceEMAC_TASK_STARTING() do {} while( ipFALSE_BOOL )
@@ -362,7 +371,11 @@ static BaseType_t xZynqNetworkInterfaceInitialise( NetworkInterface_t * pxInterf
362371
pcTaskName = "GEM1";
363372
}
364373

365-
xTaskCreate( prvEMACHandlerTask, pcTaskName, configEMAC_TASK_STACK_SIZE, ( void * ) xEMACIndex, niEMAC_HANDLER_TASK_PRIORITY, &( xEMACTaskHandles[ xEMACIndex ] ) );
374+
#if ( niEMAC_HANDLER_TASK_AFFINITY > 0 )
375+
xTaskCreateAffinitySet( prvEMACHandlerTask, pcTaskName, configEMAC_TASK_STACK_SIZE, ( void * ) xEMACIndex, niEMAC_HANDLER_TASK_PRIORITY, niEMAC_HANDLER_TASK_AFFINITY, &( xEMACTaskHandles[ xEMACIndex ] ) );
376+
#else
377+
xTaskCreate( prvEMACHandlerTask, pcTaskName, configEMAC_TASK_STACK_SIZE, ( void * ) xEMACIndex, niEMAC_HANDLER_TASK_PRIORITY, &( xEMACTaskHandles[ xEMACIndex ] ) );
378+
#endif
366379
}
367380
else
368381
{

0 commit comments

Comments
 (0)