changeset 1054:e89d7f826b4a

Add support for ARAnyM Atari emulator
author Patrice Mandin <patmandin@gmail.com>
date Thu, 05 May 2005 10:52:22 +0000
parents f596fa4f17a6
children 7eeb3324d37d
files src/joystick/mint/SDL_sysjoystick.c src/video/ataricommon/SDL_atarievents.c
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/joystick/mint/SDL_sysjoystick.c	Wed Apr 20 05:57:39 2005 +0000
+++ b/src/joystick/mint/SDL_sysjoystick.c	Thu May 05 10:52:22 2005 +0000
@@ -83,7 +83,8 @@
 	MCH_ST=0,
 	MCH_STE,
 	MCH_TT,
-	MCH_F30
+	MCH_F30,
+	MCH_ARANYM
 };
 
 /*	Joypad buttons
@@ -182,7 +183,8 @@
 
 	/* 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 @@
 	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);
 			}
--- a/src/video/ataricommon/SDL_atarievents.c	Wed Apr 20 05:57:39 2005 +0000
+++ b/src/video/ataricommon/SDL_atarievents.c	Thu May 05 10:52:22 2005 +0000
@@ -51,7 +51,8 @@
 	MCH_ST=0,
 	MCH_STE,
 	MCH_TT,
-	MCH_F30
+	MCH_F30,
+	MCH_ARANYM
 };
 
 void (*Atari_ShutdownEvents)(void);
@@ -73,6 +74,7 @@
 		case MCH_STE:
 		case MCH_TT:
 		case MCH_F30:
+		case MCH_ARANYM:
 			this->InitOSKeymap=AtariIkbd_InitOSKeymap;
 			this->PumpEvents=AtariIkbd_PumpEvents;
 			Atari_ShutdownEvents=AtariIkbd_ShutdownEvents;