Change the private default signal number to 32

and remove the unused private signal number macro Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2023-03-25 07:07:59 +08:00 · 2023-03-25 07:07:59 +08:00 · aa99d267b7
commit aa99d267b7
parent 417b87a0a0
35 changed files with 36 additions and 86 deletions
--- a/examples/README.md
+++ b/examples/README.md
@ -60,7 +60,7 @@ Example Configuration:
 - `CONFIG_EXAMPLES_AJOYSTICK_DEVNAME` – Joystick device name. Default
  `/dev/adjoy0`.
 - `CONFIG_EXAMPLES_AJOYSTICK_SIGNO` – Signal used to signal the test
-  application. Default `13`.
+  application. Default `32`.

 ## `alarm` RTC Alarm

@ -278,7 +278,7 @@ Example Configuration:
 - `CONFIG_EXAMPLES_DJOYSTICK_DEVNAME` – Joystick device name. Default
  `/dev/djoy0`.
 - `CONFIG_EXAMPLES_DJOYSTICK_SIGNO` – Signal used to signal the test
-  application. Default `13`.
+  application. Default `32`.

 ## `elf` ELF loader

@ -940,8 +940,6 @@ This directory contains a simple test of a subset of the NX APIs defined in
 - `CONFIG_EXAMPLES_NX_SERVERPRIO` – The server priority. Default: `120`
 - `CONFIG_EXAMPLES_NX_LISTENERPRIO` – The priority of the event listener thread.
  Default `80`.
- `CONFIG_EXAMPLES_NX_NOTIFYSIGNO` – The signal number to use with
-  `nx_eventnotify()`. Default: `4`.

 The example also has the following settings and will generate an error if they
 are not as expected:
@ -998,8 +996,6 @@ The following configuration options can be selected to customize the test:
 - `CONFIG_EXAMPLES_NXTERM_SERVERPRIO` – The server priority. Default: `120`.
 - `CONFIG_EXAMPLES_NXTERM_LISTENERPRIO` – The priority of the event listener
  thread. Default: `80`.
- `CONFIG_EXAMPLES_NXTERM_NOTIFYSIGNO` – The signal number to use with
-  `nx_eventnotify()`. Default: `4`.

 ## `nxflat` NXFLAT Binary

@ -1143,7 +1139,7 @@ The following configuration options can be selected:
 - `CONFIG_EXAMPLES_NXTEXT_LISTENERPRIO` – The priority of the event listener
  thread. Default: `80`.
 - `CONFIG_EXAMPLES_NXTEXT_NOTIFYSIGNO` – The signal number to use with
-  `nx_eventnotify()`. Default: `4`.
+  `nx_eventnotify()`. Default: `32`.

 The example also expects the following settings and will generate an error if
 they are not as expected:
@ -1766,7 +1762,7 @@ Example configuration:
  Default: `1000000`.
 - `EXAMPLES_TIMER_GPIO_SIGNO` – This is the signal number that is used to
    notify that a timer interrupt occurred.
-  Default: `17`.
+  Default: `32`.
 - `EXAMPLES_TIMER_GPIO_STACKSIZE` – This is the stack size allocated when the
    timer task runs.
  Default: `2048`.
--- a/examples/ajoystick/Kconfig
+++ b/examples/ajoystick/Kconfig
@ -18,6 +18,6 @@ config EXAMPLES_AJOYSTICK_DEVNAME

 config EXAMPLES_AJOYSTICK_SIGNO
 	int "Joystick signal"
-	default 13
+	default 32

 endif
--- a/examples/ajoystick/ajoy_main.c
+++ b/examples/ajoystick/ajoy_main.c
@ -51,7 +51,7 @@
 #endif

 #ifndef CONFIG_EXAMPLES_AJOYSTICK_SIGNO
-#  define CONFIG_EXAMPLES_AJOYSTICK_SIGNO 13
+#  define CONFIG_EXAMPLES_AJOYSTICK_SIGNO 32
 #endif

 #define FULL_RANGE 16
--- a/examples/alarm/Kconfig
+++ b/examples/alarm/Kconfig
@ -33,6 +33,6 @@ config EXAMPLES_ALARM_DEVPATH

 config EXAMPLES_ALARM_SIGNO
 	int "Alarm signal"
