Skip to content

Remove duplicate configurations #978

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 3 commits into from
Jul 25, 2023
Merged

Remove duplicate configurations #978

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9aae3b2
Remove duplicate configurations
ActoryOu Jul 24, 2023
e6565a2
Move LLMNR/NBNS back before USE_DNS
ActoryOu Jul 24, 2023
0ddbbf8
Merge branch 'main' into RemoveDupConfig
ActoryOu Jul 24, 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
30 changes: 9 additions & 21 deletions source/include/FreeRTOSIPConfigDefaults.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,15 @@
* configMAX_PRIORITIES is a standard FreeRTOS configuration parameter defined in
* FreeRTOSConfig.h, not FreeRTOSIPConfig.h. Consideration needs to be given as to
* the priority assigned to the task executing the IP stack relative to the
* priority assigned to tasks that use the IP stack. */
* priority assigned to tasks that use the IP stack.
*
* Define the priority of the IP-task. It is recommended to use this
* order of priorities:
* Highest : network interface, handling transmission and reception.
* Medium : the IP-task handling API calls from the application.
* Lower : the tasks that make use of the IP-stack.
* For other tasks any priority can be chosen.
*/
#ifndef ipconfigIP_TASK_PRIORITY
#define ipconfigIP_TASK_PRIORITY ( configMAX_PRIORITIES - 2 )
#endif
Expand Down Expand Up @@ -575,26 +583,6 @@
#define ipconfigUDP_MAX_RX_PACKETS 0U
#endif

/* Define the priority of the IP-task. It is recommended to use this
* order of priorities:
* Highest : network interface, handling transmission and reception.
* Medium : the IP-task handling API calls from the application.
* Lower : the tasks that make use of the IP-stack.
* For other tasks any priority can be chosen.
*/
#ifndef ipconfigIP_TASK_PRIORITY
#define ipconfigIP_TASK_PRIORITY ( configMAX_PRIORITIES - 2 )
#endif

/* The size, in words (not bytes), of the stack allocated to the FreeRTOS+TCP
* task. This setting is less important when the FreeRTOS Win32 simulator is used
* as the Win32 simulator only stores a fixed amount of information on the task
* stack. FreeRTOS includes optional stack overflow detection, see:
* http://www.freertos.org/Stacks-and-stack-overflow-checking.html. */
#ifndef ipconfigIP_TASK_STACK_SIZE_WORDS
#define ipconfigIP_TASK_STACK_SIZE_WORDS ( configMINIMAL_STACK_SIZE * 5 )
#endif

/* When non-zero, the module FreeRTOS_DHCP.c will be included and called.
* Note that the application can override decide to ignore the outcome
* of the DHCP negotiation and use a static IP-address. */
Expand Down