Skip to content

Commit

Permalink
joystick: #if 0'd out some things that aren't currently used.
Browse files Browse the repository at this point in the history
Fixes some compiler warnings.
  • Loading branch information
icculus committed Aug 10, 2018
1 parent a7c3d2a commit 0b2863d
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/joystick/controller_type.h
Expand Up @@ -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 )
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 )
{
Expand Down

0 comments on commit 0b2863d

Please sign in to comment.