-	default 1
+	default 32

 endif # EXAMPLES_ALARM
--- a/examples/buttons/buttons_main.c
+++ b/examples/buttons/buttons_main.c
@ -50,7 +50,7 @@
 #endif

 #ifndef CONFIG_EXAMPLES_BUTTONS_SIGNO
-#  define CONFIG_EXAMPLES_BUTTONS_SIGNO 13
+#  define CONFIG_EXAMPLES_BUTTONS_SIGNO 32
 #endif

 #ifndef CONFIG_INPUT_BUTTONS_POLL_DELAY
--- a/examples/chrono/chrono_main.c
+++ b/examples/chrono/chrono_main.c
@ -44,7 +44,7 @@
 * Pre-processor Definitions
 ****************************************************************************/

-#define BUTTON_SIGNO 13
+#define BUTTON_SIGNO 32
 #define BUTTON_STACKSIZE 2048
 #define BUTTON_PRIORITY 100
 #define BUTTON_DEVPATH "/dev/buttons"
--- a/examples/djoystick/Kconfig
+++ b/examples/djoystick/Kconfig
@ -18,6 +18,6 @@ config EXAMPLES_DJOYSTICK_DEVNAME

 config EXAMPLES_DJOYSTICK_SIGNO
 	int "Joystick signal"
-	default 13
+	default 32

 endif
--- a/examples/djoystick/djoy_main.c
+++ b/examples/djoystick/djoy_main.c
@ -50,7 +50,7 @@
 #endif

 #ifndef CONFIG_EXAMPLES_DJOYSTICK_SIGNO
-#  define CONFIG_EXAMPLES_DJOYSTICK_SIGNO 13
+#  define CONFIG_EXAMPLES_DJOYSTICK_SIGNO 32
 #endif

 /****************************************************************************
--- a/examples/nx/Kconfig
+++ b/examples/nx/Kconfig
@ -103,10 +103,4 @@ config EXAMPLES_NX_LISTENERPRIO
 	---help---
 		The priority of the event listener thread. Default 80.

-config EXAMPLES_NX_NOTIFYSIGNO
-	int "Notify Signal Number"
-	default 4
-	---help---
-		The signal number to use with nx_eventnotify().  Default: 4
-
 endif
--- a/examples/nx/nx_internal.h
+++ b/examples/nx/nx_internal.h
@ -134,9 +134,6 @@
 #ifndef CONFIG_EXAMPLES_NX_SERVERPRIO
 #  define CONFIG_EXAMPLES_NX_SERVERPRIO 120
 #endif
-#ifndef CONFIG_EXAMPLES_NX_NOTIFYSIGNO
-#  define CONFIG_EXAMPLES_NX_NOTIFYSIGNO 4
-#endif

 #ifdef CONFIG_EXAMPLES_NX_RAWWINDOWS
 #  define NXEGWINDOW NXWINDOW
--- a/examples/nxdemo/nxdemo.h
+++ b/examples/nxdemo/nxdemo.h
@ -99,9 +99,6 @@
 #ifndef CONFIG_EXAMPLES_NXDEMO_SERVERPRIO
 #  define CONFIG_EXAMPLES_NXDEMO_SERVERPRIO 120
 #endif
-#ifndef CONFIG_EXAMPLES_NXDEMO_NOTIFYSIGNO
-#  define CONFIG_EXAMPLES_NXDEMO_NOTIFYSIGNO 4
-#endif

 /* Image Information ********************************************************/

--- a/examples/nxhello/Kconfig
+++ b/examples/nxhello/Kconfig
@ -102,10 +102,4 @@ config EXAMPLES_NXHELLO_LISTENERPRIO
 	---help---
 		The priority of the event listener thread. Default 80.

-config EXAMPLES_NXHELLO_NOTIFYSIGNO
-	int "Notify Signal Number"
-	default 4
-	---help---
-		The signal number to use with nx_eventnotify().  Default: 4
-
 endif
--- a/examples/nxhello/nxhello.h
+++ b/examples/nxhello/nxhello.h
@ -102,9 +102,6 @@
 #ifndef CONFIG_EXAMPLES_NXHELLO_SERVERPRIO
 #  define CONFIG_EXAMPLES_NXHELLO_SERVERPRIO 120
 #endif
