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 pull request #351 from SindenLightgun/master
[pcsx_rearmed.git]
/
plugins
/
dfinput
/
main.c
diff --git
a/plugins/dfinput/main.c
b/plugins/dfinput/main.c
index
f4a14fa
..
af6b80b
100644
(file)
--- a/
plugins/dfinput/main.c
+++ b/
plugins/dfinput/main.c
@@
-1,5
+1,5
@@
/*
/*
- * (C) Gra
Å
¾vydas "notaz" Ignotas, 2011
+ * (C) Gra
Ã
\85
Â
¾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):
@@
-15,9
+15,6
@@
#include <windows.h>
#endif
#include <windows.h>
#endif
-#include <stdio.h>
-#include <string.h>
-
#include "main.h"
unsigned char CurPad, CurByte, CurCmd, CmdLen;
#include "main.h"
unsigned char CurPad, CurByte, CurCmd, CmdLen;
@@
-43,10
+40,11
@@
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: \
- PAD##n##_startPoll = PADstartPoll_guncon; \
- PAD##n##_poll = PADpoll_guncon; \
- guncon_init(); \
- break; \
+ //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; \
case PSE_PAD_TYPE_NEGCON: \
case PSE_PAD_TYPE_GUN: \
default: \
case PSE_PAD_TYPE_NEGCON: \
case PSE_PAD_TYPE_GUN: \
default: \
@@
-56,20
+54,19
@@
static int old_controller_type1 = -1, old_controller_type2 = -1;
} \
}
} \
}
-// case PSE_PAD_TYPE_NEGCON: \
-// PAD##n##_startPoll = PADstartPoll_negcon; \
-// PAD##n##_poll = PADpoll_negcon; \
-// negcon_init(); \
-// break; \
void dfinput_activate(void)
{
void dfinput_activate(void)
{
+ #ifndef HAVE_LIBRETRO
PadDataS pad;
PadDataS pad;
- int i;
+ 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);
+ #endif
}
}