projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding header files to the "freeglut" projects per e-mail from Paul Martz dated 1...
[freeglut]
/
src
/
freeglut_joystick.c
diff --git
a/src/freeglut_joystick.c
b/src/freeglut_joystick.c
index
8260340
..
f48dc3f
100644
(file)
--- a/
src/freeglut_joystick.c
+++ b/
src/freeglut_joystick.c
@@
-33,7
+33,7
@@
#include <GL/freeglut.h>
#include "freeglut_internal.h"
#include <GL/freeglut.h>
#include "freeglut_internal.h"
-#if HAVE_SYS_PARAM_H
+#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
# include <sys/param.h>
#endif
@@
-69,18
+69,21
@@
#if TARGET_HOST_POSIX_X11
# define _JS_MAX_AXES 16
#if TARGET_HOST_POSIX_X11
# define _JS_MAX_AXES 16
-# if HAVE_SYS_IOCTL_H
+# ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
# endif
# include <sys/ioctl.h>
# endif
-# if HAVE_FCNTL_H
+# ifdef HAVE_FCNTL_H
# include <fcntl.h>
# endif
# include <fcntl.h>
# endif
-# include <errno.h>
-# if defined(__FreeBSD__) || defined(__NetBSD__)
+# ifdef HAVE_ERRNO_H
+# include <errno.h>
+# include <string.h>
+# endif
+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
/* XXX The below hack is done until freeglut's autoconf is updated. */
# define HAVE_USB_JS 1
/* XXX The below hack is done until freeglut's autoconf is updated. */
# define HAVE_USB_JS 1
-# if defined(__FreeBSD__)
+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# include <sys/joystick.h>
# else
/*
# include <sys/joystick.h>
# else
/*
@@
-131,7
+134,7
@@
/* BSD defines from "jsBSD.cxx" around lines 42-270 */
/* BSD defines from "jsBSD.cxx" around lines 42-270 */
-#if defined(__NetBSD__) || defined(__FreeBSD__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# ifdef HAVE_USB_JS
# if defined(__NetBSD__)
# ifdef HAVE_USB_JS
# if defined(__NetBSD__)
@@
-142,16
+145,14
@@
# else
# include <usb.h>
# endif
# else
# include <usb.h>
# endif
-# elif defined(__FreeBSD__)
-# if __FreeBSD_version < 500000
-# include <libusbhid.h>
-# else
-/* XXX The below hack is done until freeglut's autoconf is updated. */
-# define HAVE_USBHID_H 1
+# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+# ifdef HAVE_USBHID_H
# include <usbhid.h>
# include <usbhid.h>
+# else
+# include <libusbhid.h>
# endif
# endif
# endif
# endif
-# include <dev/usb/usb.h>
+# include <legacy/dev/usb/usb.h>
# include <dev/usb/usbhid.h>
/* Compatibility with older usb.h revisions */
# include <dev/usb/usbhid.h>
/* Compatibility with older usb.h revisions */
@@
-237,12
+238,15
@@
static int fghJoystickFindUSBdev(char *name, char *out, int outlen)
close(f);
if (cp)
return 1;
close(f);
if (cp)
return 1;
- } else if (errno == EACCES) {
+ }
+#ifdef HAVE_ERRNO_H
+ else if (errno == EACCES) {
if (!protection_warned) {
fgWarning ( "Can't open %s for read!", buf );
protection_warned = 1;
}
}
if (!protection_warned) {
fgWarning ( "Can't open %s for read!", buf );
protection_warned = 1;
}
}
+#endif
}
return 0;
}
}
return 0;
}
@@
-260,7
+264,11
@@
static int fghJoystickInitializeHID(struct os_specific_s *os,
if ( ( rd = hid_get_report_desc( os->fd ) ) == 0 )
{
if ( ( rd = hid_get_report_desc( os->fd ) ) == 0 )
{
+#ifdef HAVE_ERRNO_H
fgWarning ( "error: %s: %s", os->fname, strerror( errno ) );
fgWarning ( "error: %s: %s", os->fname, strerror( errno ) );
+#else
+ fgWarning ( "error: %s", os->fname );
+#endif
return FALSE;
}
return FALSE;
}
@@
-270,7
+278,11
@@
static int fghJoystickInitializeHID(struct os_specific_s *os,
if( ioctl( os->fd, USB_GET_REPORT_ID, &report_id ) < 0)
{
/*** XXX {report_id} may not be the right variable? ***/
if( ioctl( os->fd, USB_GET_REPORT_ID, &report_id ) < 0)
{
/*** XXX {report_id} may not be the right variable? ***/
+#ifdef HAVE_ERRNO_H
fgWarning ( "error: %s%d: %s", UHIDDEV, report_id, strerror( errno ) );
fgWarning ( "error: %s%d: %s", UHIDDEV, report_id, strerror( errno ) );
+#else
+ fgWarning ( "error: %s%d", UHIDDEV, report_id );
+#endif
return FALSE;
}
return FALSE;
}
@@
-393,7
+405,7
@@
struct tagSFG_Joystick
#if TARGET_HOST_POSIX_X11
#if TARGET_HOST_POSIX_X11
-# if defined(__FreeBSD__) || defined(__NetBSD__)
+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
struct os_specific_s *os;
# endif
struct os_specific_s *os;
# endif
@@
-461,7
+473,7
@@
static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
int status;
#endif
int status;
#endif
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
int len;
#endif
int len;
#endif
@@
-598,7
+610,7
@@
static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
#endif
#if TARGET_HOST_POSIX_X11
#endif
#if TARGET_HOST_POSIX_X11
-# if defined(__FreeBSD__) || defined(__NetBSD__)
+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
if ( joy->os->is_analog )
{
int status = read ( joy->os->fd, &joy->os->ajs, sizeof(joy->os->ajs) );
if ( joy->os->is_analog )
{
int status = read ( joy->os->fd, &joy->os->ajs, sizeof(joy->os->ajs) );
@@
-663,7
+675,11
@@
static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
}
}
}
}
}
}
+#ifdef HAVE_ERRNO_H
if ( len < 0 && errno != EAGAIN )
if ( len < 0 && errno != EAGAIN )
+#else
+ if ( len < 0 )
+#endif
{
perror( joy->os->fname );
joy->error = 1;
{
perror( joy->os->fname );
joy->error = 1;
@@
-682,6
+698,7
@@
static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
if ( status != sizeof( struct js_event ) )
{
if ( status != sizeof( struct js_event ) )
{
+#ifdef HAVE_ERRNO_H
if ( errno == EAGAIN )
{
/* Use the old values */
if ( errno == EAGAIN )
{
/* Use the old values */
@@
-692,6
+709,7
@@
static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
sizeof( float ) * joy->num_axes );
return;
}
sizeof( float ) * joy->num_axes );
return;
}
+#endif
fgWarning ( "%s", joy->fname );
joy->error = GL_TRUE;
fgWarning ( "%s", joy->fname );
joy->error = GL_TRUE;
@@
-744,7
+762,7
@@
static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
}
if ( buttons )
}
if ( buttons )
-# if defined( __FreeBSD__ ) || defined( __NetBSD__ )
+# if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
*buttons = ( joy->js.b1 ? 1 : 0 ) | ( joy->js.b2 ? 2 : 0 ); /* XXX Should not be here -- BSD is handled earlier */
# else
*buttons = joy->js.buttons;
*buttons = ( joy->js.b1 ? 1 : 0 ) | ( joy->js.b2 ? 2 : 0 ); /* XXX Should not be here -- BSD is handled earlier */
# else
*buttons = joy->js.buttons;
@@
-1054,7
+1072,7
@@
static void fghJoystickOpen( SFG_Joystick* joy )
CFTypeRef topLevelElement;
#endif
#if TARGET_HOST_POSIX_X11
CFTypeRef topLevelElement;
#endif
#if TARGET_HOST_POSIX_X11
-# if defined( __FreeBSD__ ) || defined( __NetBSD__ )
+# if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
char *cp;
# endif
# ifdef JS_NEW
char *cp;
# endif
# ifdef JS_NEW
@@
-1290,7
+1308,7
@@
static void fghJoystickOpen( SFG_Joystick* joy )
#endif
#if TARGET_HOST_POSIX_X11
#endif
#if TARGET_HOST_POSIX_X11
-#if defined( __FreeBSD__ ) || defined( __NetBSD__ )
+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
for( i = 0; i < _JS_MAX_AXES; i++ )
joy->os->cache_axes[ i ] = 0.0f;
for( i = 0; i < _JS_MAX_AXES; i++ )
joy->os->cache_axes[ i ] = 0.0f;
@@
-1298,8
+1316,10
@@
static void fghJoystickOpen( SFG_Joystick* joy )
joy->os->fd = open( joy->os->fname, O_RDONLY | O_NONBLOCK);
joy->os->fd = open( joy->os->fname, O_RDONLY | O_NONBLOCK);
+#ifdef HAVE_ERRNO_H
if( joy->os->fd < 0 && errno == EACCES )
fgWarning ( "%s exists but is not readable by you", joy->os->fname );
if( joy->os->fd < 0 && errno == EACCES )
fgWarning ( "%s exists but is not readable by you", joy->os->fname );
+#endif
joy->error =( joy->os->fd < 0 );
joy->error =( joy->os->fd < 0 );
@@
-1325,7
+1345,7
@@
static void fghJoystickOpen( SFG_Joystick* joy )
if( joy->error )
return;
if( joy->error )
return;
- snprintf( joyfname, sizeof(buffer), "%s/.joy%drc", getenv( "HOME" ), joy->id );
+ snprintf( joyfname, sizeof(joyfname), "%s/.joy%drc", getenv( "HOME" ), joy->id );
joyfile = fopen( joyfname, "r" );
joy->error =( joyfile == NULL );
joyfile = fopen( joyfname, "r" );
joy->error =( joyfile == NULL );
@@
-1554,7
+1574,7
@@
static void fghJoystickInit( int ident )
#endif
#if TARGET_HOST_POSIX_X11
#endif
#if TARGET_HOST_POSIX_X11
-# if defined( __FreeBSD__ ) || defined( __NetBSD__ )
+# if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
fgJoystick[ ident ]->id = ident;
fgJoystick[ ident ]->error = GL_FALSE;
fgJoystick[ ident ]->id = ident;
fgJoystick[ ident ]->error = GL_FALSE;
@@
-1623,7
+1643,7
@@
void fgJoystickClose( void )
#endif
#if TARGET_HOST_POSIX_X11
#endif
#if TARGET_HOST_POSIX_X11
-#if defined( __FreeBSD__ ) || defined( __NetBSD__ )
+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
if( fgJoystick[ident]->os )
{
if( ! fgJoystick[ ident ]->error )
if( fgJoystick[ident]->os )
{
if( ! fgJoystick[ ident ]->error )