actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify. IntValue() already checks that.

Browse Source
This commit is contained in:
Steve Checkoway
2006-08-05 01:37:31 +00:00
parent 13be8ec089
commit cfdb3b9ae1
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/archutils/Darwin/HIDDevice.cpp
+8 -10
View File
@@ -39,7 +39,7 @@ bool HIDDevice::Open( io_object_t device )
CFTypeRef object; CFTypeRef object;
result = IORegistryEntryCreateCFProperties( device, &properties, kCFAllocatorDefault, kNilOptions ); result = IORegistryEntryCreateCFProperties( device, &properties, kCFAllocatorDefault, kNilOptions );
if ( result != KERN_SUCCESS || !properties ) if( result != KERN_SUCCESS || !properties )
{ {
LOG->Warn( "Couldn't get properties." ); LOG->Warn( "Couldn't get properties." );
return false; return false;
@@ -51,9 +51,9 @@ bool HIDDevice::Open( io_object_t device )
CFTypeRef pidRef = CFDictionaryGetValue( properties, CFSTR(kIOHIDProductIDKey) ); CFTypeRef pidRef = CFDictionaryGetValue( properties, CFSTR(kIOHIDProductIDKey) );
int vid, pid; int vid, pid;
if( vidRef && !IntValue(vidRef, vid) ) if( !IntValue(vidRef, vid) )
vid = 0; vid = 0;
if( pidRef && !IntValue(pidRef, pid) ) if( !IntValue(pidRef, pid) )
pid = 0; pid = 0;
if( !SupportsVidPid(vid, pid) ) if( !SupportsVidPid(vid, pid) )
@@ -186,16 +186,15 @@ void HIDDevice::AddLogicalDevice( const void *value, void *context )
HIDDevice *This = (HIDDevice *)context; HIDDevice *This = (HIDDevice *)context;
CFTypeRef object; CFTypeRef object;
int usage, usagePage; int usage, usagePage;
CFTypeID numID = CFNumberGetTypeID();
// Get usage page // Get usage page
object = CFDictionaryGetValue( properties, CFSTR(kIOHIDElementUsagePageKey) ); object = CFDictionaryGetValue( properties, CFSTR(kIOHIDElementUsagePageKey) );
if( !object || CFGetTypeID(object) != numID || !IntValue(object, usagePage) ) if( !IntValue(object, usagePage) )
return; return;
// Get usage // Get usage
object = CFDictionaryGetValue( properties, CFSTR(kIOHIDElementUsageKey) ); object = CFDictionaryGetValue( properties, CFSTR(kIOHIDElementUsageKey) );
if( !object || CFGetTypeID(object) != numID || !IntValue(object, usage) ) if( !IntValue(object, usage) )
return; return;
object = CFDictionaryGetValue( properties, CFSTR(kIOHIDElementKey) ); object = CFDictionaryGetValue( properties, CFSTR(kIOHIDElementKey) );
@@ -219,7 +218,6 @@ void HIDDevice::AddElement( const void *value, void *context )
CFDictionaryRef properties = CFDictionaryRef( value ); CFDictionaryRef properties = CFDictionaryRef( value );
HIDDevice *This = (HIDDevice *)context; HIDDevice *This = (HIDDevice *)context;
CFTypeRef object; CFTypeRef object;
CFTypeID numID = CFNumberGetTypeID();
int cookie, usage, usagePage; int cookie, usage, usagePage;
// Recursively add elements // Recursively add elements
@@ -234,18 +232,18 @@ void HIDDevice::AddElement( const void *value, void *context )
// Get usage page // Get usage page
object = CFDictionaryGetValue( properties, CFSTR(kIOHIDElementUsagePageKey) ); object = CFDictionaryGetValue( properties, CFSTR(kIOHIDElementUsagePageKey) );
if( !object || CFGetTypeID(object) != numID || !IntValue(object, usagePage) ) if( !IntValue(object, usagePage) )
return; return;
// Get usage // Get usage
object = CFDictionaryGetValue( properties, CFSTR(kIOHIDElementUsageKey) ); object = CFDictionaryGetValue( properties, CFSTR(kIOHIDElementUsageKey) );
if( !object || CFGetTypeID(object) != numID || !IntValue(object, usage) ) if( !IntValue(object, usage) )
return; return;
// Get cookie // Get cookie
object = CFDictionaryGetValue( properties, CFSTR(kIOHIDElementCookieKey) ); object = CFDictionaryGetValue( properties, CFSTR(kIOHIDElementCookieKey) );
if( !object || CFGetTypeID(object) != numID || !IntValue(object, cookie) ) if( !IntValue(object, cookie) )
return; return;
This->AddElement( usagePage, usage, cookie, properties ); This->AddElement( usagePage, usage, cookie, properties );
} }