+//
+// Jaguar joystick handler
+//
+
#ifndef __JOYSTICK_H__
#define __JOYSTICK_H__
#include "types.h"
-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);
+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 JoystickExec(void);
+extern bool keyBuffer[];
+extern uint8 joypad_0_buttons[];
+extern uint8 joypad_1_buttons[];
#endif