X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjoystick.h;h=09e2378ce55c040bf2143f58bd7ec5f8bf747ddf;hb=f005034d4a3990efc8e445ce46222ce32600411b;hp=98eb9775eaa2eed9ae53817d706fe718313da6ea;hpb=5da604521611a960140b58a2fb0f236c65610b70;p=virtualjaguar

diff --git a/src/joystick.h b/src/joystick.h
index 98eb977..09e2378 100644
--- a/src/joystick.h
+++ b/src/joystick.h
@@ -5,7 +5,7 @@
 #ifndef __JOYSTICK_H__
 #define __JOYSTICK_H__
 
-#include "types.h"
+#include <stdint.h>
 
 enum { BUTTON_FIRST = 0, BUTTON_U = 0,
 BUTTON_D = 1,
@@ -34,13 +34,16 @@ BUTTON_PAUSE = 20, BUTTON_LAST = 20 };
 void JoystickInit(void);
 void JoystickReset(void);
 void JoystickDone(void);
-void JoystickWriteByte(uint32, uint8);
-void JoystickWriteWord(uint32, uint16);
-uint8 JoystickReadByte(uint32);
-uint16 JoystickReadWord(uint32);
+//void JoystickWriteByte(uint32_t, uint8_t);
+void JoystickWriteWord(uint32_t, uint16_t);
+//uint8_t JoystickReadByte(uint32_t);
+uint16_t JoystickReadWord(uint32_t);
 void JoystickExec(void);
 
-extern bool keyBuffer[];
-extern uint8 joypad_0_buttons[];
-extern uint8 joypad_1_buttons[];
-#endif
+extern uint8_t joypad0Buttons[];
+extern uint8_t joypad1Buttons[];
+extern bool audioEnabled;
+extern bool joysticksEnabled;
+
+#endif	// __JOYSTICK_H__
+