Allowing compilation of Windows version by removing DLL decorations from deprecated...

[freeglut] / src / freeglut_input_devices.c

diff --git a/src/freeglut_input_devices.c b/src/freeglut_input_devices.c
index a53a81b..493bcd8 100755 (executable)
--- a/src/freeglut_input_devices.c
+++ b/src/freeglut_input_devices.c
@@ -68,32 +68,32 @@ typedef struct {
 
 #define DIAL_NUM_VALUATORS 8
 
-       /* dial parser state machine states */
-#define DIAL_NEW               -1
+/* dial parser state machine states */
+#define DIAL_NEW                (-1)
 #define DIAL_WHICH_DEVICE       0
 #define DIAL_VALUE_HIGH         1
 #define DIAL_VALUE_LOW          2
 
-       /* dial/button box commands */
+/* dial/button box commands */
 #define DIAL_INITIALIZE                 0x20
 #define DIAL_SET_LEDS                   0x75
 #define DIAL_SET_TEXT                   0x61
 #define DIAL_SET_AUTO_DIALS             0x50
 #define DIAL_SET_AUTO_DELTA_DIALS       0x51
-#define DIAL_SET_FILTER                        0x53
+#define DIAL_SET_FILTER                 0x53
 #define DIAL_SET_BUTTONS_MOM_TYPE       0x71
 #define DIAL_SET_AUTO_MOM_BUTTONS       0x73
-#define DIAL_SET_ALL_LEDS              0x4b
-#define DIAL_CLEAR_ALL_LEDS            0x4c
+#define DIAL_SET_ALL_LEDS               0x4b
+#define DIAL_CLEAR_ALL_LEDS             0x4c
 
-       /* dial/button box replies and events */
+/* dial/button box replies and events */
 #define DIAL_INITIALIZED        0x20
 #define DIAL_BASE               0x30
 #define DIAL_DELTA_BASE         0x40
 #define DIAL_PRESS_BASE         0xc0
 #define DIAL_RELEASE_BASE       0xe0
 
-       /* macros to determine reply type */
+/* macros to determine reply type */
 #define IS_DIAL_EVENT(ch)       (((ch)>=DIAL_BASE)&&((ch)<DIAL_BASE+DIAL_NUM_VALUATORS))
 #define IS_KEY_PRESS(ch)        (((ch)>=DIAL_PRESS_BASE)&&((ch)<DIAL_PRESS_BASE+DIAL_NUM_BUTTONS))
 #define IS_KEY_RELEASE(ch)      (((ch)>=DIAL_RELEASE_BASE)&&((ch)<DIAL_RELEASE_BASE+DIAL_NUM_BUTTONS))
@@ -147,7 +147,7 @@ void fgInitialiseInputDevices ( void )
             DWORD type = REG_SZ;
             HKEY key;
             if (RegOpenKeyA(HKEY_LOCAL_MACHINE,"SOFTWARE\\FreeGLUT",&key)==ERROR_SUCCESS) {
-                if (RegQueryValueExA(key,"DialboxSerialPort",NULL,&type,devname,&size)==ERROR_SUCCESS){
+                if (RegQueryValueExA(key,"DialboxSerialPort",NULL,&type,(LPBYTE)devname,&size)==ERROR_SUCCESS){
                     dial_device=devname;
                 }
                 RegCloseKey(key);
@@ -213,8 +213,8 @@ static void poll_dials ( int id )
         {
             switch ( dial_state )
             {
-               case DIAL_WHICH_DEVICE:
-                   dial_which = data - DIAL_BASE;
+            case DIAL_WHICH_DEVICE:
+                dial_which = data - DIAL_BASE;
                 dial_state++;
                 break;
             case DIAL_VALUE_HIGH:
@@ -271,7 +271,6 @@ static SERIALPORT *serial_open ( const char *device )
     tcgetattr(fd,&port->termio_save);
 
     memset(&termio, 0, sizeof(termio));
-    cfmakeraw(&termio);
     termio.c_cflag = CS8 | CREAD | HUPCL ;
     termio.c_iflag = IGNPAR | IGNBRK ;
     termio.c_cc[VTIME]    = 0;   /* inter-character timer */