-#ifndef CONFIG_EXAMPLES_NXHELLO_NOTIFYSIGNO
-#  define CONFIG_EXAMPLES_NXHELLO_NOTIFYSIGNO 4
-#endif

 /****************************************************************************
 * Public Types
--- a/examples/nximage/Kconfig
+++ b/examples/nximage/Kconfig
@ -116,10 +116,4 @@ config EXAMPLES_NXIMAGE_LISTENERPRIO
 	---help---
 		The priority of the event listener thread. Default 80.

-config EXAMPLES_NXIMAGE_NOTIFYSIGNO
-	int "Notify Signal Number"
-	default 4
-	---help---
-		The signal number to use with nx_eventnotify().  Default: 4
-
 endif
--- a/examples/nximage/nximage.h
+++ b/examples/nximage/nximage.h
@ -111,9 +111,6 @@
 #ifndef CONFIG_EXAMPLES_NXIMAGE_SERVERPRIO
 #  define CONFIG_EXAMPLES_NXIMAGE_SERVERPRIO 120
 #endif
-#ifndef CONFIG_EXAMPLES_NXIMAGE_NOTIFYSIGNO
-#  define CONFIG_EXAMPLES_NXIMAGE_NOTIFYSIGNO 4
-#endif

 /* Image Information ********************************************************/

@ -197,7 +194,8 @@ void nximage_image(NXWINDOW hwnd);
 /* Image interfaces */

 nxgl_mxpixel_t nximage_bgcolor(void);
-nxgl_mxpixel_t nximage_avgcolor(nxgl_mxpixel_t color1, nxgl_mxpixel_t color2);
+nxgl_mxpixel_t nximage_avgcolor(nxgl_mxpixel_t color1,
+                                nxgl_mxpixel_t color2);
 void nximage_blitrow(FAR nxgl_mxpixel_t *run, FAR const void **state);

 #endif /* __APPS_EXAMPLES_NXIMAGE_NXIMAGE_H */
--- a/examples/nxlines/Kconfig
+++ b/examples/nxlines/Kconfig
@ -111,10 +111,4 @@ config EXAMPLES_NXLINES_LISTENERPRIO
 	---help---
 		The priority of the event listener thread. Default 80.

-config EXAMPLES_NXLINES_NOTIFYSIGNO
-	int "Notify Signal Number"
-	default 4
-	---help---
-		The signal number to use with nx_eventnotify().  Default: 4
-
 endif
--- a/examples/nxlines/nxlines.h
+++ b/examples/nxlines/nxlines.h
@ -120,9 +120,6 @@
 #ifndef CONFIG_EXAMPLES_NXLINES_SERVERPRIO
 #  define CONFIG_EXAMPLES_NXLINES_SERVERPRIO 120
 #endif
-#ifndef CONFIG_EXAMPLES_NXLINES_NOTIFYSIGNO
-#  define CONFIG_EXAMPLES_NXLINES_NOTIFYSIGNO 4
-#endif

 /****************************************************************************
 * Public Types
--- a/examples/nxscope/Kconfig
+++ b/examples/nxscope/Kconfig
@ -74,7 +74,7 @@ config EXAMPLES_NXSCOPE_TIMER_PATH

 config EXAMPLES_NXSCOPE_TIMER_SIGNO
 	int "nxscope notification signal number"
-	default 17
+	default 32

 config EXAMPLES_NXSCOPE_TIMER_INTERVAL
 	int "nxscope timer interval (microseconds)"
--- a/examples/nxterm/Kconfig
+++ b/examples/nxterm/Kconfig
@ -40,11 +40,6 @@ config EXAMPLES_NXTERM_SERVERPRIO
 	int "Server priority"
 	default 120

-config EXAMPLES_NXTERM_NOTIFYSIGNO
-	int "Notification signal"
-	default 4
-	range 1 31
-
 config EXAMPLES_NXTERM_BPP
 	int "Pixel width"
 	default 16
--- a/examples/nxterm/nxterm_internal.h
+++ b/examples/nxterm/nxterm_internal.h
@ -184,9 +184,6 @@
 #ifndef CONFIG_EXAMPLES_NXTERM_SERVERPRIO
 #  define CONFIG_EXAMPLES_NXTERM_SERVERPRIO 120
 #endif
-#ifndef CONFIG_EXAMPLES_NXTERM_NOTIFYSIGNO
-#  define CONFIG_EXAMPLES_NXTERM_NOTIFYSIGNO 4
-#endif

 /* NX Console Device */

