Update for latest mintlib, and remove duplicated defines SDL-1.2
authorPatrice Mandin <patmandin@gmail.com>
Fri, 26 Aug 2011 19:56:08 +0200
branchSDL-1.2
changeset 5651 abba6814a65c
parent 5649 02ab15cfa992
child 5652 16ad54affe84
Update for latest mintlib, and remove duplicated defines
src/audio/mint/SDL_mintaudio.h
src/video/ataricommon/SDL_atarievents.c
src/video/ataricommon/SDL_atarievents_c.h
src/video/ataricommon/SDL_atarimxalloc_c.h
src/video/ataricommon/SDL_gemdosevents.c
src/video/xbios/SDL_xbios.h
src/video/xbios/SDL_xbios_milan.c
src/video/xbios/SDL_xbios_tveille.h
--- a/src/audio/mint/SDL_mintaudio.h	Fri Aug 26 14:37:39 2011 +0200
+++ b/src/audio/mint/SDL_mintaudio.h	Fri Aug 26 19:56:08 2011 +0200
@@ -83,42 +83,6 @@
 #define MASTERPREDIV_FALCON	256
 #define MASTERPREDIV_MILAN	256
 
-/* MFP 68901 interrupt sources */
-#ifndef MFP_PARALLEL
-enum {
-	MFP_PARALLEL=0,
-	MFP_DCD,
-	MFP_CTS,
-	MFP_BITBLT,
-	MFP_TIMERD,
-	MFP_BAUDRATE=MFP_TIMERD,
-	MFP_TIMERC,
-	MFP_200HZ=MFP_TIMERC,
-	MFP_ACIA,
-	MFP_DISK,
-	MFP_TIMERB,
-	MFP_HBLANK=MFP_TIMERB,
-	MFP_TERR,
-	MFP_TBE,
-	MFP_RERR,
-	MFP_RBF,
-	MFP_TIMERA,
-	MFP_DMASOUND=MFP_TIMERA,
-	MFP_RING,
-	MFP_MONODETECT
-};
-#endif
-
-/* Xbtimer() timers */
-#ifndef XB_TIMERA
-enum {
-	XB_TIMERA=0,
-	XB_TIMERB,
-	XB_TIMERC,
-	XB_TIMERD
-};
-#endif
-
 /* Variables */
 extern SDL_AudioDevice *SDL_MintAudio_device;
 extern Uint8 *SDL_MintAudio_audiobuf[2];	/* Pointers to buffers */
--- a/src/video/ataricommon/SDL_atarievents.c	Fri Aug 26 14:37:39 2011 +0200
+++ b/src/video/ataricommon/SDL_atarievents.c	Fri Aug 26 19:56:08 2011 +0200
@@ -30,7 +30,6 @@
  */
 
 #include <mint/cookie.h>
-#include <mint/ostruct.h>
 #include <mint/osbind.h>
 
 #include "../../events/SDL_sysevents.h"
@@ -51,10 +50,6 @@
 	MCH_ARANYM
 };
 
-#ifndef KT_NOCHANGE
-# define KT_NOCHANGE -1
-#endif
-
 /* The translation tables from a console scancode to a SDL keysym */
 static SDLKey keymap[ATARIBIOS_MAXKEYS];
 static unsigned char *keytab_normal;
--- a/src/video/ataricommon/SDL_atarievents_c.h	Fri Aug 26 14:37:39 2011 +0200
+++ b/src/video/ataricommon/SDL_atarievents_c.h	Fri Aug 26 19:56:08 2011 +0200
@@ -37,19 +37,6 @@
 
 #define ATARIBIOS_MAXKEYS 128
 
-/* Special keys state */
-#ifndef K_RSHIFT
-enum {
-	K_RSHIFT=0,
-	K_LSHIFT,
-	K_CTRL,
-	K_ALT,
-	K_CAPSLOCK,
-	K_CLRHOME,
-	K_INSERT
-};
-#endif
-
 extern void (*Atari_ShutdownEvents)(void);
 
 extern void Atari_InitOSKeymap(_THIS);
--- a/src/video/ataricommon/SDL_atarimxalloc_c.h	Fri Aug 26 14:37:39 2011 +0200
+++ b/src/video/ataricommon/SDL_atarimxalloc_c.h	Fri Aug 26 19:56:08 2011 +0200
@@ -30,16 +30,6 @@
 #ifndef _SDL_ATARI_MXALLOC_H_
 #define _SDL_ATARI_MXALLOC_H_
 
-/*--- Defines ---*/
-
-/* Mxalloc parameters */
-#ifndef MX_STRAM
-#define MX_STRAM 0
-#define MX_TTRAM 1
-#define MX_PREFSTRAM 2
-#define MX_PREFTTRAM 3
-#endif
-
 /*--- Functions ---*/
 
 extern void *Atari_SysMalloc(Uint32 size, Uint16 alloc_type);
--- a/src/video/ataricommon/SDL_gemdosevents.c	Fri Aug 26 14:37:39 2011 +0200
+++ b/src/video/ataricommon/SDL_gemdosevents.c	Fri Aug 26 19:56:08 2011 +0200
@@ -45,13 +45,6 @@
 static unsigned char gemdos_previouskeyboard[ATARIBIOS_MAXKEYS];
 static SDL_bool use_dev_mouse = SDL_FALSE;
 
-#ifndef DEV_BUSY
-enum {
-	DEV_BUSY=0,
-	DEV_READY
-};
-#endif
-
 static void UpdateSpecialKeys(int special_keys_state);
 
 void AtariGemdos_InitOSKeymap(_THIS)
--- a/src/video/xbios/SDL_xbios.h	Fri Aug 26 14:37:39 2011 +0200
+++ b/src/video/xbios/SDL_xbios.h	Fri Aug 26 19:56:08 2011 +0200
@@ -86,16 +86,6 @@
 /* EgetShift masks */
 #define ES_MODE		0x0700
 
-/* TT shifter modes */
-#ifndef ST_LOW
-#define ST_LOW	0x0000
-#define ST_MED	0x0100
-#define ST_HIGH	0x0200
-#define TT_LOW	0x0700
-#define TT_MED	0x0300
-#define TT_HIGH	0x0600
-#endif
-
 /* Hidden structure -> variables names */
 #define SDL_nummodes		(this->hidden->SDL_nummodes)
 #define SDL_modelist		(this->hidden->SDL_modelist)
--- a/src/video/xbios/SDL_xbios_milan.c	Fri Aug 26 14:37:39 2011 +0200
+++ b/src/video/xbios/SDL_xbios_milan.c	Fri Aug 26 19:56:08 2011 +0200
@@ -33,11 +33,6 @@
 #include "SDL_xbios.h"
 #include "SDL_xbios_milan.h"
 
-#ifndef Validmode
-#define Validmode(mode)	\
-	(short)trap_14_ww((short)0x5f,(short)(mode))
-#endif
-
 #define NUM_PREDEFINED_MODES 7
 
 typedef struct {
--- a/src/video/xbios/SDL_xbios_tveille.h	Fri Aug 26 14:37:39 2011 +0200
+++ b/src/video/xbios/SDL_xbios_tveille.h	Fri Aug 26 19:56:08 2011 +0200
@@ -32,12 +32,6 @@
 
 #include "SDL_xbios.h"
 
-/*--- Defines ---*/
-
-#ifndef C_VeiL
-#define C_VeiL 0x5665694CL
-#endif
-
 /*--- Structures ---*/
 
 typedef struct {