Switch sysctl keys to use the new SYSTEM_KEY macro

src/kaleidoscope/key_defs_sysctl.h

@@ -18,50 +18,50 @@
 
 // System control mappings
 
-#define System_PowerDown Key(HID_SYSTEM_POWER_DOWN, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_Sleep Key(HID_SYSTEM_SLEEP, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_WakeUp Key(HID_SYSTEM_WAKE_UP, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_ContextMenu Key(HID_SYSTEM_CONTEXT_MENU, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_MainMenu Key(HID_SYSTEM_MAIN_MENU, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_AppMenu Key(HID_SYSTEM_APP_MENU, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_MenuHelp Key(HID_SYSTEM_MENU_HELP, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_MenuExit Key(HID_SYSTEM_MENU_EXIT, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_MenuSelect Key(HID_SYSTEM_MENU_SELECT, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_MenuRight Key(HID_SYSTEM_MENU_RIGHT, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_RTC)
-#define System_MenuLeft Key(HID_SYSTEM_MENU_LEFT, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_RTC)
-#define System_MenuUp Key(HID_SYSTEM_MENU_UP, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_RTC)
-#define System_MenuDown Key(HID_SYSTEM_MENU_DOWN, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_RTC)
-#define System_ColdRestart Key(HID_SYSTEM_COLD_RESTART, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_WarmRestart Key(HID_SYSTEM_WARM_RESTART, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_DPadUp Key(HID_D_PAD_UP, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OOC)
-#define System_DPadDown Key(HID_D_PAD_DOWN, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OOC)
-#define System_DPadRight Key(HID_D_PAD_RIGHT, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OOC)
-#define System_DPadLeft Key(HID_D_PAD_LEFT, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OOC)
+#define System_PowerDown SYSTEM_KEY(HID_SYSTEM_POWER_DOWN, HID_TYPE_OSC)
+#define System_Sleep SYSTEM_KEY(HID_SYSTEM_SLEEP, HID_TYPE_OSC)
+#define System_WakeUp SYSTEM_KEY(HID_SYSTEM_WAKE_UP, HID_TYPE_OSC)
+#define System_ContextMenu SYSTEM_KEY(HID_SYSTEM_CONTEXT_MENU, HID_TYPE_OSC)
+#define System_MainMenu SYSTEM_KEY(HID_SYSTEM_MAIN_MENU, HID_TYPE_OSC)
+#define System_AppMenu SYSTEM_KEY(HID_SYSTEM_APP_MENU, HID_TYPE_OSC)
+#define System_MenuHelp SYSTEM_KEY(HID_SYSTEM_MENU_HELP, HID_TYPE_OSC)
+#define System_MenuExit SYSTEM_KEY(HID_SYSTEM_MENU_EXIT, HID_TYPE_OSC)
+#define System_MenuSelect SYSTEM_KEY(HID_SYSTEM_MENU_SELECT, HID_TYPE_OSC)
+#define System_MenuRight SYSTEM_KEY(HID_SYSTEM_MENU_RIGHT, HID_TYPE_RTC)
+#define System_MenuLeft SYSTEM_KEY(HID_SYSTEM_MENU_LEFT, HID_TYPE_RTC)
+#define System_MenuUp SYSTEM_KEY(HID_SYSTEM_MENU_UP, HID_TYPE_RTC)
+#define System_MenuDown SYSTEM_KEY(HID_SYSTEM_MENU_DOWN, HID_TYPE_RTC)
+#define System_ColdRestart SYSTEM_KEY(HID_SYSTEM_COLD_RESTART, HID_TYPE_OSC)
+#define System_WarmRestart SYSTEM_KEY(HID_SYSTEM_WARM_RESTART, HID_TYPE_OSC)
+#define System_DPadUp SYSTEM_KEY(HID_D_PAD_UP, HID_TYPE_OOC)
+#define System_DPadDown SYSTEM_KEY(HID_D_PAD_DOWN, HID_TYPE_OOC)
+#define System_DPadRight SYSTEM_KEY(HID_D_PAD_RIGHT, HID_TYPE_OOC)
+#define System_DPadLeft SYSTEM_KEY(HID_D_PAD_LEFT, HID_TYPE_OOC)
 
