From 80f3da36e571fa702b1d3df693fd545801250eca Mon Sep 17 00:00:00 2001 From: Andre Brait Date: Fri, 16 Feb 2024 15:19:02 +0100 Subject: [Core] Add OS detection callbacks (#21777) --- quantum/os_detection.h | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'quantum/os_detection.h') diff --git a/quantum/os_detection.h b/quantum/os_detection.h index 3496ea0ed2..470f30943a 100644 --- a/quantum/os_detection.h +++ b/quantum/os_detection.h @@ -16,9 +16,12 @@ #pragma once -#include - #ifdef OS_DETECTION_ENABLE + +# include +# include +# include "usb_device_state.h" + typedef enum { OS_UNSURE, OS_LINUX, @@ -30,13 +33,20 @@ typedef enum { void process_wlength(const uint16_t w_length); os_variant_t detected_host_os(void); void erase_wlength_data(void); +void os_detection_notify_usb_device_state_change(enum usb_device_state usb_device_state); + +void os_detection_task(void); + +bool process_detected_host_os_kb(os_variant_t os); +bool process_detected_host_os_user(os_variant_t os); # if defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE) void slave_update_detected_host_os(os_variant_t os); -# endif // defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE) -#endif +# endif -#ifdef OS_DETECTION_DEBUG_ENABLE +# ifdef OS_DETECTION_DEBUG_ENABLE void print_stored_setups(void); void store_setups_in_eeprom(void); -#endif +# endif + +#endif // OS_DETECTION_ENABLE -- cgit v1.2.3 From 9f95577ef2bfff55bf4f5d19c3dc58ea0f09e014 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 19 Feb 2024 15:37:51 +0000 Subject: OS Detection - Entire file should not be wrapped with ifdef (#23108) --- quantum/os_detection.h | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'quantum/os_detection.h') diff --git a/quantum/os_detection.h b/quantum/os_detection.h index 470f30943a..b8cd898335 100644 --- a/quantum/os_detection.h +++ b/quantum/os_detection.h @@ -16,11 +16,9 @@ #pragma once -#ifdef OS_DETECTION_ENABLE - -# include -# include -# include "usb_device_state.h" +#include +#include +#include "usb_device_state.h" typedef enum { OS_UNSURE, @@ -40,13 +38,11 @@ void os_detection_task(void); bool process_detected_host_os_kb(os_variant_t os); bool process_detected_host_os_user(os_variant_t os); -# if defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE) +#if defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE) void slave_update_detected_host_os(os_variant_t os); -# endif +#endif -# ifdef OS_DETECTION_DEBUG_ENABLE +#ifdef OS_DETECTION_DEBUG_ENABLE void print_stored_setups(void); void store_setups_in_eeprom(void); -# endif - -#endif // OS_DETECTION_ENABLE +#endif -- cgit v1.2.3