aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTwinaphex2014-12-20 20:43:18 +0100
committerTwinaphex2014-12-20 20:43:18 +0100
commit247fc699be6b3bd95fd9126541e0804cc8dffdd4 (patch)
treed38e169e68e48a3ccbf8a3805f9cb87197ed894a /include
parent3e5b01fcef8ef20dacca45ea7a7b0c461e6bd666 (diff)
parent7931825ed8ef51dab3e37475d8126103ebc9fb6f (diff)
downloadpcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.tar.gz
pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.tar.bz2
pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.zip
Merge pull request #11 from notaz/upstream_merge
Upstream merge
Diffstat (limited to 'include')
-rw-r--r--include/psemu_plugin_defs.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/include/psemu_plugin_defs.h b/include/psemu_plugin_defs.h
index b40c77c..9986654 100644
--- a/include/psemu_plugin_defs.h
+++ b/include/psemu_plugin_defs.h
@@ -5,8 +5,6 @@
extern "C" {
#endif
-#include <stdint.h>
-
// header version
#define _PPDK_HEADER_VERSION 3
@@ -207,11 +205,10 @@ typedef struct
// values are in range -128 - 127
unsigned char moveX, moveY;
- uint8_t Vib[2];
-
- volatile uint8_t VibF[2];
+ unsigned char Vib[2];
+ unsigned char VibF[2];
- unsigned char reserved[87];
+ unsigned char reserved[87];
} PadDataS;