notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into master
[pcsx_rearmed.git]
/
include
/
psemu_plugin_defs.h
diff --git
a/include/psemu_plugin_defs.h
b/include/psemu_plugin_defs.h
index
0805f4a
..
6fc59b7
100644
(file)
--- a/
include/psemu_plugin_defs.h
+++ b/
include/psemu_plugin_defs.h
@@
-153,6
+153,8
@@
typedef struct
+// No controller
+#define PSE_PAD_TYPE_NONE 0
// MOUSE SCPH-1030
#define PSE_PAD_TYPE_MOUSE 1
// NEGCON - 16 button analog controller SLPH-00001
// MOUSE SCPH-1030
#define PSE_PAD_TYPE_MOUSE 1
// NEGCON - 16 button analog controller SLPH-00001
@@
-191,9
+193,15
@@
typedef struct
typedef struct
{
typedef struct
{
- // controler type - fill it withe predefined values above
+ // control
l
er type - fill it withe predefined values above
unsigned char controllerType;
unsigned char controllerType;
+ //0 : no multitap between psx and pad
+ //1 : multitap between psx and pad on port 1
+ //2 : multitap between psx and pad on port 2
+ int portMultitap;
+ int requestPadIndex;
+
// status of buttons - every controller fills this field
unsigned short buttonStatus;
// status of buttons - every controller fills this field
unsigned short buttonStatus;
@@
-205,11
+213,12
@@
typedef struct
// values are in range -128 - 127
unsigned char moveX, moveY;
// values are in range -128 - 127
unsigned char moveX, moveY;
- uint8_t Vib[2];
-
- volatile uint8_t VibF[2];
-
- unsigned char reserved[87];
+ unsigned char Vib[2];
+ unsigned char VibF[2];
+
+ //configuration mode Request 0x43
+ int configMode;
+ unsigned char reserved[87];
} PadDataS;
} PadDataS;