diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2013-05-12 14:31:41 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2013-05-12 14:31:41 -0600 |
commit | 647bbd7db03d6f2bd7909cd1e967a7c91ccd1be5 (patch) | |
tree | 25e1002617eba8ca356b015276df78b8eb388397 | |
parent | 761d051218d4bf29a71532d7e67a18beda63cb30 (diff) | |
download | px4-nuttx-647bbd7db03d6f2bd7909cd1e967a7c91ccd1be5.tar.gz px4-nuttx-647bbd7db03d6f2bd7909cd1e967a7c91ccd1be5.tar.bz2 px4-nuttx-647bbd7db03d6f2bd7909cd1e967a7c91ccd1be5.zip |
Default NxWidgets and NxWM priorities should be 100 not 50 to be consistent with other default priorities
-rw-r--r-- | NxWidgets/ChangeLog.txt | 2 | ||||
-rw-r--r-- | NxWidgets/Kconfig | 32 | ||||
-rw-r--r-- | apps/NxWidgets/Kconfig | 32 | ||||
-rw-r--r-- | nuttx/ChangeLog | 3 | ||||
-rw-r--r-- | nuttx/configs/mikroe-stm32f4/fulldemo/defconfig | 16 | ||||
-rw-r--r-- | nuttx/configs/shenzhou/nxwm/defconfig | 16 | ||||
-rw-r--r-- | nuttx/configs/sim/nxwm/defconfig | 12 | ||||
-rw-r--r-- | nuttx/configs/stm3220g-eval/nxwm/defconfig | 16 |
8 files changed, 66 insertions, 63 deletions
diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt index 46eb06a08..b6098a530 100644 --- a/NxWidgets/ChangeLog.txt +++ b/NxWidgets/ChangeLog.txt @@ -358,3 +358,5 @@ Fix a race condition that would cause the calibration screen to fail to come up when its icon was touched (From Ken Pettit, 2013-5-12). +* Kconfig: Default priorities for NxWidget and NxWM threads + should be 100, not 50, to be consistent with other default priorities. diff --git a/NxWidgets/Kconfig b/NxWidgets/Kconfig index 1e4e10c66..75b0bd8c4 100644 --- a/NxWidgets/Kconfig +++ b/NxWidgets/Kconfig @@ -40,10 +40,10 @@ config NXWIDGETS_VPLANE config NXWIDGETS_SERVERPRIO int "NX Server priority" - default 51 + default 110 ---help--- Priority of the NX server. This applies only if NX is configured in - multi-user mode (NX_MULTIUSER=y). Default: 51. + multi-user mode (NX_MULTIUSER=y). Default: 110. NOTE: Of the three priority definitions here, NXWIDGETS_SERVERPRIO should have the highest priority to avoid data overrun race conditions. @@ -58,18 +58,18 @@ config NXWIDGETS_SERVERSTACK config NXWIDGETS_CLIENTPRIO int "NX Client Priority" - default 50 + default 100 ---help--- The thread that calls CNxServer::connect() will be re-prioritized to this priority. This applies only if NX is configured in multi-user - mode (NX_MULTIUSER=y). Default: 50 + mode (NX_MULTIUSER=y). Default: 100 config NXWIDGETS_LISTENERPRIO int "NX Listener Priority" - default 50 + default 100 ---help--- Priority of the NX event listener thread. This applies only if NX - is configured in multi-user mode (NX_MULTIUSER=y). Default: 50 + is configured in multi-user mode (NX_MULTIUSER=y). Default: 100 config NXWIDGETS_LISTENERSTACK int "NX Listener Stack Size" @@ -544,9 +544,9 @@ config NXWM_STARTWINDOW_MXMPRIO config NXWM_STARTWINDOW_PRIO int "StartWindow Task Priority" - default 50 + default 100 ---help--- - Priority of the StartWindow task. Default: 50. + Priority of the StartWindow task. Default: 100. NOTE: This priority should be less than NXWIDGETS_SERVERPRIO or else there may be data overrun errors. Such errors would most likely appear @@ -563,9 +563,9 @@ comment "NxConsole Window Configuration" config NXWM_NXCONSOLE_PRIO int "NxConsole Task Priority" - default 50 + default 100 ---help--- - Priority of the NxConsole task. Default: 50. + Priority of the NxConsole task. Default: 100. NOTE: This priority should be less than NXWIDGETS_SERVERPRIO or else there may be data overrun errors. Such errors would most likely @@ -662,9 +662,9 @@ config NXWM_TOUCHSCREEN_SIGNO config NXWM_TOUCHSCREEN_LISTENERPRIO int "Touchscreen Listener Task Priority" - default 50 + default 100 ---help--- - Priority of the touchscreen listener thread. Default: 50 + Priority of the touchscreen listener thread. Default: 100 config NXWM_TOUCHSCREEN_LISTENERSTACK int "Touchscreen Listener Task Stack Size" @@ -704,9 +704,9 @@ config NXWM_KEYBOARD_BUFSIZE config NXWM_KEYBOARD_LISTENERPRIO int "Keyboard Listener Task Priority" - default 50 + default 100 ---help--- - Priority of the touchscreen listener thread. Default: 50 + Priority of the touchscreen listener thread. Default: 100 config NXWM_KEYBOARD_LISTENERSTACK int "Keyboard Listener Task Stack Size" @@ -779,9 +779,9 @@ config NXWM_CALIBRATION_SIGNO config NXWM_CALIBRATION_LISTENERPRIO int "Calibration Task Priority" - default 50 + default 100 ---help--- - Priority of the calibration listener thread. Default: 50 + Priority of the calibration listener thread. Default: 100 config NXWM_CALIBRATION_LISTENERSTACK int "Calibration Task Stack Size" diff --git a/apps/NxWidgets/Kconfig b/apps/NxWidgets/Kconfig index 1e4e10c66..75b0bd8c4 100644 --- a/apps/NxWidgets/Kconfig +++ b/apps/NxWidgets/Kconfig @@ -40,10 +40,10 @@ config NXWIDGETS_VPLANE config NXWIDGETS_SERVERPRIO int "NX Server priority" - default 51 + default 110 ---help--- Priority of the NX server. This applies only if NX is configured in - multi-user mode (NX_MULTIUSER=y). Default: 51. + multi-user mode (NX_MULTIUSER=y). Default: 110. NOTE: Of the three priority definitions here, NXWIDGETS_SERVERPRIO should have the highest priority to avoid data overrun race conditions. @@ -58,18 +58,18 @@ config NXWIDGETS_SERVERSTACK config NXWIDGETS_CLIENTPRIO int "NX Client Priority" - default 50 + default 100 ---help--- The thread that calls CNxServer::connect() will be re-prioritized to this priority. This applies only if NX is configured in multi-user - mode (NX_MULTIUSER=y). Default: 50 + mode (NX_MULTIUSER=y). Default: 100 config NXWIDGETS_LISTENERPRIO int "NX Listener Priority" - default 50 + default 100 ---help--- Priority of the NX event listener thread. This applies only if NX - is configured in multi-user mode (NX_MULTIUSER=y). Default: 50 + is configured in multi-user mode (NX_MULTIUSER=y). Default: 100 config NXWIDGETS_LISTENERSTACK int "NX Listener Stack Size" @@ -544,9 +544,9 @@ config NXWM_STARTWINDOW_MXMPRIO config NXWM_STARTWINDOW_PRIO int "StartWindow Task Priority" - default 50 + default 100 ---help--- - Priority of the StartWindow task. Default: 50. + Priority of the StartWindow task. Default: 100. NOTE: This priority should be less than NXWIDGETS_SERVERPRIO or else there may be data overrun errors. Such errors would most likely appear @@ -563,9 +563,9 @@ comment "NxConsole Window Configuration" config NXWM_NXCONSOLE_PRIO int "NxConsole Task Priority" - default 50 + default 100 ---help--- - Priority of the NxConsole task. Default: 50. + Priority of the NxConsole task. Default: 100. NOTE: This priority should be less than NXWIDGETS_SERVERPRIO or else there may be data overrun errors. Such errors would most likely @@ -662,9 +662,9 @@ config NXWM_TOUCHSCREEN_SIGNO config NXWM_TOUCHSCREEN_LISTENERPRIO int "Touchscreen Listener Task Priority" - default 50 + default 100 ---help--- - Priority of the touchscreen listener thread. Default: 50 + Priority of the touchscreen listener thread. Default: 100 config NXWM_TOUCHSCREEN_LISTENERSTACK int "Touchscreen Listener Task Stack Size" @@ -704,9 +704,9 @@ config NXWM_KEYBOARD_BUFSIZE config NXWM_KEYBOARD_LISTENERPRIO int "Keyboard Listener Task Priority" - default 50 + default 100 ---help--- - Priority of the touchscreen listener thread. Default: 50 + Priority of the touchscreen listener thread. Default: 100 config NXWM_KEYBOARD_LISTENERSTACK int "Keyboard Listener Task Stack Size" @@ -779,9 +779,9 @@ config NXWM_CALIBRATION_SIGNO config NXWM_CALIBRATION_LISTENERPRIO int "Calibration Task Priority" - default 50 + default 100 ---help--- - Priority of the calibration listener thread. Default: 50 + Priority of the calibration listener thread. Default: 100 config NXWM_CALIBRATION_LISTENERSTACK int "Calibration Task Stack Size" diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 7d6e1ded5..46143ab33 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -4701,4 +4701,5 @@ (2013-5-10). * configs/mikroe-stm32f4: Changes to get the Mikroelektronika MultiMedia STM32 F4 touchsceen working. From Ken Pettit (2013-5-11). - + * configs/*/nxwm: Default priorities for NxWidget and NxWM threads + should be 100, not 50, to be consistent with other default priorities. diff --git a/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig b/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig index a398f8f73..67bc28f19 100644 --- a/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig +++ b/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig @@ -915,10 +915,10 @@ CONFIG_NXWIDGETS=y CONFIG_NXWIDGETS_FLICKERFREE=y CONFIG_NXWIDGETS_DEVNO=0 CONFIG_NXWIDGETS_VPLANE=0 -CONFIG_NXWIDGETS_SERVERPRIO=51 +CONFIG_NXWIDGETS_SERVERPRIO=110 CONFIG_NXWIDGETS_SERVERSTACK=2048 -CONFIG_NXWIDGETS_CLIENTPRIO=50 -CONFIG_NXWIDGETS_LISTENERPRIO=50 +CONFIG_NXWIDGETS_CLIENTPRIO=100 +CONFIG_NXWIDGETS_LISTENERPRIO=100 CONFIG_NXWIDGETS_LISTENERSTACK=2048 # CONFIG_NXWIDGETS_EXTERNINIT is not set # CONFIG_NXWIDGET_EVENTWAIT is not set @@ -1006,13 +1006,13 @@ CONFIG_NXWM_STARTWINDOW_HSPACING=4 CONFIG_NXWM_STARTWINDOW_MQNAME="/dev/nxwm" CONFIG_NXWM_STARTWINDOW_MXMSGS=32 CONFIG_NXWM_STARTWINDOW_MXMPRIO=42 -CONFIG_NXWM_STARTWINDOW_PRIO=50 +CONFIG_NXWM_STARTWINDOW_PRIO=100 CONFIG_NXWM_STARTWINDOW_STACKSIZE=2048 # # NxConsole Window Configuration # -CONFIG_NXWM_NXCONSOLE_PRIO=50 +CONFIG_NXWM_NXCONSOLE_PRIO=100 CONFIG_NXWM_NXCONSOLE_STACKSIZE=2048 # CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set # CONFIG_NXWM_NXCONSOLE_CUSTOM_FONTID is not set @@ -1025,7 +1025,7 @@ CONFIG_NXWM_TOUCHSCREEN=y CONFIG_NXWM_TOUCHSCREEN_DEVNO=0 CONFIG_NXWM_TOUCHSCREEN_DEVPATH="/dev/input0" CONFIG_NXWM_TOUCHSCREEN_SIGNO=5 -CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=50 +CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=100 CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1024 CONFIG_NXWM_KEYBOARD=y @@ -1035,7 +1035,7 @@ CONFIG_NXWM_KEYBOARD=y CONFIG_NXWM_KEYBOARD_DEVPATH="/dev/ttyS0" CONFIG_NXWM_KEYBOARD_SIGNO=6 CONFIG_NXWM_KEYBOARD_BUFSIZE=16 -CONFIG_NXWM_KEYBOARD_LISTENERPRIO=50 +CONFIG_NXWM_KEYBOARD_LISTENERPRIO=100 CONFIG_NXWM_KEYBOARD_LISTENERSTACK=2048 # @@ -1044,7 +1044,7 @@ CONFIG_NXWM_KEYBOARD_LISTENERSTACK=2048 # CONFIG_NXWM_CALIBRATION_CUSTOM_COLORS is not set # CONFIG_NXWM_CUSTOM_CALIBRATION_ICON is not set CONFIG_NXWM_CALIBRATION_SIGNO=5 -CONFIG_NXWM_CALIBRATION_LISTENERPRIO=50 +CONFIG_NXWM_CALIBRATION_LISTENERPRIO=100 CONFIG_NXWM_CALIBRATION_LISTENERSTACK=2048 # diff --git a/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig index e13fb72dc..aa62a2b4c 100644 --- a/nuttx/configs/shenzhou/nxwm/defconfig +++ b/nuttx/configs/shenzhou/nxwm/defconfig @@ -816,10 +816,10 @@ CONFIG_NXWIDGETS=y CONFIG_NXWIDGETS_FLICKERFREE=y CONFIG_NXWIDGETS_DEVNO=0 CONFIG_NXWIDGETS_VPLANE=0 -CONFIG_NXWIDGETS_SERVERPRIO=51 +CONFIG_NXWIDGETS_SERVERPRIO=110 CONFIG_NXWIDGETS_SERVERSTACK=1596 -CONFIG_NXWIDGETS_CLIENTPRIO=50 -CONFIG_NXWIDGETS_LISTENERPRIO=50 +CONFIG_NXWIDGETS_CLIENTPRIO=100 +CONFIG_NXWIDGETS_LISTENERPRIO=100 CONFIG_NXWIDGETS_LISTENERSTACK=1596 # CONFIG_NXWIDGETS_EXTERNINIT is not set # CONFIG_NXWIDGET_EVENTWAIT is not set @@ -901,13 +901,13 @@ CONFIG_NXWM_STARTWINDOW_HSPACING=4 CONFIG_NXWM_STARTWINDOW_MQNAME="/dev/nxwm" CONFIG_NXWM_STARTWINDOW_MXMSGS=32 CONFIG_NXWM_STARTWINDOW_MXMPRIO=42 -CONFIG_NXWM_STARTWINDOW_PRIO=50 +CONFIG_NXWM_STARTWINDOW_PRIO=100 CONFIG_NXWM_STARTWINDOW_STACKSIZE=1596 # # NxConsole Window Configuration # -CONFIG_NXWM_NXCONSOLE_PRIO=50 +CONFIG_NXWM_NXCONSOLE_PRIO=100 CONFIG_NXWM_NXCONSOLE_STACKSIZE=1596 # CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set # CONFIG_NXWM_NXCONSOLE_CUSTOM_FONTID is not set @@ -920,7 +920,7 @@ CONFIG_NXWM_TOUCHSCREEN=y CONFIG_NXWM_TOUCHSCREEN_DEVNO=0 CONFIG_NXWM_TOUCHSCREEN_DEVPATH="/dev/input0" CONFIG_NXWM_TOUCHSCREEN_SIGNO=5 -CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=50 +CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=100 CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1596 CONFIG_NXWM_KEYBOARD=y @@ -930,7 +930,7 @@ CONFIG_NXWM_KEYBOARD=y CONFIG_NXWM_KEYBOARD_DEVPATH="/dev/console" CONFIG_NXWM_KEYBOARD_SIGNO=6 CONFIG_NXWM_KEYBOARD_BUFSIZE=16 -CONFIG_NXWM_KEYBOARD_LISTENERPRIO=50 +CONFIG_NXWM_KEYBOARD_LISTENERPRIO=100 CONFIG_NXWM_KEYBOARD_LISTENERSTACK=1024 # @@ -939,7 +939,7 @@ CONFIG_NXWM_KEYBOARD_LISTENERSTACK=1024 # CONFIG_NXWM_CALIBRATION_CUSTOM_COLORS is not set # CONFIG_NXWM_CUSTOM_CALIBRATION_ICON is not set CONFIG_NXWM_CALIBRATION_SIGNO=5 -CONFIG_NXWM_CALIBRATION_LISTENERPRIO=50 +CONFIG_NXWM_CALIBRATION_LISTENERPRIO=100 CONFIG_NXWM_CALIBRATION_LISTENERSTACK=1024 # diff --git a/nuttx/configs/sim/nxwm/defconfig b/nuttx/configs/sim/nxwm/defconfig index 5da33846f..6536d73c3 100644 --- a/nuttx/configs/sim/nxwm/defconfig +++ b/nuttx/configs/sim/nxwm/defconfig @@ -549,10 +549,10 @@ CONFIG_NXWIDGETS=y # CONFIG_NXWIDGETS_FLICKERFREE is not set CONFIG_NXWIDGETS_DEVNO=0 CONFIG_NXWIDGETS_VPLANE=0 -CONFIG_NXWIDGETS_SERVERPRIO=51 +CONFIG_NXWIDGETS_SERVERPRIO=110 CONFIG_NXWIDGETS_SERVERSTACK=16384 -CONFIG_NXWIDGETS_CLIENTPRIO=50 -CONFIG_NXWIDGETS_LISTENERPRIO=50 +CONFIG_NXWIDGETS_CLIENTPRIO=100 +CONFIG_NXWIDGETS_LISTENERPRIO=100 CONFIG_NXWIDGETS_LISTENERSTACK=8192 # CONFIG_NXWIDGETS_EXTERNINIT is not set # CONFIG_NXWIDGET_EVENTWAIT is not set @@ -634,13 +634,13 @@ CONFIG_NXWM_STARTWINDOW_HSPACING=4 CONFIG_NXWM_STARTWINDOW_MQNAME="/dev/nxwm" CONFIG_NXWM_STARTWINDOW_MXMSGS=32 CONFIG_NXWM_STARTWINDOW_MXMPRIO=42 -CONFIG_NXWM_STARTWINDOW_PRIO=50 +CONFIG_NXWM_STARTWINDOW_PRIO=100 CONFIG_NXWM_STARTWINDOW_STACKSIZE=2048 # # NxConsole Window Configuration # -CONFIG_NXWM_NXCONSOLE_PRIO=50 +CONFIG_NXWM_NXCONSOLE_PRIO=100 CONFIG_NXWM_NXCONSOLE_STACKSIZE=8192 # CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set # CONFIG_NXWM_NXCONSOLE_CUSTOM_FONTID is not set @@ -654,7 +654,7 @@ CONFIG_NXWM_NXCONSOLE_STACKSIZE=8192 # CONFIG_NXWM_CALIBRATION_CUSTOM_COLORS is not set # CONFIG_NXWM_CUSTOM_CALIBRATION_ICON is not set CONFIG_NXWM_CALIBRATION_SIGNO=5 -CONFIG_NXWM_CALIBRATION_LISTENERPRIO=50 +CONFIG_NXWM_CALIBRATION_LISTENERPRIO=100 CONFIG_NXWM_CALIBRATION_LISTENERSTACK=2048 # diff --git a/nuttx/configs/stm3220g-eval/nxwm/defconfig b/nuttx/configs/stm3220g-eval/nxwm/defconfig index 145792ddb..875207fd7 100644 --- a/nuttx/configs/stm3220g-eval/nxwm/defconfig +++ b/nuttx/configs/stm3220g-eval/nxwm/defconfig @@ -844,10 +844,10 @@ CONFIG_NXWIDGETS=y CONFIG_NXWIDGETS_FLICKERFREE=y CONFIG_NXWIDGETS_DEVNO=0 CONFIG_NXWIDGETS_VPLANE=0 -CONFIG_NXWIDGETS_SERVERPRIO=51 +CONFIG_NXWIDGETS_SERVERPRIO=110 CONFIG_NXWIDGETS_SERVERSTACK=2048 -CONFIG_NXWIDGETS_CLIENTPRIO=50 -CONFIG_NXWIDGETS_LISTENERPRIO=50 +CONFIG_NXWIDGETS_CLIENTPRIO=100 +CONFIG_NXWIDGETS_LISTENERPRIO=100 CONFIG_NXWIDGETS_LISTENERSTACK=2048 # CONFIG_NXWIDGETS_EXTERNINIT is not set # CONFIG_NXWIDGET_EVENTWAIT is not set @@ -934,13 +934,13 @@ CONFIG_NXWM_STARTWINDOW_HSPACING=4 CONFIG_NXWM_STARTWINDOW_MQNAME="/dev/nxwm" CONFIG_NXWM_STARTWINDOW_MXMSGS=32 CONFIG_NXWM_STARTWINDOW_MXMPRIO=42 -CONFIG_NXWM_STARTWINDOW_PRIO=50 +CONFIG_NXWM_STARTWINDOW_PRIO=100 CONFIG_NXWM_STARTWINDOW_STACKSIZE=2048 # # NxConsole Window Configuration # -CONFIG_NXWM_NXCONSOLE_PRIO=50 +CONFIG_NXWM_NXCONSOLE_PRIO=100 CONFIG_NXWM_NXCONSOLE_STACKSIZE=2048 # CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set # CONFIG_NXWM_NXCONSOLE_CUSTOM_FONTID is not set @@ -953,7 +953,7 @@ CONFIG_NXWM_TOUCHSCREEN=y CONFIG_NXWM_TOUCHSCREEN_DEVNO=0 CONFIG_NXWM_TOUCHSCREEN_DEVPATH="/dev/input0" CONFIG_NXWM_TOUCHSCREEN_SIGNO=5 -CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=50 +CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=100 CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1024 CONFIG_NXWM_KEYBOARD=y @@ -963,7 +963,7 @@ CONFIG_NXWM_KEYBOARD=y CONFIG_NXWM_KEYBOARD_DEVPATH="/dev/console" CONFIG_NXWM_KEYBOARD_SIGNO=6 CONFIG_NXWM_KEYBOARD_BUFSIZE=16 -CONFIG_NXWM_KEYBOARD_LISTENERPRIO=50 +CONFIG_NXWM_KEYBOARD_LISTENERPRIO=100 CONFIG_NXWM_KEYBOARD_LISTENERSTACK=2048 # @@ -972,7 +972,7 @@ CONFIG_NXWM_KEYBOARD_LISTENERSTACK=2048 # CONFIG_NXWM_CALIBRATION_CUSTOM_COLORS is not set # CONFIG_NXWM_CUSTOM_CALIBRATION_ICON is not set CONFIG_NXWM_CALIBRATION_SIGNO=5 -CONFIG_NXWM_CALIBRATION_LISTENERPRIO=50 +CONFIG_NXWM_CALIBRATION_LISTENERPRIO=100 CONFIG_NXWM_CALIBRATION_LISTENERSTACK=2048 # |