Undefine CENTRALISED_DEFERRED_IRQ_HADLING

This commit is contained in:
Alexei 2023-04-13 00:23:31 +07:00
parent 2b6ced7516
commit 585e8dc35d
4 changed files with 9 additions and 9 deletions

View File

@ -84,7 +84,7 @@
//#ifdef RTE_Drivers_PHY_DP83848C /* Driver PHY DP83848C */
#ifdef CENTRALISED_DEFERRED_IRQ_HADLING
#ifndef CENTRALISED_DEFERRED_IRQ_HADLING
static void receiveHandlerTask( void *pvParameters );
static TaskHandle_t receiveHandler = NULL;
#else /*CENTRALISED_DEFERRED_IRQ_HADLING*/
@ -113,7 +113,7 @@ void ENET_IRQHandler(void)
if (SET == enet_interrupt_flag_get(ENET_DMA_INT_FLAG_RS))
{
enet_interrupt_flag_clear(ENET_DMA_INT_FLAG_RS_CLR);
#ifdef CENTRALISED_DEFERRED_IRQ_HADLING
#ifndef CENTRALISED_DEFERRED_IRQ_HADLING
vTaskNotifyGiveFromISR(receiveHandler, &xHigherPriorityTaskWoken );
#else /*CENTRALISED_DEFERRED_IRQ_HADLING*/
xTimerPendFunctionCallFromISR(PendedReceiveHandler, NULL, NULL, &xHigherPriorityTaskWoken );
@ -646,7 +646,7 @@ BaseType_t xNetworkInterfaceInitialise( void )
#warning "mac->Control(0x17, 0x23); check if this configuration fixes DP83848 Elasticity buffer problem. Refer to https://habr.com/ru/post/682172/"
mac->Control(REG_RBR, RBR_RMII_MODE | RBR_ELAST_BUF);
#ifdef CENTRALISED_DEFERRED_IRQ_HADLING
#ifndef CENTRALISED_DEFERRED_IRQ_HADLING
if (NULL == receiveHandler)
{
xTaskCreate( receiveHandlerTask, "receiveHandlerTask", 1000, NULL, tskIDLE_PRIORITY + 2, &receiveHandler );
@ -734,7 +734,7 @@ BaseType_t xNetworkInterfaceOutput( NetworkBufferDescriptor_t * const pxDescript
}
#endif /*( ipconfigZERO_COPY_TX_DRIVER == 0)*/
/*-----------------------------------------------------------*/
#ifdef CENTRALISED_DEFERRED_IRQ_HADLING
#ifndef CENTRALISED_DEFERRED_IRQ_HADLING
/*receive data func , will be notify after ARM_ETH_MAC_EVENT_RX_FRAME event*/
#if (ipconfigZERO_COPY_RX_DRIVER==0)
static void receiveHandlerTask( void *pvParameters ){

View File

@ -64,7 +64,7 @@ extern uint32_t SystemCoreClock;
#define configUSE_16_BIT_TICKS 0
/* Software timer definitions. */
#ifdef CENTRALISED_DEFERRED_IRQ_HADLING
#ifndef CENTRALISED_DEFERRED_IRQ_HADLING
#define configUSE_TIMERS 0
#else
#define configUSE_TIMERS 1
@ -150,7 +150,7 @@ extern uint32_t SystemCoreClock;
#define INCLUDE_uxTaskGetStackHighWaterMark2 1
#define INCLUDE_eTaskGetState 1
#define INCLUDE_xTaskResumeFromISR 1
#ifdef CENTRALISED_DEFERRED_IRQ_HADLING
#ifndef CENTRALISED_DEFERRED_IRQ_HADLING
#define INCLUDE_xTimerPendFunctionCall 0
#else
#define INCLUDE_xTimerPendFunctionCall 1

View File

@ -291,7 +291,7 @@
</Mm>
</MemoryWindow3>
<ScvdPack>
<Filename>C:\Users\User\AppData\Local\Arm\Packs\ARM\CMSIS-FreeRTOS\10.5.1\CMSIS\RTOS2\FreeRTOS\FreeRTOS.scvd</Filename>
<Filename>E:\Arm\Packs\ARM\CMSIS-FreeRTOS\10.5.1\CMSIS\RTOS2\FreeRTOS\FreeRTOS.scvd</Filename>
<Type>ARM.CMSIS-FreeRTOS.10.5.1</Type>
<SubType>1</SubType>
</ScvdPack>
@ -303,7 +303,7 @@
<periodic>1</periodic>
<aLwin>1</aLwin>
<aCover>0</aCover>
<aSer1>1</aSer1>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
<aPa>0</aPa>
<viewmode>1</viewmode>

View File

@ -338,7 +338,7 @@
<v6WtE>0</v6WtE>
<v6Rtti>0</v6Rtti>
<VariousControls>
<MiscControls>-D DEBUG -Wno-pragma-pack -Wno-macro-redefined -D CENTRALISED_DEFERRED_IRQ_HADLING</MiscControls>
<MiscControls>-D DEBUG -Wno-pragma-pack -Wno-macro-redefined -U CENTRALISED_DEFERRED_IRQ_HADLING</MiscControls>
<Define>DEBUG_LISTEN_SOCK</Define>
<Undefine></Undefine>
<IncludePath>.\FreeRTOS\source\portable\NetworkInterface\include;.\FreeRTOS\source\include;.\FreeRTOS\source\portable\Compiler\Keil;.\DemoTasks\include;..\GigaDevice_test;.\include;.\PHY</IncludePath>