Commit 0b2863d45e041abeb94cef4dd23072d6065da84c
2018-08-10T14:09:44
joystick: #if 0'd out some things that aren't currently used. Fixes some compiler warnings.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
diff --git a/src/joystick/controller_type.h b/src/joystick/controller_type.h
index 23b81ee..d200d83 100644
--- a/src/joystick/controller_type.h
+++ b/src/joystick/controller_type.h
@@ -68,14 +68,15 @@ typedef enum
k_eControllertype_GenericMouse = 800,
} EControllerType;
-static inline bool BIsSteamHardwareDevice( EControllerType eType )
+static inline bool BIsSteamController( EControllerType eType )
{
- return ( eType == k_eControllerType_SteamController || eType == k_eControllerType_SteamControllerV2 || eType == k_eControllerType_FrontPanelBoard );
+ return ( eType == k_eControllerType_SteamController || eType == k_eControllerType_SteamControllerV2 );
}
-static inline bool BIsSteamController( EControllerType eType )
+#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 );
+ return ( eType == k_eControllerType_SteamController || eType == k_eControllerType_SteamControllerV2 || eType == k_eControllerType_FrontPanelBoard );
}
static inline bool BIsXInputController( EControllerType eType )
@@ -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 )
{