From ed88808a7b6ac3f65c0592cdc6d8728a8035cb0f Mon Sep 17 00:00:00 2001
From: Patrice Mandin <patmandin@gmail.com>
Date: Thu, 5 May 2005 10:52:22 +0000
Subject: [PATCH] Add support for ARAnyM Atari emulator

---
 src/joystick/mint/SDL_sysjoystick.c     | 9 ++++++---
 src/video/ataricommon/SDL_atarievents.c | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/joystick/mint/SDL_sysjoystick.c b/src/joystick/mint/SDL_sysjoystick.c
index 9edd2e13c..8e6909b32 100644
--- a/src/joystick/mint/SDL_sysjoystick.c
+++ b/src/joystick/mint/SDL_sysjoystick.c
@@ -83,7 +83,8 @@ enum {
 	MCH_ST=0,
 	MCH_STE,
 	MCH_TT,
-	MCH_F30
+	MCH_F30,
+	MCH_ARANYM
 };
 
 /*	Joypad buttons
@@ -182,7 +183,8 @@ int SDL_SYS_JoystickInit(void)
 
 	/* Enable some default joysticks */
 	if ((cookie_mch == MCH_ST<<16) || ((cookie_mch>>16) == MCH_STE) ||
-		(cookie_mch == MCH_TT<<16) || (cookie_mch == MCH_F30<<16)) {
+		(cookie_mch == MCH_TT<<16) || (cookie_mch == MCH_F30<<16) ||
+		(cookie_mch == MCH_ARANYM<<16)) {
 		atarijoysticks[IKBD_JOY1].enabled=(SDL_AtariIkbd_enabled!=0);
 	}
 	if ((cookie_mch == MCH_STE<<16) || (cookie_mch == MCH_F30<<16)) {
@@ -197,7 +199,8 @@ int SDL_SYS_JoystickInit(void)
 	if (envr) {
 		/* IKBD on any Atari, maybe clones */
 		if ((cookie_mch == MCH_ST<<16) || ((cookie_mch>>16) == MCH_STE) ||
-			(cookie_mch == MCH_TT<<16) || (cookie_mch == MCH_F30<<16)) {
+			(cookie_mch == MCH_TT<<16) || (cookie_mch == MCH_F30<<16) ||
+			(cookie_mch == MCH_ARANYM<<16)) {
 			if (SDL_AtariIkbd_enabled!=0) {
 				TEST_JOY_ENABLED(envr, "ikbd-joy1", IKBD_JOY1);
 			}
diff --git a/src/video/ataricommon/SDL_atarievents.c b/src/video/ataricommon/SDL_atarievents.c
index 724f9f094..9cb941552 100644
--- a/src/video/ataricommon/SDL_atarievents.c
+++ b/src/video/ataricommon/SDL_atarievents.c
@@ -51,7 +51,8 @@ enum {
 	MCH_ST=0,
 	MCH_STE,
 	MCH_TT,
-	MCH_F30
+	MCH_F30,
+	MCH_ARANYM
 };
 
 void (*Atari_ShutdownEvents)(void);
@@ -73,6 +74,7 @@ static void Atari_InitializeEvents(_THIS)
 		case MCH_STE:
 		case MCH_TT:
 		case MCH_F30:
+		case MCH_ARANYM:
 			this->InitOSKeymap=AtariIkbd_InitOSKeymap;
 			this->PumpEvents=AtariIkbd_PumpEvents;
 			Atari_ShutdownEvents=AtariIkbd_ShutdownEvents;