X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjoystick.h;h=09e2378ce55c040bf2143f58bd7ec5f8bf747ddf;hb=25646c0a48be1832e20fd4fcdd2d40ba2174bfa3;hp=8a370879c4c33ba95ee02cb475ef66e97a5f610b;hpb=2ae315f25e623cc8279d3c9012a3a166d86684c2;p=virtualjaguar

diff --git a/src/joystick.h b/src/joystick.h
index 8a37087..09e2378 100644
--- a/src/joystick.h
+++ b/src/joystick.h
@@ -1,15 +1,49 @@
+//
+// Jaguar joystick handler
+//
+
 #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_t, uint8_t);
+void JoystickWriteWord(uint32_t, uint16_t);
+//uint8_t JoystickReadByte(uint32_t);
+uint16_t JoystickReadWord(uint32_t);
+void JoystickExec(void);
+
+extern uint8_t joypad0Buttons[];
+extern uint8_t joypad1Buttons[];
+extern bool audioEnabled;
+extern bool joysticksEnabled;
 
-void joystick_init(void);
-void joystick_reset(void);
-void joystick_done(void);
-void joystick_byte_write(uint32, uint8);
-void joystick_word_write(uint32, uint16);
-uint8 joystick_byte_read(uint32);
-uint16 joystick_word_read(uint32);
-void joystick_exec(void);
+#endif	// __JOYSTICK_H__
 
-#endif