--- a/examples/oneshot/Kconfig
+++ b/examples/oneshot/Kconfig
@ -28,7 +28,7 @@ config EXAMPLES_ONESHOT_DELAY

 config EXAMPLES_ONESHOT_SIGNO
 	int "Signal number"
-	default 13
+	default 32
 	---help---
 		This is the number of the signal that will be used in the oneshot
 		notification.
--- a/examples/oneshot/oneshot_main.c
+++ b/examples/oneshot/oneshot_main.c
@ -49,7 +49,7 @@
 #endif

 #ifndef CONFIG_EXAMPLES_ONESHOT_SIGNO
-#  define CONFIG_EXAMPLES_ONESHOT_SIGNO 13
+#  define CONFIG_EXAMPLES_ONESHOT_SIGNO 32
 #endif

 /* For long delays that have to be broken into segments, some loss of
--- a/examples/timer/Kconfig
+++ b/examples/timer/Kconfig
@ -38,7 +38,7 @@ config EXAMPLES_TIMER_NSAMPLES

 config EXAMPLES_TIMER_SIGNO
 	int "Notification signal number"
-	default 17
+	default 32
 	---help---
 		This is the signal number that is used to notify the test of
 		timer expiration events.
--- a/examples/timer/timer_main.c
+++ b/examples/timer/timer_main.c
@ -58,7 +58,7 @@
 #endif

 #ifndef CONFIG_EXAMPLES_TIMER_SIGNO
-#  define CONFIG_EXAMPLES_TIMER_SIGNO 17
+#  define CONFIG_EXAMPLES_TIMER_SIGNO 32
 #endif

 /****************************************************************************
--- a/examples/timer_gpio/Kconfig
+++ b/examples/timer_gpio/Kconfig
@ -39,7 +39,7 @@ config EXAMPLES_TIMER_GPIO_INTERVAL

 config EXAMPLES_TIMER_GPIO_SIGNO
 	int "Notification signal number"
-	default 17
+	default 32
 	---help---
 		This is the signal number that is used to notify that a timer
 		interrupt occurred.
--- a/examples/zerocross/Kconfig
+++ b/examples/zerocross/Kconfig
@ -18,6 +18,6 @@ config EXAMPLES_ZEROCROSS_DEVNAME

 config EXAMPLES_ZEROCROSS_SIGNO
 	int "Zero Cross signal"
-	default 13
+	default 32

 endif
--- a/examples/zerocross/zerocross_main.c
+++ b/examples/zerocross/zerocross_main.c
@ -50,7 +50,7 @@
 #endif

 #ifndef CONFIG_EXAMPLES_ZEROCROSS_SIGNO
-#  define CONFIG_EXAMPLES_ZEROCROSS_SIGNO 13
+#  define CONFIG_EXAMPLES_ZEROCROSS_SIGNO 32
 #endif

 /****************************************************************************
--- a/games/shift/shift_input_joystick.h
+++ b/games/shift/shift_input_joystick.h
@ -33,7 +33,7 @@
 ****************************************************************************/

 #define DJOYSTICK_DEVNAME "/dev/djoy0"
-#define DJOYSTICK_SIGNO 13
+#define DJOYSTICK_SIGNO 32

 /* The set of supported joystick discretes */

--- a/graphics/nxwm/Kconfig
+++ b/graphics/nxwm/Kconfig
@ -489,10 +489,10 @@ config NXWM_TOUCHSCREEN_DEVPATH

 config NXWM_TOUCHSCREEN_SIGNO
 	int "Touchscreen Signal Number"
-	default 5
+	default 32
 	---help---
 		The realtime signal used to wake up the touchscreen listener
-		thread.  Default: 5
+		thread.  Default: 32

 config NXWM_TOUCHSCREEN_LISTENERPRIO
 	int "Touchscreen Listener Task Priority"
@ -552,10 +552,10 @@ config NXWM_KEYBOARD_USBHOST

 config NXWM_KEYBOARD_SIGNO
 	int "Keyboard Task Signal Number"
-	default 6
+	default 33
 	---help---
 		The realtime signal used to wake up the keyboard listener thread.
