Update for latest mintlib, and remove duplicated defines SDL-1.2
authorPatrice Mandin
Fri, 26 Aug 2011 19:56:08 +0200
branchSDL-1.2
changeset 5651abba6814a65c
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
     1.1 --- a/src/audio/mint/SDL_mintaudio.h	Fri Aug 26 14:37:39 2011 +0200
     1.2 +++ b/src/audio/mint/SDL_mintaudio.h	Fri Aug 26 19:56:08 2011 +0200
     1.3 @@ -83,42 +83,6 @@
     1.4  #define MASTERPREDIV_FALCON	256
     1.5  #define MASTERPREDIV_MILAN	256
     1.6  
     1.7 -/* MFP 68901 interrupt sources */
     1.8 -#ifndef MFP_PARALLEL
     1.9 -enum {
    1.10 -	MFP_PARALLEL=0,
    1.11 -	MFP_DCD,
    1.12 -	MFP_CTS,
    1.13 -	MFP_BITBLT,
    1.14 -	MFP_TIMERD,
    1.15 -	MFP_BAUDRATE=MFP_TIMERD,
    1.16 -	MFP_TIMERC,
    1.17 -	MFP_200HZ=MFP_TIMERC,
    1.18 -	MFP_ACIA,
    1.19 -	MFP_DISK,
    1.20 -	MFP_TIMERB,
    1.21 -	MFP_HBLANK=MFP_TIMERB,
    1.22 -	MFP_TERR,
    1.23 -	MFP_TBE,
    1.24 -	MFP_RERR,
    1.25 -	MFP_RBF,
    1.26 -	MFP_TIMERA,
    1.27 -	MFP_DMASOUND=MFP_TIMERA,
    1.28 -	MFP_RING,
    1.29 -	MFP_MONODETECT
    1.30 -};
    1.31 -#endif
    1.32 -
    1.33 -/* Xbtimer() timers */
    1.34 -#ifndef XB_TIMERA
    1.35 -enum {
    1.36 -	XB_TIMERA=0,
    1.37 -	XB_TIMERB,
    1.38 -	XB_TIMERC,
    1.39 -	XB_TIMERD
    1.40 -};
    1.41 -#endif
    1.42 -
    1.43  /* Variables */
    1.44  extern SDL_AudioDevice *SDL_MintAudio_device;
    1.45  extern Uint8 *SDL_MintAudio_audiobuf[2];	/* Pointers to buffers */
     2.1 --- a/src/video/ataricommon/SDL_atarievents.c	Fri Aug 26 14:37:39 2011 +0200
     2.2 +++ b/src/video/ataricommon/SDL_atarievents.c	Fri Aug 26 19:56:08 2011 +0200
     2.3 @@ -30,7 +30,6 @@
     2.4   */
     2.5  
     2.6  #include <mint/cookie.h>
     2.7 -#include <mint/ostruct.h>
     2.8  #include <mint/osbind.h>
     2.9  
    2.10  #include "../../events/SDL_sysevents.h"
    2.11 @@ -51,10 +50,6 @@
    2.12  	MCH_ARANYM
    2.13  };
    2.14  
    2.15 -#ifndef KT_NOCHANGE
    2.16 -# define KT_NOCHANGE -1
    2.17 -#endif
    2.18 -
    2.19  /* The translation tables from a console scancode to a SDL keysym */
    2.20  static SDLKey keymap[ATARIBIOS_MAXKEYS];
    2.21  static unsigned char *keytab_normal;
     3.1 --- a/src/video/ataricommon/SDL_atarievents_c.h	Fri Aug 26 14:37:39 2011 +0200
     3.2 +++ b/src/video/ataricommon/SDL_atarievents_c.h	Fri Aug 26 19:56:08 2011 +0200
     3.3 @@ -37,19 +37,6 @@
     3.4  
     3.5  #define ATARIBIOS_MAXKEYS 128
     3.6  
     3.7 -/* Special keys state */
     3.8 -#ifndef K_RSHIFT
     3.9 -enum {
    3.10 -	K_RSHIFT=0,
    3.11 -	K_LSHIFT,
    3.12 -	K_CTRL,
    3.13 -	K_ALT,
    3.14 -	K_CAPSLOCK,
    3.15 -	K_CLRHOME,
    3.16 -	K_INSERT
    3.17 -};
    3.18 -#endif
    3.19 -
    3.20  extern void (*Atari_ShutdownEvents)(void);
    3.21  
    3.22  extern void Atari_InitOSKeymap(_THIS);
     4.1 --- a/src/video/ataricommon/SDL_atarimxalloc_c.h	Fri Aug 26 14:37:39 2011 +0200
     4.2 +++ b/src/video/ataricommon/SDL_atarimxalloc_c.h	Fri Aug 26 19:56:08 2011 +0200
     4.3 @@ -30,16 +30,6 @@
     4.4  #ifndef _SDL_ATARI_MXALLOC_H_
     4.5  #define _SDL_ATARI_MXALLOC_H_
     4.6  
     4.7 -/*--- Defines ---*/
     4.8 -
     4.9 -/* Mxalloc parameters */
    4.10 -#ifndef MX_STRAM
    4.11 -#define MX_STRAM 0
    4.12 -#define MX_TTRAM 1
    4.13 -#define MX_PREFSTRAM 2
    4.14 -#define MX_PREFTTRAM 3
    4.15 -#endif
    4.16 -
    4.17  /*--- Functions ---*/
    4.18  
    4.19  extern void *Atari_SysMalloc(Uint32 size, Uint16 alloc_type);
     5.1 --- a/src/video/ataricommon/SDL_gemdosevents.c	Fri Aug 26 14:37:39 2011 +0200
     5.2 +++ b/src/video/ataricommon/SDL_gemdosevents.c	Fri Aug 26 19:56:08 2011 +0200
     5.3 @@ -45,13 +45,6 @@
     5.4  static unsigned char gemdos_previouskeyboard[ATARIBIOS_MAXKEYS];
     5.5  static SDL_bool use_dev_mouse = SDL_FALSE;
     5.6  
     5.7 -#ifndef DEV_BUSY
     5.8 -enum {
     5.9 -	DEV_BUSY=0,
    5.10 -	DEV_READY
    5.11 -};
    5.12 -#endif
    5.13 -
    5.14  static void UpdateSpecialKeys(int special_keys_state);
    5.15  
    5.16  void AtariGemdos_InitOSKeymap(_THIS)
     6.1 --- a/src/video/xbios/SDL_xbios.h	Fri Aug 26 14:37:39 2011 +0200
     6.2 +++ b/src/video/xbios/SDL_xbios.h	Fri Aug 26 19:56:08 2011 +0200
     6.3 @@ -86,16 +86,6 @@
     6.4  /* EgetShift masks */
     6.5  #define ES_MODE		0x0700
     6.6  
     6.7 -/* TT shifter modes */
     6.8 -#ifndef ST_LOW
     6.9 -#define ST_LOW	0x0000
    6.10 -#define ST_MED	0x0100
    6.11 -#define ST_HIGH	0x0200
    6.12 -#define TT_LOW	0x0700
    6.13 -#define TT_MED	0x0300
    6.14 -#define TT_HIGH	0x0600
    6.15 -#endif
    6.16 -
    6.17  /* Hidden structure -> variables names */
    6.18  #define SDL_nummodes		(this->hidden->SDL_nummodes)
    6.19  #define SDL_modelist		(this->hidden->SDL_modelist)
     7.1 --- a/src/video/xbios/SDL_xbios_milan.c	Fri Aug 26 14:37:39 2011 +0200
     7.2 +++ b/src/video/xbios/SDL_xbios_milan.c	Fri Aug 26 19:56:08 2011 +0200
     7.3 @@ -33,11 +33,6 @@
     7.4  #include "SDL_xbios.h"
     7.5  #include "SDL_xbios_milan.h"
     7.6  
     7.7 -#ifndef Validmode
     7.8 -#define Validmode(mode)	\
     7.9 -	(short)trap_14_ww((short)0x5f,(short)(mode))
    7.10 -#endif
    7.11 -
    7.12  #define NUM_PREDEFINED_MODES 7
    7.13  
    7.14  typedef struct {
     8.1 --- a/src/video/xbios/SDL_xbios_tveille.h	Fri Aug 26 14:37:39 2011 +0200
     8.2 +++ b/src/video/xbios/SDL_xbios_tveille.h	Fri Aug 26 19:56:08 2011 +0200
     8.3 @@ -32,12 +32,6 @@
     8.4  
     8.5  #include "SDL_xbios.h"
     8.6  
     8.7 -/*--- Defines ---*/
     8.8 -
     8.9 -#ifndef C_VeiL
    8.10 -#define C_VeiL 0x5665694CL
    8.11 -#endif
    8.12 -
    8.13  /*--- Structures ---*/
    8.14  
    8.15  typedef struct {