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
Fix Win32 build, part 2
[pcsx_rearmed.git]
/
plugins
/
dfinput
/
main.c
diff --git
a/plugins/dfinput/main.c
b/plugins/dfinput/main.c
index
974c4dd
..
5d676c4
100644
(file)
--- a/
plugins/dfinput/main.c
+++ b/
plugins/dfinput/main.c
@@
-1,5
+1,5
@@
/*
/*
- * (C) Gra
Ã
\85
Â
¾vydas "notaz" Ignotas, 2011
+ * (C) Gra
Å
¾vydas "notaz" Ignotas, 2011
*
* This work is licensed under the terms of any of these licenses
* (at your option):
*
* This work is licensed under the terms of any of these licenses
* (at your option):
@@
-20,7
+20,7
@@
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);
-#ifndef HAVE_LIBRETRO
+#if
0 //
ndef HAVE_LIBRETRO
static int old_controller_type1 = -1, old_controller_type2 = -1;
static int old_controller_type1 = -1, old_controller_type2 = -1;
@@
-35,11
+35,10
@@
static int old_controller_type1 = -1, old_controller_type2 = -1;
pad_init(); \
break; \
case PSE_PAD_TYPE_GUNCON: \
pad_init(); \
break; \
case PSE_PAD_TYPE_GUNCON: \
- /* Removed for new Guncon functionality, may have been required for very old touchscreen support */ \
- /* PAD##n##_startPoll = PADstartPoll_guncon; */ \
- /* PAD##n##_poll = PADpoll_guncon; */ \
- /* guncon_init(); */ \
- /* break; */ \
+ PAD##n##_startPoll = PADstartPoll_guncon; \
+ PAD##n##_poll = PADpoll_guncon; \
+ guncon_init(); \
+ break; \
case PSE_PAD_TYPE_NEGCON: \
case PSE_PAD_TYPE_GUN: \
default: \
case PSE_PAD_TYPE_NEGCON: \
case PSE_PAD_TYPE_GUN: \
default: \
@@
-48,12
+47,9
@@
static int old_controller_type1 = -1, old_controller_type2 = -1;
break; \
} \
}
break; \
} \
}
-#endif /* HAVE_LIBRETRO */
-
void dfinput_activate(void)
{
void dfinput_activate(void)
{
- #ifndef HAVE_LIBRETRO
PadDataS pad;
pad.portMultitap = -1;
PadDataS pad;
pad.portMultitap = -1;
@@
-64,5
+60,12
@@
void dfinput_activate(void)
pad.requestPadIndex = 1;
PAD2_readPort2(&pad);
select_pad(2);
pad.requestPadIndex = 1;
PAD2_readPort2(&pad);
select_pad(2);
- #endif
}
}
+
+#else // use libretro's libpcsxcore/plugins.c code
+
+void dfinput_activate(void)
+{
+}
+
+#endif