ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

C89/C90 don't support bitfields on uint8_t - work around this

This commit is contained in:
twinaphex 2016-06-07 14:47:54 +02:00
parent f15b722786
commit afe67ca254
1 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
input/connect/connect_ps4.c
View File

@ -19,6 +19,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <boolean.h> #include <boolean.h>
#include <retro_environment.h>
#include "joypad_connection.h" #include "joypad_connection.h"
#include "../input_defines.h" #include "../input_defines.h"
@ -37,46 +38,52 @@ enum connect_ps4_dpad_states
DPAD_OFF = 0x8 DPAD_OFF = 0x8
}; };
#if (__STDC_VERSION__ >= 199901L) || defined(__cplusplus)
typedef uint8_t bf_uint8_t;
#else
typedef int bf_uint8_t;
#endif
struct ps4buttons struct ps4buttons
{ {
#ifdef MSB_FIRST #ifdef MSB_FIRST
uint8_t triangle : 1; bf_uint8_t triangle : 1;
uint8_t circle : 1; bf_uint8_t circle : 1;
uint8_t cross : 1; bf_uint8_t cross : 1;
uint8_t square : 1; bf_uint8_t square : 1;
uint8_t dpad : 4; bf_uint8_t dpad : 4;
uint8_t r3 : 1; bf_uint8_t r3 : 1;
uint8_t l3 : 1; bf_uint8_t l3 : 1;
uint8_t options : 1; bf_uint8_t options : 1;
uint8_t share : 1; bf_uint8_t share : 1;
uint8_t r2 : 1; bf_uint8_t r2 : 1;
uint8_t l2 : 1; bf_uint8_t l2 : 1;
uint8_t r1 : 1; bf_uint8_t r1 : 1;
uint8_t l1 : 1; bf_uint8_t l1 : 1;
uint8_t reportcounter : 6; bf_uint8_t reportcounter : 6;
uint8_t touchpad : 1; bf_uint8_t touchpad : 1;
uint8_t ps : 1; bf_uint8_t ps : 1;
#else #else
uint8_t dpad : 4; bf_uint8_t dpad : 4;
uint8_t square : 1; bf_uint8_t square : 1;
uint8_t cross : 1; bf_uint8_t cross : 1;
uint8_t circle : 1; bf_uint8_t circle : 1;
uint8_t triangle : 1; bf_uint8_t triangle : 1;
uint8_t l1 : 1; bf_uint8_t l1 : 1;
uint8_t r1 : 1; bf_uint8_t r1 : 1;
uint8_t l2 : 1; bf_uint8_t l2 : 1;
uint8_t r2 : 1; bf_uint8_t r2 : 1;
uint8_t share : 1; bf_uint8_t share : 1;
uint8_t options : 1; bf_uint8_t options : 1;
uint8_t l3 : 1; bf_uint8_t l3 : 1;
uint8_t r3 : 1; bf_uint8_t r3 : 1;
uint8_t ps : 1; bf_uint8_t ps : 1;
uint8_t touchpad : 1; bf_uint8_t touchpad : 1;
uint8_t reportcounter : 6; bf_uint8_t reportcounter : 6;
#endif #endif
}__attribute__((packed)); }__attribute__((packed));