-#define System_IndexTrigger Key(HID_INDEX_TRIGGER, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_MC)
-#define System_PalmTrigger Key(HID_PALM_TRIGGER, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_MC)
-#define System_Thumbstick Key(HID_THUMBSTICK, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_CP)
-#define System_SystemFunctionShift Key(HID_SYSTEM_FUNCTION_SHIFT, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_MC)
-#define System_SystemFunctionShiftLock Key(HID_SYSTEM_FUNCTION_SHIFT_LOCK, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OOC)
-#define System_SystemFunctionShiftLockIndicator Key(HID_SYSTEM_FUNCTION_SHIFT_LOCK_INDICATOR, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_DV)
-#define System_DismissNotification Key(HID_DISMISS_NOTIFICATION, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_DoNotDisturb Key(HID_DO_NOT_DISTURB, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OOC)
+#define System_IndexTrigger SYSTEM_KEY(HID_INDEX_TRIGGER, HID_TYPE_MC)
+#define System_PalmTrigger SYSTEM_KEY(HID_PALM_TRIGGER, HID_TYPE_MC)
+#define System_Thumbstick SYSTEM_KEY(HID_THUMBSTICK, HID_TYPE_CP)
+#define System_SystemFunctionShift SYSTEM_KEY(HID_SYSTEM_FUNCTION_SHIFT, HID_TYPE_MC)
+#define System_SystemFunctionShiftLock SYSTEM_KEY(HID_SYSTEM_FUNCTION_SHIFT_LOCK, HID_TYPE_OOC)
+#define System_SystemFunctionShiftLockIndicator SYSTEM_KEY(HID_SYSTEM_FUNCTION_SHIFT_LOCK_INDICATOR, HID_TYPE_DV)
+#define System_DismissNotification SYSTEM_KEY(HID_DISMISS_NOTIFICATION, HID_TYPE_OSC)
+#define System_DoNotDisturb SYSTEM_KEY(HID_DO_NOT_DISTURB, HID_TYPE_OOC)
 
-#define System_Dock Key(HID_SYSTEM_DOCK, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_Undock Key(HID_SYSTEM_UNDOCK, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_Setup Key(HID_SYSTEM_SETUP, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_Break Key(HID_SYSTEM_BREAK, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_DebuggerBreak Key(HID_SYSTEM_DEBUGGER_BREAK, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_ApplicationBreak Key(HID_APPLICATION_BREAK, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_ApplicationDebuggerBreak Key(HID_APPLICATION_DEBUGGER_BREAK, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_SpeakerMute Key(HID_SYSTEM_SPEAKER_MUTE, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_Hibernate Key(HID_SYSTEM_HIBERNATE, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
+#define System_Dock SYSTEM_KEY(HID_SYSTEM_DOCK, HID_TYPE_OSC)
+#define System_Undock SYSTEM_KEY(HID_SYSTEM_UNDOCK, HID_TYPE_OSC)
+#define System_Setup SYSTEM_KEY(HID_SYSTEM_SETUP, HID_TYPE_OSC)
+#define System_Break SYSTEM_KEY(HID_SYSTEM_BREAK, HID_TYPE_OSC)
+#define System_DebuggerBreak SYSTEM_KEY(HID_SYSTEM_DEBUGGER_BREAK, HID_TYPE_OSC)
+#define System_ApplicationBreak SYSTEM_KEY(HID_APPLICATION_BREAK, HID_TYPE_OSC)
+#define System_ApplicationDebuggerBreak SYSTEM_KEY(HID_APPLICATION_DEBUGGER_BREAK, HID_TYPE_OSC)
+#define System_SpeakerMute SYSTEM_KEY(HID_SYSTEM_SPEAKER_MUTE, HID_TYPE_OSC)
+#define System_Hibernate SYSTEM_KEY(HID_SYSTEM_HIBERNATE, HID_TYPE_OSC)
 
-#define System_DisplayInvert Key(HID_SYSTEM_DISPLAY_INVERT, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_DisplayInternal Key(HID_SYSTEM_DISPLAY_INTERNAL, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_DisplayExternal Key(HID_SYSTEM_DISPLAY_EXTERNAL, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_DisplayBoth Key(HID_SYSTEM_DISPLAY_BOTH, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_DisplayDual Key(HID_SYSTEM_DISPLAY_DUAL, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_DisplayToggleIntSlashExt Key(HID_SYSTEM_DISPLAY_TOGGLE_INT_SLASH_EXT, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_DisplaySwapPrimarySlashSecondary Key(HID_SYSTEM_DISPLAY_SWAP_PRIMARY_SLASH_SECONDARY, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
-#define System_DisplayLCDAutoscale Key(HID_SYSTEM_DISPLAY_LCD_AUTOSCALE, KEY_FLAGS | SYNTHETIC|IS_SYSCTL | HID_TYPE_OSC)
+#define System_DisplayInvert SYSTEM_KEY(HID_SYSTEM_DISPLAY_INVERT, HID_TYPE_OSC)
+#define System_DisplayInternal SYSTEM_KEY(HID_SYSTEM_DISPLAY_INTERNAL, HID_TYPE_OSC)
+#define System_DisplayExternal SYSTEM_KEY(HID_SYSTEM_DISPLAY_EXTERNAL, HID_TYPE_OSC)
+#define System_DisplayBoth SYSTEM_KEY(HID_SYSTEM_DISPLAY_BOTH, HID_TYPE_OSC)
+#define System_DisplayDual SYSTEM_KEY(HID_SYSTEM_DISPLAY_DUAL, HID_TYPE_OSC)
+#define System_DisplayToggleIntSlashExt SYSTEM_KEY(HID_SYSTEM_DISPLAY_TOGGLE_INT_SLASH_EXT, HID_TYPE_OSC)
+#define System_DisplaySwapPrimarySlashSecondary SYSTEM_KEY(HID_SYSTEM_DISPLAY_SWAP_PRIMARY_SLASH_SECONDARY, HID_TYPE_OSC)
+#define System_DisplayLCDAutoscale SYSTEM_KEY(HID_SYSTEM_DISPLAY_LCD_AUTOSCALE, HID_TYPE_OSC)