encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

joystick: #if 0'd out some things that aren't currently used. 

Fixes some compiler warnings.
This commit is contained in:
Ryan C. Gordon 2018-08-10 14:09:44 -04:00
parent a7c3d2af81
commit 0b2863d45e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/joystick/controller_type.h
View File

@ -68,16 +68,17 @@ typedef enum
k_eControllertype_GenericMouse = 800, k_eControllertype_GenericMouse = 800,
} EControllerType; } 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 ) static inline bool BIsSteamController( EControllerType eType )
{ {
return ( eType == k_eControllerType_SteamController || eType == k_eControllerType_SteamControllerV2 ); 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 ) static inline bool BIsXInputController( EControllerType eType )
{ {
return ( eType == k_eControllerType_XBox360Controller || eType == k_eControllerType_XBoxOneController || eType == k_eControllerType_UnknownNonSteamController ); 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 true;
return false; return false;
} }
#endif
#define MAKE_CONTROLLER_ID( nVID, nPID ) (unsigned int)( nVID << 16 | nPID ) #define MAKE_CONTROLLER_ID( nVID, nPID ) (unsigned int)( nVID << 16 | nPID )
typedef struct 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 */) static inline const ControllerDescription_t * GetControllerArray( int* nLength /* Out */)
{ {
*nLength = sizeof( arrControllers ) / sizeof( arrControllers[0] ); *nLength = sizeof( arrControllers ) / sizeof( arrControllers[0] );
return arrControllers; return arrControllers;
} }
#endif
static inline EControllerType GuessControllerType( int nVID, int nPID ) static inline EControllerType GuessControllerType( int nVID, int nPID )
{ {