projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleaning up mixed tabs and spaces
[freeglut]
/
src
/
fg_input_devices.c
diff --git
a/src/fg_input_devices.c
b/src/fg_input_devices.c
index
8cac504
..
c89076f
100644
(file)
--- a/
src/fg_input_devices.c
+++ b/
src/fg_input_devices.c
@@
-1,5
+1,5
@@
/*
/*
- * freeglut_input_devices.c
+ * fg_input_devices.c
*
* Handles miscellaneous input devices via direct serial-port access.
* Proper X11 XInput device support is not yet supported.
*
* Handles miscellaneous input devices via direct serial-port access.
* Proper X11 XInput device support is not yet supported.
@@
-28,10
+28,6
@@
* DEALINGS IN THE SOFTWARE.
*/
* DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <GL/freeglut.h>
#include "fg_internal.h"
#include <GL/freeglut.h>
#include "fg_internal.h"
@@
-115,7
+111,7
@@
void fgInitialiseInputDevices ( void )
{
const char *dial_device=NULL;
dial_device = getenv ( "GLUT_DIALS_SERIAL" );
{
const char *dial_device=NULL;
dial_device = getenv ( "GLUT_DIALS_SERIAL" );
- fgPlatformRegisterDialDevice ( dial_device );
+ fgPlatformRegisterDialDevice ( dial_device );
if ( !dial_device ) return;
if ( !( dialbox_port = serial_open ( dial_device ) ) ) return;
if ( !dial_device ) return;
if ( !( dialbox_port = serial_open ( dial_device ) ) ) return;
@@
-166,7
+162,6
@@
static void poll_dials ( int id )
static int dial_state = DIAL_NEW;
static int dial_which;
static int dial_value;
static int dial_state = DIAL_NEW;
static int dial_which;
static int dial_value;
- static int dials[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
if ( !dialbox_port ) return;
if ( !dialbox_port ) return;
@@
-187,7
+182,6
@@
static void poll_dials ( int id )
case DIAL_VALUE_LOW:
dial_value |= data;
if ( dial_value & 0x8000 ) dial_value -= 0x10000;
case DIAL_VALUE_LOW:
dial_value |= data;
if ( dial_value & 0x8000 ) dial_value -= 0x10000;
- dials[dial_which] = dial_value;
send_dial_event ( dial_which + 1, dial_value * 360 / 256 );
dial_state = DIAL_WHICH_DEVICE;
break;
send_dial_event ( dial_which + 1, dial_value * 360 / 256 );
dial_state = DIAL_WHICH_DEVICE;
break;