diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-02-01 12:29:04 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-02-01 12:29:04 +0000 |
| commit | 9bf85f976ca1c539788e6d1d60995434eb856812 (patch) | |
| tree | 2324f498d64c97271b07f0c420ce32dd743caad8 /macosx/plugins/HIDInput/src/PlugPAD.c | |
| parent | 843732611c8eab41931a6e434a9cb8bac0a06e6f (diff) | |
| download | pcsxr-9bf85f976ca1c539788e6d1d60995434eb856812.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@41013 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/HIDInput/src/PlugPAD.c')
| -rw-r--r-- | macosx/plugins/HIDInput/src/PlugPAD.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/macosx/plugins/HIDInput/src/PlugPAD.c b/macosx/plugins/HIDInput/src/PlugPAD.c index c9717d7f..e5bfdf4c 100644 --- a/macosx/plugins/HIDInput/src/PlugPAD.c +++ b/macosx/plugins/HIDInput/src/PlugPAD.c @@ -49,13 +49,13 @@ long PADinit(long flags) { if (!HIDHaveDeviceList()) { // List all HID devices HIDBuildDeviceList(kHIDPage_GenericDesktop, 0); - + if (HIDCountDevices() == 0) { // No devices found! HIDReleaseDeviceList(); return PSE_PAD_ERR_INIT; } - + //HIDCloseReleaseInterface( } @@ -103,7 +103,7 @@ long PADclose(void) { long PADconfigure(void) { // make sure our previous configuration was loaded if (sPadFlags == 0) { - fprintf(stderr, "PADconfigure() called before PADinit()\n"); + //fprintf(stderr, "PADconfigure() called before PADinit()\n"); if (!HIDHaveDeviceList()) { HIDBuildDeviceList(kHIDPage_GenericDesktop, 0); } @@ -116,16 +116,15 @@ void PADabout(void) { DoAbout(); } -long _readPortX(PadDataS *data, int port) -{ +long _readPortX(PadDataS *data, int port) { unsigned short buttonState = 0xffff; keyEntry *keys = gKeys[port]; axisEntry *axes = gAxes[port]; int i; - + //pRecDevice device; //IOHIDEventStruct event; - + /*device = HIDGetFirstDevice(); do { while (HIDGetEvent(device, &event)) { @@ -140,10 +139,10 @@ long _readPortX(PadDataS *data, int port) } } while (HIDGetNextDevice(device));*/ - + for (i=0; i<gNumKeys[port]; i++) { long value = HIDGetElementValue(keys[i].device, keys[i].element); - + if (keys[i].element->usagePage == kHIDPage_GenericDesktop && keys[i].element->usage >= kHIDUsage_GD_X && keys[i].element->usage <= kHIDUsage_GD_Rz) { /* axis input device */ |