-		Default: 6
+		Default: 33

 config NXWM_KEYBOARD_BUFSIZE
 	int "Keyboard Buffer Size"
@ -729,10 +729,10 @@ endif # NXWM_CUSTOM_CALIBRATION_ICON

 config NXWM_CALIBRATION_SIGNO
 	int "Calibration Signal Number"
-	default 5
+	default 32
 	---help---
 		The realtime signal used to wake up the touchscreen calibration
-		thread.  Default: 5
+		thread.  Default: 32

 config NXWM_CALIBRATION_LISTENERPRIO
 	int "Calibration Task Priority"
--- a/include/graphics/nxwm/nxwmconfig.hxx
+++ b/include/graphics/nxwm/nxwmconfig.hxx
@ -423,7 +423,7 @@
 #endif

 #ifndef CONFIG_NXWM_TOUCHSCREEN_SIGNO
-#  define CONFIG_NXWM_TOUCHSCREEN_SIGNO 5
+#  define CONFIG_NXWM_TOUCHSCREEN_SIGNO 32
 #endif

 #ifndef CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO
@ -459,7 +459,7 @@
 #endif

 #ifndef CONFIG_NXWM_KEYBOARD_SIGNO
-#  define CONFIG_NXWM_KEYBOARD_SIGNO 6
+#  define CONFIG_NXWM_KEYBOARD_SIGNO 33
 #endif

 #ifndef CONFIG_NXWM_KEYBOARD_BUFSIZE
@ -532,7 +532,7 @@
 #endif

 #ifndef CONFIG_NXWM_CALIBRATION_SIGNO
-#  define CONFIG_NXWM_CALIBRATION_SIGNO 5
+#  define CONFIG_NXWM_CALIBRATION_SIGNO 32
 #endif

 #ifndef CONFIG_NXWM_CALIBRATION_LISTENERPRIO
--- a/include/graphics/twm4nx/apps/calib_config.hxx
+++ b/include/graphics/twm4nx/apps/calib_config.hxx
@ -114,7 +114,7 @@
 #endif

 #ifndef CONFIG_TWM4NX_CALIBRATION_SIGNO
-#  define CONFIG_TWM4NX_CALIBRATION_SIGNO 5
+#  define CONFIG_TWM4NX_CALIBRATION_SIGNO 32
 #endif

 #ifndef CONFIG_TWM4NX_CALIBRATION_LISTENERPRIO
--- a/include/graphics/twm4nx/twm4nx_config.hxx
+++ b/include/graphics/twm4nx/twm4nx_config.hxx
@ -448,7 +448,7 @@
 */

 #ifndef CONFIG_TWM4NX_INPUT_SIGNO
-#  define CONFIG_TWM4NX_INPUT_SIGNO 6
+#  define CONFIG_TWM4NX_INPUT_SIGNO 33
 #endif

 #ifndef CONFIG_TWM4NX_INPUT_LISTENERPRIO
--- a/include/netutils/netinit.h
+++ b/include/netutils/netinit.h
@ -69,7 +69,7 @@
 #endif

 #ifndef CONFIG_NETINIT_SIGNO
-#  define CONFIG_NETINIT_SIGNO 18
+#  define CONFIG_NETINIT_SIGNO 32
 #endif

 #ifndef CONFIG_NETINIT_THREAD_STACKSIZE
--- a/netutils/netinit/Kconfig
+++ b/netutils/netinit/Kconfig
@ -90,7 +90,7 @@ if NETINIT_MONITOR

 config NETINIT_SIGNO
 	int "Notification signal number"
-	default 18
+	default 32
 	---help---
 		The network monitor logic will receive signals when there is any
 		change in the link status.  This setting may be used to customize
--- a/testing/drivertest/drivertest_timer.c
+++ b/testing/drivertest/drivertest_timer.c
@ -48,7 +48,7 @@
 #define TIMER_DEFAULT_DEVPATH "/dev/timer0"
 #define TIMER_DEFAULT_INTERVAL 1000000
 #define TIMER_DEFAULT_NSAMPLES 20
-#define TIMER_DEFAULT_SIGNO 17
+#define TIMER_DEFAULT_SIGNO 32
 #define TIMER_DEFAULT_RANGE 1

 #define OPTARG_TO_VALUE(value, type, base)                            \