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
psxbios: primitive chdir implementation
[pcsx_rearmed.git]
/
plugins
/
dfinput
/
main.c
diff --git
a/plugins/dfinput/main.c
b/plugins/dfinput/main.c
index
475ea07
..
5d676c4
100644
(file)
--- a/
plugins/dfinput/main.c
+++ b/
plugins/dfinput/main.c
@@
-8,13
+8,6
@@
* See the COPYING file in the top-level directory.
*/
* See the COPYING file in the top-level directory.
*/
-#ifndef _WIN32
-#define CALLBACK
-#else
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-
#include "main.h"
unsigned char CurPad, CurByte, CurCmd, CmdLen;
#include "main.h"
unsigned char CurPad, CurByte, CurCmd, CmdLen;
@@
-27,6
+20,8
@@
extern unsigned char CALLBACK PAD2__startPoll(int pad);
extern unsigned char CALLBACK PAD1__poll(unsigned char value);
extern unsigned char CALLBACK PAD2__poll(unsigned char value);
extern unsigned char CALLBACK PAD1__poll(unsigned char value);
extern unsigned char CALLBACK PAD2__poll(unsigned char value);
+#if 0 //ndef HAVE_LIBRETRO
+
static int old_controller_type1 = -1, old_controller_type2 = -1;
#define select_pad(n) \
static int old_controller_type1 = -1, old_controller_type2 = -1;
#define select_pad(n) \
@@
-44,6
+39,7
@@
static int old_controller_type1 = -1, old_controller_type2 = -1;
PAD##n##_poll = PADpoll_guncon; \
guncon_init(); \
break; \
PAD##n##_poll = PADpoll_guncon; \
guncon_init(); \
break; \
+ case PSE_PAD_TYPE_NEGCON: \
case PSE_PAD_TYPE_GUN: \
default: \
PAD##n##_startPoll = PAD##n##__startPoll; \
case PSE_PAD_TYPE_GUN: \
default: \
PAD##n##_startPoll = PAD##n##__startPoll; \
@@
-56,9
+52,20
@@
void dfinput_activate(void)
{
PadDataS pad;
{
PadDataS pad;
+ pad.portMultitap = -1;
+ pad.requestPadIndex = 0;
PAD1_readPort1(&pad);
select_pad(1);
PAD1_readPort1(&pad);
select_pad(1);
+ pad.requestPadIndex = 1;
PAD2_readPort2(&pad);
select_pad(2);
}
PAD2_readPort2(&pad);
select_pad(2);
}
+
+#else // use libretro's libpcsxcore/plugins.c code
+
+void dfinput_activate(void)
+{
+}
+
+#endif