# include <sys/param.h>\r
#endif\r
\r
-/*\r
- * Initial defines from "js.h" starting around line 33 with the existing "freeglut_joystick.c"\r
- * interspersed\r
- */\r
-\r
-#if TARGET_HOST_MACINTOSH\r
-# include <InputSprocket.h>\r
-#endif\r
-\r
-#if TARGET_HOST_MAC_OSX\r
-# include <mach/mach.h>\r
-# include <IOKit/IOkitLib.h>\r
-# include <IOKit/hid/IOHIDLib.h>\r
-#endif\r
-\r
-#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)\r
-# include <windows.h>\r
-# include <mmsystem.h>\r
-# include <regstr.h>\r
-\r
-#endif\r
-\r
-#if TARGET_HOST_POSIX_X11\r
-# ifdef HAVE_SYS_IOCTL_H\r
-# include <sys/ioctl.h>\r
-# endif\r
-# ifdef HAVE_FCNTL_H\r
-# include <fcntl.h>\r
-# endif\r
-# ifdef HAVE_ERRNO_H\r
-# include <errno.h>\r
-# include <string.h>\r
-# endif\r
-# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)\r
-/* XXX The below hack is done until freeglut's autoconf is updated. */\r
-# define HAVE_USB_JS 1\r
-\r
-# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)\r
-# include <sys/joystick.h>\r
-# else\r
-/*\r
- * XXX NetBSD/amd64 systems may find that they have to steal the\r
- * XXX /usr/include/machine/joystick.h from a NetBSD/i386 system.\r
- * XXX I cannot comment whether that works for the interface, but\r
- * XXX it lets you compile...(^& I do not think that we can do away\r
- * XXX with this header.\r
- */\r
-# include <machine/joystick.h> /* For analog joysticks */\r
-# endif\r
-# define JS_DATA_TYPE joystick\r
-# define JS_RETURN (sizeof(struct JS_DATA_TYPE))\r
-# endif\r
-\r
-# if defined(__linux__)\r
-# include <linux/joystick.h>\r
-\r
-/* check the joystick driver version */\r
-# if defined(JS_VERSION) && JS_VERSION >= 0x010000\r
-# define JS_NEW\r
-# endif\r
-# else /* Not BSD or Linux */\r
-# ifndef JS_RETURN\r
-\r
- /*\r
- * We'll put these values in and that should\r
- * allow the code to at least compile when there is\r
- * no support. The JS open routine should error out\r
- * and shut off all the code downstream anyway and if\r
- * the application doesn't use a joystick we'll be fine.\r
- */\r
-\r
- struct JS_DATA_TYPE\r
- {\r
- int buttons;\r
- int x;\r
- int y;\r
- };\r
-\r
-# define JS_RETURN (sizeof(struct JS_DATA_TYPE))\r
-# endif\r
-# endif\r
-#endif\r
-\r
#define JS_TRUE 1\r
#define JS_FALSE 0\r
\r
CFDictionaryGetValue ( axis, CFSTR(kIOHIDElementCookieKey) ),\r
kCFNumberLongType, &cookie);\r
\r
- axisCookies[index] = (IOHIDElementCookie) cookie;\r
+ joy->pJoystick.axisCookies[index] = (IOHIDElementCookie) cookie;\r
\r
CFNumberGetValue ((CFNumberRef)\r
CFDictionaryGetValue ( axis, CFSTR(kIOHIDElementMinKey) ),\r
CFDictionaryGetValue ( button, CFSTR(kIOHIDElementCookieKey) ),\r
kCFNumberLongType, &cookie);\r
\r
- joy->buttonCookies[num_buttons++] = (IOHIDElementCookie) cookie;\r
+ joy->pJoystick.buttonCookies[num_buttons++] = (IOHIDElementCookie) cookie;\r
/* anything else for buttons? */\r
}\r
\r
for ( i = 0; i < joy->num_buttons; i++ )\r
{\r
UInt32 state;\r
- int err = ISpElement_GetSimpleState ( isp_elem [ i + isp_num_axis ], &state);\r
+ int err = ISpElement_GetSimpleState ( joy->pJoystick.isp_elem [ i + ISP_NUM_AXIS ], &state);\r
ISP_CHECK_ERR(err)\r
\r
*buttons |= state << i;\r
for ( i = 0; i < joy->num_axes; i++ )\r
{\r
UInt32 state;\r
- int err = ISpElement_GetSimpleState ( isp_elem [ i ], &state );\r
+ int err = ISpElement_GetSimpleState ( joy->pJoystick.isp_elem [ i ], &state );\r
ISP_CHECK_ERR(err)\r
\r
axes [i] = (float) state;\r
joy->error = GL_TRUE;\r
\r
/* initialize the needs structure */\r
- ISpNeed temp_isp_needs[ isp_num_needs ] =\r
+ ISpNeed temp_isp_needs[ ISP_NUM_NEEDS ] =\r
{\r
{ "\pX-Axis", 128, 0, 0, kISpElementKind_Axis, kISpElementLabel_None, 0, 0, 0, 0 },\r
{ "\pY-Axis", 128, 0, 0, kISpElementKind_Axis, kISpElementLabel_None, 0, 0, 0, 0 },\r
{ "\pButton 31", 128, 0, 0, kISpElementKind_Button, kISpElementLabel_Btn_Select, 0, 0, 0, 0 },\r
};\r
\r
- memcpy( joy->isp_needs, temp_isp_needs, sizeof (temp_isp_needs ) );\r
+ memcpy( joy->pJoystick.isp_needs, temp_isp_needs, sizeof (temp_isp_needs ) );\r
\r
\r
/* next two calls allow keyboard and mouse to emulate other input\r
ISP_CHECK_ERR(err)\r
*/\r
\r
- err = ISpElement_NewVirtualFromNeeds( joy->isp_num_needs,\r
- joy->isp_needs, joy->isp_elem,\r
+ err = ISpElement_NewVirtualFromNeeds( ISP_NUM_NEEDS,\r
+ joy->pJoystick.isp_needs, joy->pJoystick.isp_elem,\r
0 );\r
ISP_CHECK_ERR( err )\r
\r
- err = ISpInit( joy->isp_num_needs, joy->isp_needs, joy->isp_elem,\r
+ err = ISpInit( ISP_NUM_NEEDS, joy->pJoystick.isp_needs, joy->pJoystick.isp_elem,\r
'freeglut', nil, 0, 128, 0 );\r
ISP_CHECK_ERR( err )\r
\r
- joy->num_buttons = joy->isp_num_needs - joy->isp_num_axis;\r
- joy->num_axes = joy->isp_num_axis;\r
+ joy->num_buttons = ISP_NUM_NEEDS - ISP_NUM_AXIS;\r
+ joy->num_axes = ISP_NUM_AXIS;\r
\r
for( i = 0; i < joy->num_axes; i++ )\r
{\r
void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )\r
{\r
fgJoystick[ ident ]->id = ident;\r
- snprintf( fgJoystick[ ident ]->fname, sizeof(fgJoystick[ ident ]->fname), "/dev/js%d", ident ); /* FIXME */\r
+ snprintf( fgJoystick[ ident ]->pJoystick.fname, sizeof(fgJoystick[ ident ]->pJoystick.fname), "/dev/js%d", ident ); /* FIXME */\r
fgJoystick[ ident ]->error = GL_FALSE;\r
}\r
\r
for ( i = 0; i < joy->num_buttons; i++ )\r
{\r
IOHIDEventStruct hidEvent;\r
- (*(joy->hidDev))->getElementValue ( joy->hidDev, buttonCookies[i], &hidEvent );\r
+ (*(joy->pJoystick.hidDev))->getElementValue ( joy->pJoystick.hidDev, joy->pJoystick.buttonCookies[i], &hidEvent );\r
if ( hidEvent.value )\r
*buttons |= 1 << i;\r
}\r
for ( i = 0; i < joy->num_axes; i++ )\r
{\r
IOHIDEventStruct hidEvent;\r
- (*(joy->hidDev))->getElementValue ( joy->hidDev, axisCookies[i], &hidEvent );\r
+ (*(joy->pJoystick.hidDev))->getElementValue ( joy->pJoystick.hidDev, joy->pJoystick.axisCookies[i], &hidEvent );\r
axes[i] = hidEvent.value;\r
}\r
}\r
pluginResult = ( *plugin )->QueryInterface(\r
plugin,\r
CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID),\r
- &( LPVOID )joy->hidDev\r
+ &( LPVOID )joy->pJoystick.hidDev\r
);\r
\r
if( pluginResult != S_OK )\r
fgWarning ( "QI-ing IO plugin to HID Device interface failed" );\r
\r
( *plugin )->Release( plugin ); /* don't leak a ref */\r
- if( joy->hidDev == NULL )\r
+ if( joy->pJoystick.hidDev == NULL )\r
return;\r
\r
/* store the interface in this instance */\r
- rv = ( *( joy->hidDev ) )->open( joy->hidDev, 0 );\r
+ rv = ( *( joy->pJoystick.hidDev ) )->open( joy->pJoystick.hidDev, 0 );\r
if( rv != kIOReturnSuccess )\r
{\r
fgWarning( "error opening device interface");\r
\r
void fgPlatformJoystickClose ( int ident )\r
{\r
- ( *( fgJoystick[ ident ]->hidDev ) )->\r
- close( fgJoystick[ ident ]->hidDev );\r
+ ( *( fgJoystick[ ident ]->pJoystick.hidDev ) )->\r
+ close( fgJoystick[ ident ]->pJoystick.hidDev );\r
}\r
#endif\r
\r
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)\r
int len;\r
\r
- if ( joy->os->is_analog )\r
+ if ( joy->pJoystick.os->is_analog )\r
{\r
- int status = read ( joy->os->fd, &joy->os->ajs, sizeof(joy->os->ajs) );\r
- if ( status != sizeof(joy->os->ajs) ) {\r
- perror ( joy->os->fname );\r
+ int status = read ( joy->pJoystick.os->fd, &joy->pJoystick.os->ajs, sizeof(joy->pJoystick.os->ajs) );\r
+ if ( status != sizeof(joy->pJoystick.os->ajs) ) {\r
+ perror ( joy->pJoystick.os->fname );\r
joy->error = GL_TRUE;\r
return;\r
}\r
if ( buttons != NULL )\r
- *buttons = ( joy->os->ajs.b1 ? 1 : 0 ) | ( joy->os->ajs.b2 ? 2 : 0 );\r
+ *buttons = ( joy->pJoystick.os->ajs.b1 ? 1 : 0 ) | ( joy->pJoystick.os->ajs.b2 ? 2 : 0 );\r
\r
if ( axes != NULL )\r
{\r
- axes[0] = (float) joy->os->ajs.x;\r
- axes[1] = (float) joy->os->ajs.y;\r
+ axes[0] = (float) joy->pJoystick.os->ajs.x;\r
+ axes[1] = (float) joy->pJoystick.os->ajs.y;\r
}\r
\r
return;\r
}\r
\r
# ifdef HAVE_USB_JS\r
- while ( ( len = read ( joy->os->fd, joy->os->hid_data_buf, joy->os->hid_dlen ) ) == joy->os->hid_dlen )\r
+ while ( ( len = read ( joy->pJoystick.os->fd, joy->pJoystick.os->hid_data_buf, joy->pJoystick.os->hid_dlen ) ) == joy->pJoystick.os->hid_dlen )\r
{\r
struct hid_item *h;\r
\r
- for ( h = joy->os->hids; h; h = h->next )\r
+ for ( h = joy->pJoystick.os->hids; h; h = h->next )\r
{\r
- int d = hid_get_data ( joy->os->hid_data_buf, h );\r
+ int d = hid_get_data ( joy->pJoystick.os->hid_data_buf, h );\r
\r
int page = HID_PAGE ( h->usage );\r
int usage = HID_USAGE ( h->usage );\r
{\r
int i;\r
for ( i = 0; i < joy->num_axes; i++ )\r
- if (joy->os->axes_usage[i] == usage)\r
+ if (joy->pJoystick.os->axes_usage[i] == usage)\r
{\r
if (usage == HUG_HAT_SWITCH)\r
{\r
if (d < 0 || d > 8)\r
d = 0; /* safety */\r
- joy->os->cache_axes[i] = (float)hatmap_x[d];\r
- joy->os->cache_axes[i + 1] = (float)hatmap_y[d];\r
+ joy->pJoystick.os->cache_axes[i] = (float)hatmap_x[d];\r
+ joy->pJoystick.os->cache_axes[i + 1] = (float)hatmap_y[d];\r
}\r
else\r
{\r
- joy->os->cache_axes[i] = (float)d;\r
+ joy->pJoystick.os->cache_axes[i] = (float)d;\r
}\r
break;\r
}\r
if (usage > 0 && usage < _JS_MAX_BUTTONS + 1)\r
{\r
if (d)\r
- joy->os->cache_buttons |= (1 << ( usage - 1 ));\r
+ joy->pJoystick.os->cache_buttons |= (1 << ( usage - 1 ));\r
else\r
- joy->os->cache_buttons &= ~(1 << ( usage - 1 ));\r
+ joy->pJoystick.os->cache_buttons &= ~(1 << ( usage - 1 ));\r
}\r
}\r
}\r
if ( len < 0 )\r
# endif\r
{\r
- perror( joy->os->fname );\r
+ perror( joy->pJoystick.os->fname );\r
joy->error = 1;\r
}\r
- if ( buttons != NULL ) *buttons = joy->os->cache_buttons;\r
+ if ( buttons != NULL ) *buttons = joy->pJoystick.os->cache_buttons;\r
if ( axes != NULL )\r
- memcpy ( axes, joy->os->cache_axes, sizeof(float) * joy->num_axes );\r
+ memcpy ( axes, joy->pJoystick.os->cache_axes, sizeof(float) * joy->num_axes );\r
# endif\r
#endif\r
\r
\r
while ( 1 )\r
{\r
- status = read ( joy->fd, &joy->js, sizeof(struct js_event) );\r
+ status = read ( joy->pJoystick.fd, &joy->pJoystick.js, sizeof(struct js_event) );\r
\r
if ( status != sizeof( struct js_event ) )\r
{\r
{\r
/* Use the old values */\r
if ( buttons )\r
- *buttons = joy->tmp_buttons;\r
+ *buttons = joy->pJoystick.tmp_buttons;\r
if ( axes )\r
- memcpy( axes, joy->tmp_axes,\r
+ memcpy( axes, joy->pJoystick.tmp_axes,\r
sizeof( float ) * joy->num_axes );\r
return;\r
}\r
# endif\r
\r
- fgWarning ( "%s", joy->fname );\r
+ fgWarning ( "%s", joy->pJoystick.fname );\r
joy->error = GL_TRUE;\r
return;\r
}\r
\r
- switch ( joy->js.type & ~JS_EVENT_INIT )\r
+ switch ( joy->pJoystick.js.type & ~JS_EVENT_INIT )\r
{\r
case JS_EVENT_BUTTON:\r
- if( joy->js.value == 0 ) /* clear the flag */\r
- joy->tmp_buttons &= ~( 1 << joy->js.number );\r
+ if( joy->pJoystick.js.value == 0 ) /* clear the flag */\r
+ joy->pJoystick.tmp_buttons &= ~( 1 << joy->pJoystick.js.number );\r
else\r
- joy->tmp_buttons |= ( 1 << joy->js.number );\r
+ joy->pJoystick.tmp_buttons |= ( 1 << joy->pJoystick.js.number );\r
break;\r
\r
case JS_EVENT_AXIS:\r
- if ( joy->js.number < joy->num_axes )\r
+ if ( joy->pJoystick.js.number < joy->num_axes )\r
{\r
- joy->tmp_axes[ joy->js.number ] = ( float )joy->js.value;\r
+ joy->pJoystick.tmp_axes[ joy->pJoystick.js.number ] = ( float )joy->pJoystick.js.value;\r
\r
if( axes )\r
- memcpy( axes, joy->tmp_axes, sizeof(float) * joy->num_axes );\r
+ memcpy( axes, joy->pJoystick.tmp_axes, sizeof(float) * joy->num_axes );\r
}\r
break;\r
\r
\r
/* use the old values */\r
\r
- if ( buttons != NULL ) *buttons = joy->tmp_buttons;\r
+ if ( buttons != NULL ) *buttons = joy->pJoystick.tmp_buttons;\r
if ( axes != NULL )\r
- memcpy ( axes, joy->tmp_axes, sizeof(float) * joy->num_axes );\r
+ memcpy ( axes, joy->pJoystick.tmp_axes, sizeof(float) * joy->num_axes );\r
\r
return;\r
}\r
\r
if( buttons )\r
- *buttons = joy->tmp_buttons;\r
+ *buttons = joy->pJoystick.tmp_buttons;\r
}\r
#else\r
\r
- status = read( joy->fd, &joy->js, JS_RETURN );\r
+ status = read( joy->pJoystick.fd, &joy->pJoystick.js, JS_RETURN );\r
\r
if ( status != JS_RETURN )\r
{\r
- fgWarning( "%s", joy->fname );\r
+ fgWarning( "%s", joy->pJoystick.fname );\r
joy->error = GL_TRUE;\r
return;\r
}\r
\r
if ( buttons )\r
# if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )\r
- *buttons = ( joy->js.b1 ? 1 : 0 ) | ( joy->js.b2 ? 2 : 0 ); /* XXX Should not be here -- BSD is handled earlier */\r
+ *buttons = ( joy->pJoystick.js.b1 ? 1 : 0 ) | ( joy->pJoystick.js.b2 ? 2 : 0 ); /* XXX Should not be here -- BSD is handled earlier */\r
# else\r
- *buttons = joy->js.buttons;\r
+ *buttons = joy->pJoystick.js.buttons;\r
# endif\r
\r
if ( axes )\r
{\r
- axes[ 0 ] = (float) joy->js.x;\r
- axes[ 1 ] = (float) joy->js.y;\r
+ axes[ 0 ] = (float) joy->pJoystick.js.x;\r
+ axes[ 1 ] = (float) joy->pJoystick.js.y;\r
}\r
#endif\r
}\r
\r
#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )\r
for( i = 0; i < _JS_MAX_AXES; i++ )\r
- joy->os->cache_axes[ i ] = 0.0f;\r
+ joy->pJoystick.os->cache_axes[ i ] = 0.0f;\r
\r
- joy->os->cache_buttons = 0;\r
+ joy->pJoystick.os->cache_buttons = 0;\r
\r
- joy->os->fd = open( joy->os->fname, O_RDONLY | O_NONBLOCK);\r
+ joy->pJoystick.os->fd = open( joy->pJoystick.os->fname, O_RDONLY | O_NONBLOCK);\r
\r
#ifdef HAVE_ERRNO_H\r
- if( joy->os->fd < 0 && errno == EACCES )\r
- fgWarning ( "%s exists but is not readable by you", joy->os->fname );\r
+ if( joy->pJoystick.os->fd < 0 && errno == EACCES )\r
+ fgWarning ( "%s exists but is not readable by you", joy->pJoystick.os->fname );\r
#endif\r
\r
- joy->error =( joy->os->fd < 0 );\r
+ joy->error =( joy->pJoystick.os->fd < 0 );\r
\r
if( joy->error )\r
return;\r
\r
joy->num_axes = 0;\r
joy->num_buttons = 0;\r
- if( joy->os->is_analog )\r
+ if( joy->pJoystick.os->is_analog )\r
{\r
FILE *joyfile;\r
char joyfname[ 1024 ];\r
}\r
\r
# ifdef HAVE_USB_JS\r
- if( ! fghJoystickInitializeHID( joy->os, &joy->num_axes,\r
+ if( ! fghJoystickInitializeHID( joy->pJoystick.os, &joy->num_axes,\r
&joy->num_buttons ) )\r
{\r
- close( joy->os->fd );\r
+ close( joy->pJoystick.os->fd );\r
joy->error = GL_TRUE;\r
return;\r
}\r
\r
- cp = strrchr( joy->os->fname, '/' );\r
+ cp = strrchr( joy->pJoystick.os->fname, '/' );\r
if( cp )\r
{\r
if( fghJoystickFindUSBdev( &cp[1], joy->name, sizeof( joy->name ) ) ==\r
* to be quite unreliable for analog-to-USB converters. Punt for\r
* now.\r
*/\r
- if( joy->os->axes_usage[ i ] == HUG_HAT_SWITCH )\r
+ if( joy->pJoystick.os->axes_usage[ i ] == HUG_HAT_SWITCH )\r
{\r
joy->max [ i ] = 1.0f;\r
joy->center[ i ] = 0.0f;\r
\r
# ifdef JS_NEW\r
for( i = 0; i < _JS_MAX_AXES; i++ )\r
- joy->tmp_axes[ i ] = 0.0f;\r
+ joy->pJoystick.tmp_axes[ i ] = 0.0f;\r
\r
- joy->tmp_buttons = 0;\r
+ joy->pJoystick.tmp_buttons = 0;\r
# endif\r
\r
- joy->fd = open( joy->fname, O_RDONLY );\r
+ joy->pJoystick.fd = open( joy->pJoystick.fname, O_RDONLY );\r
\r
- joy->error =( joy->fd < 0 );\r
+ joy->error =( joy->pJoystick.fd < 0 );\r
\r
if( joy->error )\r
return;\r
* to the upper byte of an uninitialized word doesn't work.\r
* 9 April 2003\r
*/\r
- ioctl( joy->fd, JSIOCGAXES, &u );\r
+ ioctl( joy->pJoystick.fd, JSIOCGAXES, &u );\r
joy->num_axes = u;\r
- ioctl( joy->fd, JSIOCGBUTTONS, &u );\r
+ ioctl( joy->pJoystick.fd, JSIOCGBUTTONS, &u );\r
joy->num_buttons = u;\r
- ioctl( joy->fd, JSIOCGNAME( sizeof( joy->name ) ), joy->name );\r
- fcntl( joy->fd, F_SETFL, O_NONBLOCK );\r
+ ioctl( joy->pJoystick.fd, JSIOCGNAME( sizeof( joy->name ) ), joy->name );\r
+ fcntl( joy->pJoystick.fd, F_SETFL, O_NONBLOCK );\r
# endif\r
\r
/*\r
fgJoystick[ ident ]->id = ident;\r
fgJoystick[ ident ]->error = GL_FALSE;\r
\r
- fgJoystick[ ident ]->os = calloc( 1, sizeof( struct os_specific_s ) );\r
- memset( fgJoystick[ ident ]->os, 0, sizeof( struct os_specific_s ) );\r
+ fgJoystick[ ident ]->pJoystick.os = calloc( 1, sizeof( struct os_specific_s ) );\r
+ memset( fgJoystick[ ident ]->pJoystick.os, 0, sizeof( struct os_specific_s ) );\r
if( ident < USB_IDENT_OFFSET )\r
- fgJoystick[ ident ]->os->is_analog = 1;\r
- if( fgJoystick[ ident ]->os->is_analog )\r
- snprintf( fgJoystick[ ident ]->os->fname, sizeof(fgJoystick[ ident ]->os->fname), "%s%d", AJSDEV, ident );\r
+ fgJoystick[ ident ]->pJoystick.os->is_analog = 1;\r
+ if( fgJoystick[ ident ]->pJoystick.os->is_analog )\r
+ snprintf( fgJoystick[ ident ]->pJoystick.os->fname, sizeof(fgJoystick[ ident ]->pJoystick.os->fname), "%s%d", AJSDEV, ident );\r
else\r
- snprintf( fgJoystick[ ident ]->os->fname, sizeof(fgJoystick[ ident ]->os->fname), "%s%d", UHIDDEV,\r
+ snprintf( fgJoystick[ ident ]->pJoystick.os->fname, sizeof(fgJoystick[ ident ]->pJoystick.os->fname), "%s%d", UHIDDEV,\r
ident - USB_IDENT_OFFSET );\r
#elif defined( __linux__ )\r
fgJoystick[ ident ]->id = ident;\r
fgJoystick[ ident ]->error = GL_FALSE;\r
\r
- snprintf( fgJoystick[ident]->fname, sizeof(fgJoystick[ident]->fname), "/dev/input/js%d", ident );\r
+ snprintf( fgJoystick[ident]->pJoystick.fname, sizeof(fgJoystick[ident]->pJoystick.fname), "/dev/input/js%d", ident );\r
\r
- if( access( fgJoystick[ ident ]->fname, F_OK ) != 0 )\r
- snprintf( fgJoystick[ ident ]->fname, sizeof(fgJoystick[ ident ]->fname), "/dev/js%d", ident );\r
+ if( access( fgJoystick[ ident ]->pJoystick.fname, F_OK ) != 0 )\r
+ snprintf( fgJoystick[ ident ]->pJoystick.fname, sizeof(fgJoystick[ ident ]->pJoystick.fname), "/dev/js%d", ident );\r
#endif\r
}\r
\r
void fgPlatformJoystickClose ( int ident )\r
{\r
#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )\r
- if( fgJoystick[ident]->os )\r
+ if( fgJoystick[ident]->pJoystick.os )\r
{\r
if( ! fgJoystick[ ident ]->error )\r
- close( fgJoystick[ ident ]->os->fd );\r
+ close( fgJoystick[ ident ]->pJoystick.os->fd );\r
#ifdef HAVE_USB_JS\r
- if( fgJoystick[ ident ]->os->hids )\r
- free (fgJoystick[ ident ]->os->hids);\r
- if( fgJoystick[ ident ]->os->hid_data_buf )\r
- free( fgJoystick[ ident ]->os->hid_data_buf );\r
+ if( fgJoystick[ ident ]->pJoystick.os->hids )\r
+ free (fgJoystick[ ident ]->pJoystick.os->hids);\r
+ if( fgJoystick[ ident ]->pJoystick.os->hid_data_buf )\r
+ free( fgJoystick[ ident ]->pJoystick.os->hid_data_buf );\r
#endif\r
- free( fgJoystick[ident]->os );\r
+ free( fgJoystick[ident]->pJoystick.os );\r
}\r
#endif\r
\r
if( ! fgJoystick[ident]->error )\r
- close( fgJoystick[ ident ]->fd );\r
+ close( fgJoystick[ ident ]->pJoystick.fd );\r
}\r
#endif\r
\r
projects / freeglut / blobdiff