From 0b2863d45e041abeb94cef4dd23072d6065da84c Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Fri, 10 Aug 2018 14:09:44 -0400 Subject: [PATCH] joystick: #if 0'd out some things that aren't currently used. Fixes some compiler warnings. --- src/joystick/controller_type.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/joystick/controller_type.h b/src/joystick/controller_type.h index 23b81ee07..d200d83ca 100644 --- a/src/joystick/controller_type.h +++ b/src/joystick/controller_type.h @@ -68,16 +68,17 @@ typedef enum k_eControllertype_GenericMouse = 800, } EControllerType; -static inline bool BIsSteamHardwareDevice( EControllerType eType ) -{ - return ( eType == k_eControllerType_SteamController || eType == k_eControllerType_SteamControllerV2 || eType == k_eControllerType_FrontPanelBoard ); -} - static inline bool BIsSteamController( EControllerType eType ) { return ( eType == k_eControllerType_SteamController || eType == k_eControllerType_SteamControllerV2 ); } +#if 0 /* these are currently unused, so #if 0'd out to prevent compiler warnings for now */ +static inline bool BIsSteamHardwareDevice( EControllerType eType ) +{ + return ( eType == k_eControllerType_SteamController || eType == k_eControllerType_SteamControllerV2 || eType == k_eControllerType_FrontPanelBoard ); +} + static inline bool BIsXInputController( EControllerType eType ) { return ( eType == k_eControllerType_XBox360Controller || eType == k_eControllerType_XBoxOneController || eType == k_eControllerType_UnknownNonSteamController ); @@ -113,6 +114,7 @@ static inline bool BIsCompatibleType( EControllerType eTypeA, EControllerType eT return true; return false; } +#endif #define MAKE_CONTROLLER_ID( nVID, nPID ) (unsigned int)( nVID << 16 | nPID ) typedef struct @@ -427,11 +429,13 @@ static const ControllerDescription_t arrControllers[] = { }; +#if 0 /* these are currently unused, so #if 0'd out to prevent compiler warnings for now */ static inline const ControllerDescription_t * GetControllerArray( int* nLength /* Out */) { *nLength = sizeof( arrControllers ) / sizeof( arrControllers[0] ); return arrControllers; } +#endif static inline EControllerType GuessControllerType( int nVID, int nPID ) {