From 2586d5c2ebd7cc9c788c8f68d2f2e8871f5438f5 Mon Sep 17 00:00:00 2001 From: "John F. Fay" Date: Wed, 4 May 2005 12:53:48 +0000 Subject: [PATCH] Removing an unused function git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@593 7f0cb862-5218-0410-a997-914c9d46530a --- src/freeglut_joystick.c | 61 ----------------------------------------------- 1 file changed, 61 deletions(-) diff --git a/src/freeglut_joystick.c b/src/freeglut_joystick.c index 046e62f..7548a88 100644 --- a/src/freeglut_joystick.c +++ b/src/freeglut_joystick.c @@ -436,7 +436,6 @@ static CFDictionaryRef fghJoystickGetCFProperties ( SFG_Joystick* joy, io_object static void fghJoystickEnumerateElements ( SFG_Joystick* joy, CFTypeRef element ); /* callback for CFArrayApply */ static void fghJoystickElementEnumerator ( SFG_Joystick* joy, void *element, void* vjs ); -static void fghJoystickParseElement ( SFG_Joystick* joy, CFDictionaryRef element ); static void fghJoystickAddAxisElement ( SFG_Joystick* joy, CFDictionaryRef axis ); static void fghJoystickAddButtonElement ( SFG_Joystick* joy, CFDictionaryRef button ); @@ -932,66 +931,6 @@ static void fghJoystickEnumerateElements ( SFG_Joystick *joy, CFTypeRef element &fghJoystickElementEnumerator, joy ); } -static void fghJoystickParseElement ( SFG_Joystick *joy, CFDictionaryRef element ) -{ - CFTypeRef refPage = CFDictionaryGetValue ((CFDictionaryRef) element, CFSTR(kIOHIDElementUsagePageKey)); - CFTypeRef refUsage = CFDictionaryGetValue ((CFDictionaryRef) element, CFSTR(kIOHIDElementUsageKey)); - - long type, page, usage; - - CFNumberGetValue((CFNumberRef) - CFDictionaryGetValue ((CFDictionaryRef) element, CFSTR(kIOHIDElementTypeKey)), - kCFNumberLongType, &type); - - switch ( type ) { - case kIOHIDElementTypeInput_Misc: - case kIOHIDElementTypeInput_Axis: - case kIOHIDElementTypeInput_Button: - printf("got input element..."); - CFNumberGetValue( (CFNumberRef) refUsage, kCFNumberLongType, &usage ); - CFNumberGetValue( (CFNumberRef) refPage, kCFNumberLongType, &page ); - - if (page == kHIDPage_GenericDesktop) { - switch ( usage ) /* look at usage to determine function */ - { - case kHIDUsage_GD_X: - case kHIDUsage_GD_Y: - case kHIDUsage_GD_Z: - case kHIDUsage_GD_Rx: - case kHIDUsage_GD_Ry: - case kHIDUsage_GD_Rz: - case kHIDUsage_GD_Slider: /* for throttle / trim controls */ - printf(" axis\n"); - fghJoystickAddAxisElement((CFDictionaryRef) element); - break; - - case kHIDUsage_GD_Hatswitch: - printf(" hat\n"); - fghJoystickAddHatElement((CFDictionaryRef) element); - break; - - default: - fgWarning ( "input type element has weird usage (%x)", usage); - break; - } - } else if (page == kHIDPage_Button) { - printf(" button\n"); - fghJoystickAddButtonElement((CFDictionaryRef) element); - } else - fgWarning ( "input type element has weird page (%x)", page); - break; - - case kIOHIDElementTypeCollection: - fghJoystickEnumerateElements ( - CFDictionaryGetValue ( element, CFSTR(kIOHIDElementKey) ) - ); - break; - - default: - break; - } -} - static void fghJoystickAddAxisElement ( SFG_Joystick *joy, CFDictionaryRef axis ) { long cookie, lmin, lmax; -- 1.7.10.4