X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjoystick.h;h=09e2378ce55c040bf2143f58bd7ec5f8bf747ddf;hb=48dd9ba5b6742935eef61cec80964afe093139ad;hp=e98dcdbc795b6f5af08d2c06a17ab664269529b7;hpb=f0e50fb1d23805881b72d51ea603be78b645ec97;p=virtualjaguar

diff --git a/src/joystick.h b/src/joystick.h
index e98dcdb..09e2378 100644
--- a/src/joystick.h
+++ b/src/joystick.h
@@ -5,17 +5,45 @@
 #ifndef __JOYSTICK_H__
 #define __JOYSTICK_H__
 
-#include "types.h"
+#include <stdint.h>
+
+enum { BUTTON_FIRST = 0, BUTTON_U = 0,
+BUTTON_D = 1,
+BUTTON_L = 2,
+BUTTON_R = 3,
+
+BUTTON_s = 4,
+BUTTON_7 = 5,
+BUTTON_4 = 6,
+BUTTON_1 = 7,
+BUTTON_0 = 8,
+BUTTON_8 = 9,
+BUTTON_5 = 10,
+BUTTON_2 = 11,
+BUTTON_d = 12,
+BUTTON_9 = 13,
+BUTTON_6 = 14,
+BUTTON_3 = 15,
+
+BUTTON_A = 16,
+BUTTON_B = 17,
+BUTTON_C = 18,
+BUTTON_OPTION = 19,
+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_t joypad0Buttons[];
+extern uint8_t joypad1Buttons[];
+extern bool audioEnabled;
+extern bool joysticksEnabled;
+
+#endif	// __JOYSTICK_H__
 
-#endif