static long CALLBACK PADclose(void) { return 0; }
static void CALLBACK PADsetSensitive(int _) { return; }
-static long CALLBACK PADreadPort1(PadDataS *pad)
-{
- pad->controllerType = in_type[0];
- pad->buttonStatus = ~in_keystate[0];
- if (in_type[0] == PSE_PAD_TYPE_ANALOGPAD) {
- pad->leftJoyX = in_analog_left[0][0];
- pad->leftJoyY = in_analog_left[0][1];
- pad->rightJoyX = in_analog_right[0][0];
- pad->rightJoyY = in_analog_right[0][1];
+static long CALLBACK PADreadPort1(PadDataS *pad) {
+ int pad_index = pad->requestPadIndex;
+
+ pad->controllerType = in_type[pad_index];
+ pad->buttonStatus = ~in_keystate[pad_index];
+
+ pad->portMultitap = multitap1;
+
+ if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGJOY || in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON || in_type[pad_index] == PSE_PAD_TYPE_GUNCON)
+ {
+ pad->leftJoyX = in_analog_left[pad_index][0];
+ pad->leftJoyY = in_analog_left[pad_index][1];
+ pad->rightJoyX = in_analog_right[pad_index][0];
+ pad->rightJoyY = in_analog_right[pad_index][1];
+
+ pad->absoluteX = in_analog_left[pad_index][0];
+ pad->absoluteY = in_analog_left[pad_index][1];
}
+
+ if (in_type[pad_index] == PSE_PAD_TYPE_MOUSE)
+ {
+ pad->moveX = in_mouse[pad_index][0];
+ pad->moveY = in_mouse[pad_index][1];
+ }
+
return 0;
}
-static long CALLBACK PADreadPort2(PadDataS *pad)
-{
- pad->controllerType = in_type[1];
- pad->buttonStatus = ~in_keystate[0] >> 16;
+static long CALLBACK PADreadPort2(PadDataS *pad) {
+ int pad_index = pad->requestPadIndex;
+
+ pad->controllerType = in_type[pad_index];
+ pad->buttonStatus = ~in_keystate[pad_index];
+
+ pad->portMultitap = multitap2;
+
+ if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGJOY || in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON || in_type[pad_index] == PSE_PAD_TYPE_GUNCON)
+ {
+ pad->leftJoyX = in_analog_left[pad_index][0];
+ pad->leftJoyY = in_analog_left[pad_index][1];
+ pad->rightJoyX = in_analog_right[pad_index][0];
+ pad->rightJoyY = in_analog_right[pad_index][1];
+
+ pad->absoluteX = in_analog_left[pad_index][0];
+ pad->absoluteY = in_analog_left[pad_index][1];
+ }
+
+ if (in_type[pad_index] == PSE_PAD_TYPE_MOUSE)
+ {
+ pad->moveX = in_mouse[pad_index][0];
+ pad->moveY = in_mouse[pad_index][1];
+ }
+
return 0;
}
extern void GPUupdateLace(void);
extern long GPUfreeze(uint32_t, void *);
extern void GPUvBlank(int, int);
+extern void GPUgetScreenInfo(int *y, int *base_hres);
extern void GPUrearmedCallbacks(const struct rearmed_cbs *cbs);
DIRECT_GPU(GPUdmaChain),
DIRECT_GPU(GPUfreeze),
DIRECT_GPU(GPUvBlank),
+ DIRECT_GPU(GPUgetScreenInfo),
DIRECT_GPU(GPUrearmedCallbacks),
DIRECT_GPU(GPUdisplayText),