1.1 --- a/include/SDL_compat.h Sun Sep 24 15:56:36 2006 +0000
1.2 +++ b/include/SDL_compat.h Sun Sep 24 15:56:55 2006 +0000
1.3 @@ -147,7 +147,8 @@
1.4 surface);
1.5 extern DECLSPEC void SDLCALL SDL_WM_SetCaption(const char *title,
1.6 const char *icon);
1.7 -extern DECLSPEC void SDLCALL SDL_WM_GetCaption(const char **title, const char **icon);
1.8 +extern DECLSPEC void SDLCALL SDL_WM_GetCaption(const char **title,
1.9 + const char **icon);
1.10 extern DECLSPEC void SDLCALL SDL_WM_SetIcon(SDL_Surface * icon, Uint8 * mask);
1.11 extern DECLSPEC int SDLCALL SDL_WM_IconifyWindow(void);
1.12 extern DECLSPEC int SDLCALL SDL_WM_ToggleFullScreen(SDL_Surface * surface);
2.1 --- a/src/audio/alsa/SDL_alsa_audio.c Sun Sep 24 15:56:36 2006 +0000
2.2 +++ b/src/audio/alsa/SDL_alsa_audio.c Sun Sep 24 15:56:55 2006 +0000
2.3 @@ -523,7 +523,7 @@
2.4 status = -1;
2.5 for (test_format = SDL_FirstAudioFormat(spec->format);
2.6 test_format && (status < 0);) {
2.7 - status = 0; /* if we can't support a format, it'll become -1. */
2.8 + status = 0; /* if we can't support a format, it'll become -1. */
2.9 switch (test_format) {
2.10 case AUDIO_U8:
2.11 format = SND_PCM_FORMAT_U8;
3.1 --- a/src/audio/amigaos/SDL_ahiaudio.c Sun Sep 24 15:56:36 2006 +0000
3.2 +++ b/src/audio/amigaos/SDL_ahiaudio.c Sun Sep 24 15:56:55 2006 +0000
3.3 @@ -235,50 +235,50 @@
3.4 while ((!valid_datatype) && (test_format)) {
3.5 valid_datatype = 1;
3.6 switch (test_format) {
3.7 - case AUDIO_S8:
3.8 - D(bug("AUDIO_S8...\n"));
3.9 - spec->format = AUDIO_S8;
3.10 - this->hidden->bytespersample = 1;
3.11 - if (spec->channels < 2)
3.12 - this->hidden->type = AHIST_M8S;
3.13 - else
3.14 - this->hidden->type = AHIST_S8S;
3.15 - break;
3.16 + case AUDIO_S8:
3.17 + D(bug("AUDIO_S8...\n"));
3.18 + spec->format = AUDIO_S8;
3.19 + this->hidden->bytespersample = 1;
3.20 + if (spec->channels < 2)
3.21 + this->hidden->type = AHIST_M8S;
3.22 + else
3.23 + this->hidden->type = AHIST_S8S;
3.24 + break;
3.25
3.26 - case AUDIO_S16MSB:
3.27 - D(bug("AUDIO_S16MSB...\n"));
3.28 - spec->format = AUDIO_S16MSB;
3.29 - this->hidden->bytespersample = 2;
3.30 - if (spec->channels < 2)
3.31 - this->hidden->type = AHIST_M16S;
3.32 - else
3.33 - this->hidden->type = AHIST_S16S;
3.34 - break;
3.35 + case AUDIO_S16MSB:
3.36 + D(bug("AUDIO_S16MSB...\n"));
3.37 + spec->format = AUDIO_S16MSB;
3.38 + this->hidden->bytespersample = 2;
3.39 + if (spec->channels < 2)
3.40 + this->hidden->type = AHIST_M16S;
3.41 + else
3.42 + this->hidden->type = AHIST_S16S;
3.43 + break;
3.44
3.45 - case AUDIO_S32MSB:
3.46 - D(bug("AUDIO_S32MSB...\n"));
3.47 - spec->format = AUDIO_S32MSB;
3.48 - this->hidden->bytespersample = 4;
3.49 - if (spec->channels < 2)
3.50 - this->hidden->type = AHIST_M32S;
3.51 - else
3.52 - this->hidden->type = AHIST_S32S;
3.53 - break;
3.54 + case AUDIO_S32MSB:
3.55 + D(bug("AUDIO_S32MSB...\n"));
3.56 + spec->format = AUDIO_S32MSB;
3.57 + this->hidden->bytespersample = 4;
3.58 + if (spec->channels < 2)
3.59 + this->hidden->type = AHIST_M32S;
3.60 + else
3.61 + this->hidden->type = AHIST_S32S;
3.62 + break;
3.63
3.64 - default:
3.65 - valid_datatype = 0;
3.66 - test_format = SDL_NextAudioFormat();
3.67 - break;
3.68 + default:
3.69 + valid_datatype = 0;
3.70 + test_format = SDL_NextAudioFormat();
3.71 + break;
3.72 }
3.73 }
3.74
3.75 - if (!valid_datatype) { /* shouldn't happen, but just in case... */
3.76 + if (!valid_datatype) { /* shouldn't happen, but just in case... */
3.77 SDL_SetError("Unsupported audio format");
3.78 return (-1);
3.79 }
3.80
3.81 if (spec->channels > 2) {
3.82 - spec->channels = 2; /* will convert at higher level. */
3.83 + spec->channels = 2; /* will convert at higher level. */
3.84 }
3.85
3.86 D(bug("Before CalculateAudioSpec\n"));
4.1 --- a/src/audio/baudio/SDL_beaudio.cc Sun Sep 24 15:56:36 2006 +0000
4.2 +++ b/src/audio/baudio/SDL_beaudio.cc Sun Sep 24 15:56:55 2006 +0000
4.3 @@ -160,7 +160,7 @@
4.4 SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
4.5
4.6 /* Parse the audio format and fill the Be raw audio format */
4.7 - memset(&format, '\0', sizeof (media_raw_audio_format));
4.8 + memset(&format, '\0', sizeof(media_raw_audio_format));
4.9 format.byte_order = B_MEDIA_LITTLE_ENDIAN;
4.10 format.frame_rate = (float) spec->freq;
4.11 format.channel_count = spec->channels; /* !!! FIXME: support > 2? */
4.12 @@ -168,51 +168,51 @@
4.13 valid_datatype = 1;
4.14 spec->format = test_format;
4.15 switch (test_format) {
4.16 - case AUDIO_S8:
4.17 - format.format = media_raw_audio_format::B_AUDIO_CHAR;
4.18 - break;
4.19 + case AUDIO_S8:
4.20 + format.format = media_raw_audio_format::B_AUDIO_CHAR;
4.21 + break;
4.22
4.23 - case AUDIO_U8:
4.24 - format.format = media_raw_audio_format::B_AUDIO_UCHAR;
4.25 - break;
4.26 + case AUDIO_U8:
4.27 + format.format = media_raw_audio_format::B_AUDIO_UCHAR;
4.28 + break;
4.29
4.30 - case AUDIO_S16LSB:
4.31 - format.format = media_raw_audio_format::B_AUDIO_SHORT;
4.32 - break;
4.33 + case AUDIO_S16LSB:
4.34 + format.format = media_raw_audio_format::B_AUDIO_SHORT;
4.35 + break;
4.36
4.37 - case AUDIO_S16MSB:
4.38 - format.format = media_raw_audio_format::B_AUDIO_SHORT;
4.39 - format.byte_order = B_MEDIA_BIG_ENDIAN;
4.40 - break;
4.41 + case AUDIO_S16MSB:
4.42 + format.format = media_raw_audio_format::B_AUDIO_SHORT;
4.43 + format.byte_order = B_MEDIA_BIG_ENDIAN;
4.44 + break;
4.45
4.46 - case AUDIO_S32LSB:
4.47 - format.format = media_raw_audio_format::B_AUDIO_INT;
4.48 - break;
4.49 + case AUDIO_S32LSB:
4.50 + format.format = media_raw_audio_format::B_AUDIO_INT;
4.51 + break;
4.52
4.53 - case AUDIO_S32MSB:
4.54 - format.format = media_raw_audio_format::B_AUDIO_INT;
4.55 - format.byte_order = B_MEDIA_BIG_ENDIAN;
4.56 - break;
4.57 + case AUDIO_S32MSB:
4.58 + format.format = media_raw_audio_format::B_AUDIO_INT;
4.59 + format.byte_order = B_MEDIA_BIG_ENDIAN;
4.60 + break;
4.61
4.62 - case AUDIO_F32LSB:
4.63 - format.format = media_raw_audio_format::B_AUDIO_FLOAT;
4.64 - break;
4.65 + case AUDIO_F32LSB:
4.66 + format.format = media_raw_audio_format::B_AUDIO_FLOAT;
4.67 + break;
4.68
4.69 - case AUDIO_F32MSB:
4.70 - format.format = media_raw_audio_format::B_AUDIO_FLOAT;
4.71 - format.byte_order = B_MEDIA_BIG_ENDIAN;
4.72 - break;
4.73 + case AUDIO_F32MSB:
4.74 + format.format = media_raw_audio_format::B_AUDIO_FLOAT;
4.75 + format.byte_order = B_MEDIA_BIG_ENDIAN;
4.76 + break;
4.77
4.78 - default:
4.79 - valid_datatype = 0;
4.80 - test_format = SDL_NextAudioFormat();
4.81 - break;
4.82 + default:
4.83 + valid_datatype = 0;
4.84 + test_format = SDL_NextAudioFormat();
4.85 + break;
4.86 }
4.87 }
4.88
4.89 format.buffer_size = spec->samples;
4.90
4.91 - if (!valid_datatype) { /* shouldn't happen, but just in case... */
4.92 + if (!valid_datatype) { /* shouldn't happen, but just in case... */
4.93 SDL_SetError("Unsupported audio format");
4.94 return (-1);
4.95 }
5.1 --- a/src/audio/dart/SDL_dart.c Sun Sep 24 15:56:36 2006 +0000
5.2 +++ b/src/audio/dart/SDL_dart.c Sun Sep 24 15:56:55 2006 +0000
5.3 @@ -108,34 +108,34 @@
5.4
5.5 // Determine the audio parameters from the AudioSpec
5.6 if (spec->channels > 2)
5.7 - spec->channels = 2; // !!! FIXME: more than stereo support in OS/2?
5.8 + spec->channels = 2; // !!! FIXME: more than stereo support in OS/2?
5.9
5.10 while ((!valid_datatype) && (test_format)) {
5.11 spec->format = test_format;
5.12 valid_datatype = 1;
5.13 switch (test_format) {
5.14 - case AUDIO_U8:
5.15 - // Unsigned 8 bit audio data
5.16 - iSilence = 0x80;
5.17 - iBits = 8;
5.18 - break;
5.19 + case AUDIO_U8:
5.20 + // Unsigned 8 bit audio data
5.21 + iSilence = 0x80;
5.22 + iBits = 8;
5.23 + break;
5.24
5.25 - case AUDIO_S16LSB:
5.26 - // Signed 16 bit audio data
5.27 - iSilence = 0x00;
5.28 - iBits = 16;
5.29 - break;
5.30 + case AUDIO_S16LSB:
5.31 + // Signed 16 bit audio data
5.32 + iSilence = 0x00;
5.33 + iBits = 16;
5.34 + break;
5.35
5.36 // !!! FIXME: int32?
5.37
5.38 - default:
5.39 - valid_datatype = 0;
5.40 - test_format = SDL_NextAudioFormat();
5.41 - break;
5.42 + default:
5.43 + valid_datatype = 0;
5.44 + test_format = SDL_NextAudioFormat();
5.45 + break;
5.46 }
5.47 }
5.48
5.49 - if (!valid_datatype) { // shouldn't happen, but just in case...
5.50 + if (!valid_datatype) { // shouldn't happen, but just in case...
5.51 // Close DART, and exit with error code!
5.52 mciSendCommand(iDeviceOrd, MCI_CLOSE, MCI_WAIT, &GenericParms, 0);
5.53 SDL_SetError("Unsupported audio format");
6.1 --- a/src/audio/dc/SDL_dcaudio.c Sun Sep 24 15:56:36 2006 +0000
6.2 +++ b/src/audio/dc/SDL_dcaudio.c Sun Sep 24 15:56:55 2006 +0000
6.3 @@ -226,24 +226,24 @@
6.4 spec->format = test_format;
6.5 switch (test_format) {
6.6 /* only formats Dreamcast accepts... */
6.7 - case AUDIO_S8:
6.8 - case AUDIO_S16LSB:
6.9 - valid_datatype = 1;
6.10 - break;
6.11 + case AUDIO_S8:
6.12 + case AUDIO_S16LSB:
6.13 + valid_datatype = 1;
6.14 + break;
6.15
6.16 - default:
6.17 - test_format = SDL_NextAudioFormat();
6.18 - break;
6.19 + default:
6.20 + test_format = SDL_NextAudioFormat();
6.21 + break;
6.22 }
6.23 }
6.24
6.25 - if (!valid_datatype) { /* shouldn't happen, but just in case... */
6.26 + if (!valid_datatype) { /* shouldn't happen, but just in case... */
6.27 SDL_SetError("Unsupported audio format");
6.28 return (-1);
6.29 }
6.30
6.31 if (spec->channels > 2)
6.32 - spec->channels = 2; /* no more than stereo on the Dreamcast. */
6.33 + spec->channels = 2; /* no more than stereo on the Dreamcast. */
6.34
6.35 /* Update the fragment size as size in bytes */
6.36 SDL_CalculateAudioSpec(spec);
7.1 --- a/src/audio/dmedia/SDL_irixaudio.c Sun Sep 24 15:56:36 2006 +0000
7.2 +++ b/src/audio/dmedia/SDL_irixaudio.c Sun Sep 24 15:56:55 2006 +0000
7.3 @@ -176,27 +176,27 @@
7.4 spec->format = test_format;
7.5
7.6 switch (test_format) {
7.7 - case AUDIO_S8:
7.8 - width = AL_SAMPLE_8;
7.9 - fmt = AL_SAMPFMT_TWOSCOMP;
7.10 - break;
7.11 + case AUDIO_S8:
7.12 + width = AL_SAMPLE_8;
7.13 + fmt = AL_SAMPFMT_TWOSCOMP;
7.14 + break;
7.15
7.16 - case AUDIO_S16SYS:
7.17 - width = AL_SAMPLE_16;
7.18 - fmt = AL_SAMPFMT_TWOSCOMP;
7.19 - break;
7.20 + case AUDIO_S16SYS:
7.21 + width = AL_SAMPLE_16;
7.22 + fmt = AL_SAMPFMT_TWOSCOMP;
7.23 + break;
7.24
7.25 - case AUDIO_F32SYS:
7.26 - width = 0; /* not used here... */
7.27 - fmt = AL_SAMPFMT_FLOAT;
7.28 - break;
7.29 + case AUDIO_F32SYS:
7.30 + width = 0; /* not used here... */
7.31 + fmt = AL_SAMPFMT_FLOAT;
7.32 + break;
7.33
7.34 /* Docs say there is int24, but not int32.... */
7.35
7.36 - default:
7.37 - valid = 0;
7.38 - test_format = SDL_NextAudioFormat();
7.39 - break;
7.40 + default:
7.41 + valid = 0;
7.42 + test_format = SDL_NextAudioFormat();
7.43 + break;
7.44 }
7.45
7.46 if (valid) {
7.47 @@ -204,8 +204,8 @@
7.48 valid = 0;
7.49 if (audio_config) {
7.50 if (alSetChannels(audio_config, spec->channels) < 0) {
7.51 - if (spec->channels > 2) { /* can't handle > stereo? */
7.52 - spec->channels = 2; /* try again below. */
7.53 + if (spec->channels > 2) { /* can't handle > stereo? */
7.54 + spec->channels = 2; /* try again below. */
7.55 }
7.56 }
7.57
8.1 --- a/src/audio/macosx/SDL_coreaudio.c Sun Sep 24 15:56:36 2006 +0000
8.2 +++ b/src/audio/macosx/SDL_coreaudio.c Sun Sep 24 15:56:55 2006 +0000
8.3 @@ -212,7 +212,7 @@
8.4 int valid_datatype = 0;
8.5
8.6 /* Setup a AudioStreamBasicDescription with the requested format */
8.7 - memset(&strdesc, '\0', sizeof (AudioStreamBasicDescription));
8.8 + memset(&strdesc, '\0', sizeof(AudioStreamBasicDescription));
8.9 strdesc.mFormatID = kAudioFormatLinearPCM;
8.10 strdesc.mFormatFlags = kLinearPCMFormatFlagIsPacked;
8.11 strdesc.mChannelsPerFrame = spec->channels;
8.12 @@ -223,30 +223,30 @@
8.13 spec->format = test_format;
8.14 /* Just a list of valid SDL formats, so people don't pass junk here. */
8.15 switch (test_format) {
8.16 - case AUDIO_U8:
8.17 - case AUDIO_S8:
8.18 - case AUDIO_U16LSB:
8.19 - case AUDIO_S16LSB:
8.20 - case AUDIO_U16MSB:
8.21 - case AUDIO_S16MSB:
8.22 - case AUDIO_S32LSB:
8.23 - case AUDIO_S32MSB:
8.24 - case AUDIO_F32LSB:
8.25 - case AUDIO_F32MSB:
8.26 - valid_datatype = 1;
8.27 - strdesc.mBitsPerChannel = SDL_AUDIO_BITSIZE(spec->format);
8.28 - if (SDL_AUDIO_ISBIGENDIAN(spec->format))
8.29 - strdesc.mFormatFlags |= kLinearPCMFormatFlagIsBigEndian;
8.30 + case AUDIO_U8:
8.31 + case AUDIO_S8:
8.32 + case AUDIO_U16LSB:
8.33 + case AUDIO_S16LSB:
8.34 + case AUDIO_U16MSB:
8.35 + case AUDIO_S16MSB:
8.36 + case AUDIO_S32LSB:
8.37 + case AUDIO_S32MSB:
8.38 + case AUDIO_F32LSB:
8.39 + case AUDIO_F32MSB:
8.40 + valid_datatype = 1;
8.41 + strdesc.mBitsPerChannel = SDL_AUDIO_BITSIZE(spec->format);
8.42 + if (SDL_AUDIO_ISBIGENDIAN(spec->format))
8.43 + strdesc.mFormatFlags |= kLinearPCMFormatFlagIsBigEndian;
8.44
8.45 - if (SDL_AUDIO_ISFLOAT(spec->format))
8.46 - strdesc.mFormatFlags |= kLinearPCMFormatFlagIsFloat;
8.47 - else if (SDL_AUDIO_ISSIGNED(spec->format))
8.48 - strdesc.mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger;
8.49 - break;
8.50 + if (SDL_AUDIO_ISFLOAT(spec->format))
8.51 + strdesc.mFormatFlags |= kLinearPCMFormatFlagIsFloat;
8.52 + else if (SDL_AUDIO_ISSIGNED(spec->format))
8.53 + strdesc.mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger;
8.54 + break;
8.55 }
8.56 }
8.57
8.58 - if (!valid_datatype) { /* shouldn't happen, but just in case... */
8.59 + if (!valid_datatype) { /* shouldn't happen, but just in case... */
8.60 SDL_SetError("Unsupported audio format");
8.61 return (-1);
8.62 }
8.63 @@ -257,7 +257,7 @@
8.64 strdesc.mBytesPerFrame * strdesc.mFramesPerPacket;
8.65
8.66 /* Locate the default output audio unit */
8.67 - memset(&desc, '\0', sizeof (ComponentDescription));
8.68 + memset(&desc, '\0', sizeof(ComponentDescription));
8.69 desc.componentType = kAudioUnitComponentType;
8.70 desc.componentSubType = kAudioUnitSubType_Output;
8.71 desc.componentManufacturer = kAudioUnitID_DefaultOutput;
8.72 @@ -280,8 +280,7 @@
8.73 result = AudioUnitSetProperty(outputAudioUnit,
8.74 kAudioUnitProperty_StreamFormat,
8.75 kAudioUnitScope_Input,
8.76 - 0,
8.77 - &strdesc, sizeof (strdesc));
8.78 + 0, &strdesc, sizeof(strdesc));
8.79 CHECK_RESULT("AudioUnitSetProperty (kAudioUnitProperty_StreamFormat)")
8.80 /* Set the audio callback */
8.81 callback.inputProc = audioCallback;
9.1 --- a/src/audio/mint/SDL_mintaudio.c Sun Sep 24 15:56:36 2006 +0000
9.2 +++ b/src/audio/mint/SDL_mintaudio.c Sun Sep 24 15:56:55 2006 +0000
9.3 @@ -146,23 +146,24 @@
9.4 }
9.5
9.6 /* Check if FPU is present */
9.7 -void SDL_MintAudio_CheckFpu(void)
9.8 +void
9.9 +SDL_MintAudio_CheckFpu(void)
9.10 {
9.11 - unsigned long cookie_fpu;
9.12 + unsigned long cookie_fpu;
9.13
9.14 - SDL_MintAudio_hasfpu = 0;
9.15 - if (Getcookie(C__FPU, &cookie_fpu) != C_FOUND) {
9.16 - return;
9.17 - }
9.18 - switch ((cookie_fpu>>16)&0xfffe) {
9.19 - case 2:
9.20 - case 4:
9.21 - case 6:
9.22 - case 8:
9.23 - case 16:
9.24 - SDL_MintAudio_hasfpu = 1;
9.25 - break;
9.26 - }
9.27 + SDL_MintAudio_hasfpu = 0;
9.28 + if (Getcookie(C__FPU, &cookie_fpu) != C_FOUND) {
9.29 + return;
9.30 + }
9.31 + switch ((cookie_fpu >> 16) & 0xfffe) {
9.32 + case 2:
9.33 + case 4:
9.34 + case 6:
9.35 + case 8:
9.36 + case 16:
9.37 + SDL_MintAudio_hasfpu = 1;
9.38 + break;
9.39 + }
9.40 }
9.41
9.42 /* The thread function, used under MiNT with xbios */
10.1 --- a/src/audio/mint/SDL_mintaudio.h Sun Sep 24 15:56:36 2006 +0000
10.2 +++ b/src/audio/mint/SDL_mintaudio.h Sun Sep 24 15:56:55 2006 +0000
10.3 @@ -128,7 +128,7 @@
10.4 extern volatile unsigned short SDL_MintAudio_mutex;
10.5 extern cookie_stfa_t *SDL_MintAudio_stfa;
10.6 extern volatile unsigned long SDL_MintAudio_clocktics;
10.7 -extern unsigned short SDL_MintAudio_hasfpu; /* To preserve fpu registers if needed */
10.8 +extern unsigned short SDL_MintAudio_hasfpu; /* To preserve fpu registers if needed */
10.9
10.10 /* MiNT thread variables */
10.11 extern SDL_bool SDL_MintAudio_mint_present;
11.1 --- a/src/audio/mint/SDL_mintaudio_dma8.c Sun Sep 24 15:56:36 2006 +0000
11.2 +++ b/src/audio/mint/SDL_mintaudio_dma8.c Sun Sep 24 15:56:55 2006 +0000
11.3 @@ -218,7 +218,8 @@
11.4 int i, masterprediv, sfreq;
11.5 unsigned long masterclock;
11.6
11.7 - DEBUG_PRINT((DEBUG_NAME "asked: %d bits, ", SDL_AUDIO_BITSIZE(spec->format)));
11.8 + DEBUG_PRINT((DEBUG_NAME "asked: %d bits, ",
11.9 + SDL_AUDIO_BITSIZE(spec->format)));
11.10 DEBUG_PRINT(("float=%d, ", SDL_AUDIO_ISFLOAT(spec->format)));
11.11 DEBUG_PRINT(("signed=%d, ", SDL_AUDIO_ISSIGNED(spec->format)));
11.12 DEBUG_PRINT(("big endian=%d, ", SDL_AUDIO_ISBIGENDIAN(spec->format)));
11.13 @@ -226,7 +227,7 @@
11.14 DEBUG_PRINT(("freq=%d\n", spec->freq));
11.15
11.16 if (spec->channels > 2) {
11.17 - spec->channels = 2; /* no more than stereo! */
11.18 + spec->channels = 2; /* no more than stereo! */
11.19 }
11.20
11.21 /* Check formats available */
11.22 @@ -274,7 +275,8 @@
11.23 MINTAUDIO_numfreq = SDL_MintAudio_SearchFrequency(this, spec->freq);
11.24 spec->freq = MINTAUDIO_frequencies[MINTAUDIO_numfreq].frequency;
11.25
11.26 - DEBUG_PRINT((DEBUG_NAME "obtained: %d bits, ", SDL_AUDIO_BITSIZE(spec->format)));
11.27 + DEBUG_PRINT((DEBUG_NAME "obtained: %d bits, ",
11.28 + SDL_AUDIO_BITSIZE(spec->format)));
11.29 DEBUG_PRINT(("float=%d, ", SDL_AUDIO_ISFLOAT(spec->format)));
11.30 DEBUG_PRINT(("signed=%d, ", SDL_AUDIO_ISSIGNED(spec->format)));
11.31 DEBUG_PRINT(("big endian=%d, ", SDL_AUDIO_ISBIGENDIAN(spec->format)));
12.1 --- a/src/audio/mint/SDL_mintaudio_gsxb.c Sun Sep 24 15:56:36 2006 +0000
12.2 +++ b/src/audio/mint/SDL_mintaudio_gsxb.c Sun Sep 24 15:56:55 2006 +0000
12.3 @@ -223,49 +223,49 @@
12.4 DEBUG_PRINT(("freq=%d\n", spec->freq));
12.5
12.6 if (spec->channels > 2) {
12.7 - spec->channels = 2; /* no more than stereo! */
12.8 + spec->channels = 2; /* no more than stereo! */
12.9 }
12.10
12.11 while ((!valid_datatype) && (test_format)) {
12.12 spec->format = test_format;
12.13 switch (test_format) {
12.14 - case AUDIO_U8:
12.15 - case AUDIO_S8:
12.16 - case AUDIO_U16LSB:
12.17 - case AUDIO_S16LSB:
12.18 - case AUDIO_U16MSB:
12.19 - case AUDIO_S16MSB:
12.20 - case AUDIO_S32LSB:
12.21 - case AUDIO_S32MSB:
12.22 + case AUDIO_U8:
12.23 + case AUDIO_S8:
12.24 + case AUDIO_U16LSB:
12.25 + case AUDIO_S16LSB:
12.26 + case AUDIO_U16MSB:
12.27 + case AUDIO_S16MSB:
12.28 + case AUDIO_S32LSB:
12.29 + case AUDIO_S32MSB:
12.30 /* no float support... */
12.31 - resolution = SDL_AUDIO_BITSIZE(spec->format);
12.32 - format_signed = SDL_AUDIO_ISSIGNED(spec->format);
12.33 - format_bigendian = SDL_AUDIO_ISBIGENDIAN(spec->format);
12.34 + resolution = SDL_AUDIO_BITSIZE(spec->format);
12.35 + format_signed = SDL_AUDIO_ISSIGNED(spec->format);
12.36 + format_bigendian = SDL_AUDIO_ISBIGENDIAN(spec->format);
12.37
12.38 - /* Check formats available */
12.39 - snd_format = Sndstatus(SND_QUERYFORMATS);
12.40 - switch (resolution) {
12.41 - case 8:
12.42 - if (snd_format & SND_FORMAT8) {
12.43 - valid_datatype = 1;
12.44 - snd_format = Sndstatus(SND_QUERY8BIT);
12.45 - }
12.46 - break;
12.47 - case 16:
12.48 - if (snd_format & SND_FORMAT16) {
12.49 - valid_datatype = 1;
12.50 - snd_format = Sndstatus(SND_QUERY16BIT);
12.51 - }
12.52 - break;
12.53 - case 32:
12.54 - if (snd_format & SND_FORMAT32) {
12.55 - valid_datatype = 1;
12.56 - snd_format = Sndstatus(SND_QUERY32BIT);
12.57 - }
12.58 - break;
12.59 + /* Check formats available */
12.60 + snd_format = Sndstatus(SND_QUERYFORMATS);
12.61 + switch (resolution) {
12.62 + case 8:
12.63 + if (snd_format & SND_FORMAT8) {
12.64 + valid_datatype = 1;
12.65 + snd_format = Sndstatus(SND_QUERY8BIT);
12.66 }
12.67 + break;
12.68 + case 16:
12.69 + if (snd_format & SND_FORMAT16) {
12.70 + valid_datatype = 1;
12.71 + snd_format = Sndstatus(SND_QUERY16BIT);
12.72 + }
12.73 + break;
12.74 + case 32:
12.75 + if (snd_format & SND_FORMAT32) {
12.76 + valid_datatype = 1;
12.77 + snd_format = Sndstatus(SND_QUERY32BIT);
12.78 + }
12.79 + break;
12.80 + }
12.81
12.82 - break;
12.83 + break;
12.84 }
12.85 }
12.86
12.87 @@ -328,7 +328,8 @@
12.88 MINTAUDIO_numfreq = SDL_MintAudio_SearchFrequency(this, spec->freq);
12.89 spec->freq = MINTAUDIO_frequencies[MINTAUDIO_numfreq].frequency;
12.90
12.91 - DEBUG_PRINT((DEBUG_NAME "obtained: %d bits, ", SDL_AUDIO_BITSIZE(spec->format)));
12.92 + DEBUG_PRINT((DEBUG_NAME "obtained: %d bits, ",
12.93 + SDL_AUDIO_BITSIZE(spec->format)));
12.94 DEBUG_PRINT(("float=%d, ", SDL_AUDIO_ISFLOAT(spec->format)));
12.95 DEBUG_PRINT(("signed=%d, ", SDL_AUDIO_ISSIGNED(spec->format)));
12.96 DEBUG_PRINT(("big endian=%d, ", SDL_AUDIO_ISBIGENDIAN(spec->format)));
13.1 --- a/src/audio/mint/SDL_mintaudio_mcsn.c Sun Sep 24 15:56:36 2006 +0000
13.2 +++ b/src/audio/mint/SDL_mintaudio_mcsn.c Sun Sep 24 15:56:55 2006 +0000
13.3 @@ -225,7 +225,8 @@
13.4 int i;
13.5 unsigned long masterclock, masterprediv;
13.6
13.7 - DEBUG_PRINT((DEBUG_NAME "asked: %d bits, ", SDL_AUDIO_BITSIZE(spec->format)));
13.8 + DEBUG_PRINT((DEBUG_NAME "asked: %d bits, ",
13.9 + SDL_AUDIO_BITSIZE(spec->format)));
13.10 DEBUG_PRINT(("float=%d, ", SDL_AUDIO_ISFLOAT(spec->format)));
13.11 DEBUG_PRINT(("signed=%d, ", SDL_AUDIO_ISSIGNED(spec->format)));
13.12 DEBUG_PRINT(("big endian=%d, ", SDL_AUDIO_ISBIGENDIAN(spec->format)));
13.13 @@ -233,7 +234,7 @@
13.14 DEBUG_PRINT(("freq=%d\n", spec->freq));
13.15
13.16 if (spec->channels > 2) {
13.17 - spec->channels = 2; /* no more than stereo! */
13.18 + spec->channels = 2; /* no more than stereo! */
13.19 }
13.20
13.21 /* Check formats available */
13.22 @@ -241,7 +242,7 @@
13.23 switch (cookie_mcsn->play) {
13.24 case MCSN_ST:
13.25 spec->channels = 1;
13.26 - spec->format = AUDIO_S8; /* FIXME: is it signed or unsigned ? */
13.27 + spec->format = AUDIO_S8; /* FIXME: is it signed or unsigned ? */
13.28 SDL_MintAudio_AddFrequency(this, 12500, 0, 0, -1);
13.29 break;
13.30 case MCSN_TT: /* Also STE, Mega STE */
13.31 @@ -279,9 +280,9 @@
13.32 (1 << i) - 1, -1);
13.33 }
13.34 }
13.35 - spec->format |= SDL_AUDIO_MASK_SIGNED; /* Audio is always signed */
13.36 + spec->format |= SDL_AUDIO_MASK_SIGNED; /* Audio is always signed */
13.37 if ((SDL_AUDIO_BITSIZE(spec->format)) == 16) {
13.38 - spec->format |= SDL_AUDIO_MASK_ENDIAN; /* Audio is always big endian */
13.39 + spec->format |= SDL_AUDIO_MASK_ENDIAN; /* Audio is always big endian */
13.40 spec->channels = 2; /* 16 bits always stereo */
13.41 }
13.42 break;
13.43 @@ -299,7 +300,8 @@
13.44 MINTAUDIO_numfreq = SDL_MintAudio_SearchFrequency(this, spec->freq);
13.45 spec->freq = MINTAUDIO_frequencies[MINTAUDIO_numfreq].frequency;
13.46
13.47 - DEBUG_PRINT((DEBUG_NAME "obtained: %d bits, ", SDL_AUDIO_BITSIZE(spec->format)));
13.48 + DEBUG_PRINT((DEBUG_NAME "obtained: %d bits, ",
13.49 + SDL_AUDIO_BITSIZE(spec->format)));
13.50 DEBUG_PRINT(("float=%d, ", SDL_AUDIO_ISFLOAT(spec->format)));
13.51 DEBUG_PRINT(("signed=%d, ", SDL_AUDIO_ISSIGNED(spec->format)));
13.52 DEBUG_PRINT(("big endian=%d, ", SDL_AUDIO_ISBIGENDIAN(spec->format)));
14.1 --- a/src/audio/mint/SDL_mintaudio_stfa.c Sun Sep 24 15:56:36 2006 +0000
14.2 +++ b/src/audio/mint/SDL_mintaudio_stfa.c Sun Sep 24 15:56:55 2006 +0000
14.3 @@ -206,7 +206,8 @@
14.4 {
14.5 int i;
14.6
14.7 - DEBUG_PRINT((DEBUG_NAME "asked: %d bits, ", SDL_AUDIO_BITSIZE(spec->format)));
14.8 + DEBUG_PRINT((DEBUG_NAME "asked: %d bits, ",
14.9 + SDL_AUDIO_BITSIZE(spec->format)));
14.10 DEBUG_PRINT(("float=%d, ", SDL_AUDIO_ISFLOAT(spec->format)));
14.11 DEBUG_PRINT(("signed=%d, ", SDL_AUDIO_ISSIGNED(spec->format)));
14.12 DEBUG_PRINT(("big endian=%d, ", SDL_AUDIO_ISBIGENDIAN(spec->format)));
14.13 @@ -214,11 +215,11 @@
14.14 DEBUG_PRINT(("freq=%d\n", spec->freq));
14.15
14.16 if (SDL_AUDIO_BITSIZE(spec->format) > 16) {
14.17 - spec->format = AUDIO_S16SYS; /* clamp out int32/float32 ... */
14.18 + spec->format = AUDIO_S16SYS; /* clamp out int32/float32 ... */
14.19 }
14.20
14.21 if (spec->channels > 2) {
14.22 - spec->channels = 2; /* no more than stereo! */
14.23 + spec->channels = 2; /* no more than stereo! */
14.24 }
14.25
14.26 /* Check formats available */
14.27 @@ -239,7 +240,8 @@
14.28 MINTAUDIO_numfreq = SDL_MintAudio_SearchFrequency(this, spec->freq);
14.29 spec->freq = MINTAUDIO_frequencies[MINTAUDIO_numfreq].frequency;
14.30
14.31 - DEBUG_PRINT((DEBUG_NAME "obtained: %d bits, ", SDL_AUDIO_BITSIZE(spec->format)));
14.32 + DEBUG_PRINT((DEBUG_NAME "obtained: %d bits, ",
14.33 + SDL_AUDIO_BITSIZE(spec->format)));
14.34 DEBUG_PRINT(("float=%d, ", SDL_AUDIO_ISFLOAT(spec->format)));
14.35 DEBUG_PRINT(("signed=%d, ", SDL_AUDIO_ISSIGNED(spec->format)));
14.36 DEBUG_PRINT(("big endian=%d, ", SDL_AUDIO_ISBIGENDIAN(spec->format)));
15.1 --- a/src/audio/mint/SDL_mintaudio_xbios.c Sun Sep 24 15:56:36 2006 +0000
15.2 +++ b/src/audio/mint/SDL_mintaudio_xbios.c Sun Sep 24 15:56:55 2006 +0000
15.3 @@ -83,7 +83,7 @@
15.4 unsigned long dummy;
15.5 const char *envr = SDL_getenv("SDL_AUDIODRIVER");
15.6
15.7 - /*SDL_MintAudio_mint_present = (Getcookie(C_MiNT, &dummy) == C_FOUND);*/
15.8 + /*SDL_MintAudio_mint_present = (Getcookie(C_MiNT, &dummy) == C_FOUND); */
15.9 SDL_MintAudio_mint_present = SDL_FALSE;
15.10
15.11 /* We can't use XBIOS in interrupt with Magic, don't know about thread */
15.12 @@ -360,21 +360,22 @@
15.13 int i;
15.14 Uint32 extclock;
15.15
15.16 - DEBUG_PRINT((DEBUG_NAME "asked: %d bits, ", SDL_AUDIO_BITSIZE(spec->format)));
15.17 + DEBUG_PRINT((DEBUG_NAME "asked: %d bits, ",
15.18 + SDL_AUDIO_BITSIZE(spec->format)));
15.19 DEBUG_PRINT(("float=%d, ", SDL_AUDIO_ISFLOAT(spec->format)));
15.20 DEBUG_PRINT(("signed=%d, ", SDL_AUDIO_ISSIGNED(spec->format)));
15.21 DEBUG_PRINT(("big endian=%d, ", SDL_AUDIO_ISBIGENDIAN(spec->format)));
15.22 DEBUG_PRINT(("channels=%d, ", spec->channels));
15.23 DEBUG_PRINT(("freq=%d\n", spec->freq));
15.24
15.25 - spec->format |= SDL_AUDIO_MASK_SIGNED; /* Audio is always signed */
15.26 + spec->format |= SDL_AUDIO_MASK_SIGNED; /* Audio is always signed */
15.27
15.28 /* clamp out int32/float32 */
15.29 if (SDL_AUDIO_BITSIZE(spec->format) >= 16) {
15.30 - spec->format = AUDIO_S16MSB; /* Audio is always big endian */
15.31 + spec->format = AUDIO_S16MSB; /* Audio is always big endian */
15.32 spec->channels = 2; /* 16 bits always stereo */
15.33 } else if (spec->channels > 2) {
15.34 - spec->channels = 2; /* no more than stereo! */
15.35 + spec->channels = 2; /* no more than stereo! */
15.36 }
15.37
15.38 MINTAUDIO_freqcount = 0;
15.39 @@ -406,7 +407,8 @@
15.40 MINTAUDIO_numfreq = SDL_MintAudio_SearchFrequency(this, spec->freq);
15.41 spec->freq = MINTAUDIO_frequencies[MINTAUDIO_numfreq].frequency;
15.42
15.43 - DEBUG_PRINT((DEBUG_NAME "obtained: %d bits, ", SDL_AUDIO_BITSIZE(spec->format)));
15.44 + DEBUG_PRINT((DEBUG_NAME "obtained: %d bits, ",
15.45 + SDL_AUDIO_BITSIZE(spec->format)));
15.46 DEBUG_PRINT(("float=%d, ", SDL_AUDIO_ISFLOAT(spec->format)));
15.47 DEBUG_PRINT(("signed=%d, ", SDL_AUDIO_ISSIGNED(spec->format)));
15.48 DEBUG_PRINT(("big endian=%d, ", SDL_AUDIO_ISBIGENDIAN(spec->format)));
15.49 @@ -468,7 +470,7 @@
15.50 } else {
15.51 /* Install interrupt */
15.52 Jdisint(MFP_DMASOUND);
15.53 - /*Xbtimer(XB_TIMERA, 8, 1, SDL_MintAudio_XbiosInterrupt);*/
15.54 + /*Xbtimer(XB_TIMERA, 8, 1, SDL_MintAudio_XbiosInterrupt); */
15.55 Xbtimer(XB_TIMERA, 8, 1, SDL_MintAudio_Dma8Interrupt);
15.56 Jenabint(MFP_DMASOUND);
15.57
16.1 --- a/src/joystick/mint/SDL_sysjoystick.c Sun Sep 24 15:56:36 2006 +0000
16.2 +++ b/src/joystick/mint/SDL_sysjoystick.c Sun Sep 24 15:56:55 2006 +0000
16.3 @@ -202,13 +202,13 @@
16.4 }
16.5 if ((cookie_mch == MCH_STE << 16) || (cookie_mch == MCH_F30 << 16)) {
16.6 atarijoysticks[PORTA_PAD0].enabled =
16.7 - atarijoysticks[PORTA_PAD1].enabled =
16.8 - atarijoysticks[PORTA_PAD2].enabled =
16.9 - atarijoysticks[PORTA_PAD3].enabled =
16.10 - atarijoysticks[PORTB_PAD0].enabled =
16.11 - atarijoysticks[PORTB_PAD1].enabled =
16.12 - atarijoysticks[PORTB_PAD2].enabled =
16.13 - atarijoysticks[PORTB_PAD3].enabled = SDL_TRUE;
16.14 + atarijoysticks[PORTA_PAD1].enabled =
16.15 + atarijoysticks[PORTA_PAD2].enabled =
16.16 + atarijoysticks[PORTA_PAD3].enabled =
16.17 + atarijoysticks[PORTB_PAD0].enabled =
16.18 + atarijoysticks[PORTB_PAD1].enabled =
16.19 + atarijoysticks[PORTB_PAD2].enabled =
16.20 + atarijoysticks[PORTB_PAD3].enabled = SDL_TRUE;
16.21 }
16.22 if (!atarijoysticks[IKBD_JOY1].enabled) {
16.23 atarijoysticks[XBIOS_JOY1].enabled = (SDL_AtariXbios_enabled != 0);
16.24 @@ -432,24 +432,32 @@
16.25 int numjoypad, i;
16.26
16.27 numjoypad = 0;
16.28 - switch(numjoystick) {
16.29 + switch (numjoystick) {
16.30 case PORTA_PAD0:
16.31 - numjoypad = 0; break;
16.32 + numjoypad = 0;
16.33 + break;
16.34 case PORTA_PAD1:
16.35 - numjoypad = 1; break;
16.36 + numjoypad = 1;
16.37 + break;
16.38 case PORTA_PAD2:
16.39 - numjoypad = 2; break;
16.40 + numjoypad = 2;
16.41 + break;
16.42 case PORTA_PAD3:
16.43 - numjoypad = 3; break;
16.44 + numjoypad = 3;
16.45 + break;
16.46 case PORTB_PAD0:
16.47 - numjoypad = 4; break;
16.48 + numjoypad = 4;
16.49 + break;
16.50 case PORTB_PAD1:
16.51 - numjoypad = 5; break;
16.52 + numjoypad = 5;
16.53 + break;
16.54 case PORTB_PAD2:
16.55 - numjoypad = 6; break;
16.56 + numjoypad = 6;
16.57 + break;
16.58 case PORTB_PAD3:
16.59 - numjoypad = 7; break;
16.60 - }
16.61 + numjoypad = 7;
16.62 + break;
16.63 + }
16.64
16.65 curstate = jp_joypads[numjoypad];
16.66 if (curstate != prevstate) {
16.67 @@ -647,7 +655,7 @@
16.68 };
16.69 #define JOYPAD_IO ((*(volatile struct JOYPAD_IO_S *)JOYPAD_IO_BASE))
16.70
16.71 -static const Uint16 joypad_masks[8*4]={
16.72 +static const Uint16 joypad_masks[8 * 4] = {
16.73 0xfffe, 0xfffd, 0xfffb, 0xfff7,
16.74 0xfff0, 0xfff1, 0xfff2, 0xfff3,
16.75 0xfff4, 0xfff5, 0xfff6, 0xfff8,
16.76 @@ -685,35 +693,35 @@
16.77 tmp = (JOYPAD_IO.paddles[3] & 255);
16.78 jp_paddles[3] = (tmp << 8) | tmp;
16.79
16.80 - /* Update joypads on teamtap port A */
16.81 - for (i=0; i<4; i++) {
16.82 + /* Update joypads on teamtap port A */
16.83 + for (i = 0; i < 4; i++) {
16.84 jp_joypads[i] = 0;
16.85 - for (j=0; j<4; j++) {
16.86 - JOYPAD_IO.directions = joypad_masks[(i*4)+j];
16.87 + for (j = 0; j < 4; j++) {
16.88 + JOYPAD_IO.directions = joypad_masks[(i * 4) + j];
16.89
16.90 - cur_fire = (~(JOYPAD_IO.fires) & 3)<<16;
16.91 - cur_dir = (~(JOYPAD_IO.directions)>>8) & 15;
16.92 + cur_fire = (~(JOYPAD_IO.fires) & 3) << 16;
16.93 + cur_dir = (~(JOYPAD_IO.directions) >> 8) & 15;
16.94
16.95 - jp_joypads[i] |= cur_fire<<(j*2);
16.96 - jp_joypads[i] |= cur_dir<<(j*4);
16.97 + jp_joypads[i] |= cur_fire << (j * 2);
16.98 + jp_joypads[i] |= cur_dir << (j * 4);
16.99 }
16.100 }
16.101
16.102 - /* Update joypads on teamtap port B */
16.103 - for (i=4; i<8; i++) {
16.104 + /* Update joypads on teamtap port B */
16.105 + for (i = 4; i < 8; i++) {
16.106 jp_joypads[i] = 0;
16.107 - for (j=0; j<4; j++) {
16.108 - JOYPAD_IO.directions = joypad_masks[(i*4)+j];
16.109 + for (j = 0; j < 4; j++) {
16.110 + JOYPAD_IO.directions = joypad_masks[(i * 4) + j];
16.111
16.112 - cur_fire = (~(JOYPAD_IO.fires) & 0xc)<<14;
16.113 - cur_dir = (~(JOYPAD_IO.directions)>>12) & 15;
16.114 + cur_fire = (~(JOYPAD_IO.fires) & 0xc) << 14;
16.115 + cur_dir = (~(JOYPAD_IO.directions) >> 12) & 15;
16.116
16.117 - jp_joypads[i] |= cur_fire<<(j*2);
16.118 - jp_joypads[i] |= cur_dir<<(j*4);
16.119 + jp_joypads[i] |= cur_fire << (j * 2);
16.120 + jp_joypads[i] |= cur_dir << (j * 4);
16.121 }
16.122 }
16.123
16.124 - JOYPAD_IO.directions=0xffff;
16.125 + JOYPAD_IO.directions = 0xffff;
16.126 }
16.127
16.128 #endif /* SDL_JOYSTICK_MINT */
17.1 --- a/src/video/ataricommon/SDL_atarievents.c Sun Sep 24 15:56:36 2006 +0000
17.2 +++ b/src/video/ataricommon/SDL_atarievents.c Sun Sep 24 15:56:55 2006 +0000
17.3 @@ -134,12 +134,12 @@
17.4 keytab_normal = key_tables->unshift;
17.5
17.6 /* Initialize keymap */
17.7 - for ( i=0; i<ATARIBIOS_MAXKEYS; i++ )
17.8 + for (i = 0; i < ATARIBIOS_MAXKEYS; i++)
17.9 keymap[i] = SDLK_UNKNOWN;
17.10
17.11 /* Functions keys */
17.12 - for ( i = 0; i<10; i++ )
17.13 - keymap[SCANCODE_F1 + i] = SDLK_F1+i;
17.14 + for (i = 0; i < 10; i++)
17.15 + keymap[SCANCODE_F1 + i] = SDLK_F1 + i;
17.16
17.17 /* Cursor keypad */
17.18 keymap[SCANCODE_HELP] = SDLK_HELP;
17.19 @@ -208,8 +208,7 @@
17.20 };
17.21
17.22 SDL_keysym *
17.23 -SDL_Atari_TranslateKey(int scancode, SDL_keysym *keysym,
17.24 - SDL_bool pressed)
17.25 +SDL_Atari_TranslateKey(int scancode, SDL_keysym * keysym, SDL_bool pressed)
17.26 {
17.27 int asciicode = 0;
17.28
17.29 @@ -220,14 +219,14 @@
17.30 keysym->unicode = 0;
17.31
17.32 if (keysym->sym == SDLK_UNKNOWN) {
17.33 - keysym->sym = asciicode = keytab_normal[scancode];
17.34 + keysym->sym = asciicode = keytab_normal[scancode];
17.35 }
17.36
17.37 if (SDL_TranslateUNICODE && pressed) {
17.38 keysym->unicode = SDL_AtariToUnicodeTable[asciicode];
17.39 }
17.40
17.41 - return(keysym);
17.42 + return (keysym);
17.43 }
17.44
17.45 /* vi: set ts=4 sw=4 expandtab: */
18.1 --- a/src/video/ataricommon/SDL_atarievents_c.h Sun Sep 24 15:56:36 2006 +0000
18.2 +++ b/src/video/ataricommon/SDL_atarievents_c.h Sun Sep 24 15:56:55 2006 +0000
18.3 @@ -36,8 +36,9 @@
18.4
18.5 /* Special keys state */
18.6 #ifndef K_RSHIFT
18.7 -enum {
18.8 - K_RSHIFT=0,
18.9 +enum
18.10 +{
18.11 + K_RSHIFT = 0,
18.12 K_LSHIFT,
18.13 K_CTRL,
18.14 K_ALT,
18.15 @@ -55,8 +56,8 @@
18.16
18.17 /* Atari to Unicode charset translation table */
18.18 extern Uint16 SDL_AtariToUnicodeTable[256];
18.19 -SDL_keysym *SDL_Atari_TranslateKey(int scancode, SDL_keysym *keysym,
18.20 - SDL_bool pressed);
18.21 +SDL_keysym *SDL_Atari_TranslateKey(int scancode, SDL_keysym * keysym,
18.22 + SDL_bool pressed);
18.23
18.24 #endif /* _SDL_ATARI_EVENTS_H_ */
18.25 /* vi: set ts=4 sw=4 expandtab: */
19.1 --- a/src/video/ataricommon/SDL_atarigl.c Sun Sep 24 15:56:36 2006 +0000
19.2 +++ b/src/video/ataricommon/SDL_atarigl.c Sun Sep 24 15:56:55 2006 +0000
19.3 @@ -512,11 +512,11 @@
19.4
19.5 gl_ctx =
19.6 _this->gl_data->OSMesaCreateContextExt(osmesa_format,
19.7 - _this->gl_config.
19.8 - depth_size,
19.9 - _this->gl_config.
19.10 - stencil_size,
19.11 - newaccumsize, NULL);
19.12 + _this->gl_config.
19.13 + depth_size,
19.14 + _this->gl_config.
19.15 + stencil_size,
19.16 + newaccumsize, NULL);
19.17
19.18 if (gl_ctx) {
19.19 gl_curformat = osmesa_format;
19.20 @@ -679,7 +679,7 @@
19.21
19.22 gl_shadow =
19.23 _this->gl_data->OSMesaCreateLDG(osmesa_format, GL_UNSIGNED_BYTE,
19.24 - current->w, current->h);
19.25 + current->w, current->h);
19.26
19.27 if (gl_shadow) {
19.28 gl_curformat = osmesa_format;
20.1 --- a/src/video/ataricommon/SDL_biosevents.c Sun Sep 24 15:56:36 2006 +0000
20.2 +++ b/src/video/ataricommon/SDL_biosevents.c Sun Sep 24 15:56:55 2006 +0000
20.3 @@ -61,8 +61,8 @@
20.4 vectors_mask |= ATARI_XBIOS_MOUSEEVENTS; /* XBIOS mouse events */
20.5 }
20.6 /*if (Getcookie(C_MiNT, &dummy) == C_FOUND) {
20.7 - vectors_mask = 0;
20.8 - }*/
20.9 + vectors_mask = 0;
20.10 + } */
20.11
20.12 SDL_AtariXbios_InstallVectors(vectors_mask);
20.13 }
20.14 @@ -78,8 +78,9 @@
20.15
20.16 while (Bconstat(_CON)) {
20.17 unsigned long key_pressed;
20.18 - key_pressed=Bconin(_CON);
20.19 - bios_currentkeyboard[(key_pressed>>16)&(ATARIBIOS_MAXKEYS-1)]=0xFF;
20.20 + key_pressed = Bconin(_CON);
20.21 + bios_currentkeyboard[(key_pressed >> 16) & (ATARIBIOS_MAXKEYS - 1)] =
20.22 + 0xFF;
20.23 }
20.24
20.25 /* Read special keys */
20.26 @@ -95,7 +96,8 @@
20.27 /* Key unpressed ? */
20.28 if (bios_previouskeyboard[i] && !bios_currentkeyboard[i])
20.29 SDL_PrivateKeyboard(SDL_RELEASED,
20.30 - SDL_Atari_TranslateKey(i, &keysym, SDL_FALSE));
20.31 + SDL_Atari_TranslateKey(i, &keysym,
20.32 + SDL_FALSE));
20.33 }
20.34
20.35 if (use_dev_mouse) {
21.1 --- a/src/video/ataricommon/SDL_gemdosevents.c Sun Sep 24 15:56:36 2006 +0000
21.2 +++ b/src/video/ataricommon/SDL_gemdosevents.c Sun Sep 24 15:56:55 2006 +0000
21.3 @@ -45,9 +45,10 @@
21.4 static unsigned char gemdos_previouskeyboard[ATARIBIOS_MAXKEYS];
21.5 static SDL_bool use_dev_mouse = SDL_FALSE;
21.6
21.7 -enum {
21.8 - DEV_BUSY=0,
21.9 - DEV_READY
21.10 +enum
21.11 +{
21.12 + DEV_BUSY = 0,
21.13 + DEV_READY
21.14 };
21.15
21.16 static void UpdateSpecialKeys(int special_keys_state);
21.17 @@ -68,8 +69,8 @@
21.18 vectors_mask |= ATARI_XBIOS_MOUSEEVENTS; /* XBIOS mouse events */
21.19 }
21.20 /*if (Getcookie(C_MiNT, &dummy) == C_FOUND) {
21.21 - vectors_mask = 0;
21.22 - }*/
21.23 + vectors_mask = 0;
21.24 + } */
21.25
21.26 SDL_AtariXbios_InstallVectors(vectors_mask);
21.27 }
21.28 @@ -85,8 +86,9 @@
21.29
21.30 while (Cconis() != DEV_BUSY) {
21.31 unsigned long key_pressed;
21.32 - key_pressed=Cnecin();
21.33 - gemdos_currentkeyboard[(key_pressed>>16)&(ATARIBIOS_MAXKEYS-1)]=0xFF;
21.34 + key_pressed = Cnecin();
21.35 + gemdos_currentkeyboard[(key_pressed >> 16) & (ATARIBIOS_MAXKEYS - 1)]
21.36 + = 0xFF;
21.37 }
21.38
21.39 /* Read special keys */
21.40 @@ -102,7 +104,8 @@
21.41 /* Key unpressed ? */
21.42 if (gemdos_previouskeyboard[i] && !gemdos_currentkeyboard[i])
21.43 SDL_PrivateKeyboard(SDL_RELEASED,
21.44 - SDL_Atari_TranslateKey(i, &keysym, SDL_FALSE));
21.45 + SDL_Atari_TranslateKey(i, &keysym,
21.46 + SDL_FALSE));
21.47 }
21.48
21.49 if (use_dev_mouse) {
22.1 --- a/src/video/ataricommon/SDL_ikbdevents.c Sun Sep 24 15:56:36 2006 +0000
22.2 +++ b/src/video/ataricommon/SDL_ikbdevents.c Sun Sep 24 15:56:55 2006 +0000
22.3 @@ -46,7 +46,8 @@
22.4 void
22.5 AtariIkbd_InitOSKeymap(_THIS)
22.6 {
22.7 - SDL_memset(SDL_AtariIkbd_keyboard, KEY_UNDEFINED, sizeof(SDL_AtariIkbd_keyboard));
22.8 + SDL_memset(SDL_AtariIkbd_keyboard, KEY_UNDEFINED,
22.9 + sizeof(SDL_AtariIkbd_keyboard));
22.10
22.11 /* Now install our handler */
22.12 SDL_AtariIkbd_mouseb = SDL_AtariIkbd_mousex = SDL_AtariIkbd_mousey = 0;
22.13 @@ -90,7 +91,8 @@
22.14 /* Key released ? */
22.15 if (SDL_AtariIkbd_keyboard[i] == KEY_RELEASED) {
22.16 SDL_PrivateKeyboard(SDL_RELEASED,
22.17 - SDL_Atari_TranslateKey(i, &keysym, SDL_FALSE));
22.18 + SDL_Atari_TranslateKey(i, &keysym,
22.19 + SDL_FALSE));
22.20 SDL_AtariIkbd_keyboard[i] = KEY_UNDEFINED;
22.21 }
22.22 }
23.1 --- a/src/video/ataricommon/SDL_xbiosevents.c Sun Sep 24 15:56:36 2006 +0000
23.2 +++ b/src/video/ataricommon/SDL_xbiosevents.c Sun Sep 24 15:56:55 2006 +0000
23.3 @@ -152,8 +152,10 @@
23.4 }
23.5 }
23.6
23.7 -void SDL_AtariXbios_LockMousePosition(SDL_bool lockPosition)
23.8 +void
23.9 +SDL_AtariXbios_LockMousePosition(SDL_bool lockPosition)
23.10 {
23.11 SDL_AtariXbios_mouselock = lockPosition;
23.12 }
23.13 +
23.14 /* vi: set ts=4 sw=4 expandtab: */
24.1 --- a/src/video/ataricommon/SDL_xbiosinterrupt_s.h Sun Sep 24 15:56:36 2006 +0000
24.2 +++ b/src/video/ataricommon/SDL_xbiosinterrupt_s.h Sun Sep 24 15:56:55 2006 +0000
24.3 @@ -36,7 +36,7 @@
24.4
24.5 /* Variables */
24.6
24.7 -extern volatile Uint16 SDL_AtariXbios_mouselock; /* mouse lock position */
24.8 +extern volatile Uint16 SDL_AtariXbios_mouselock; /* mouse lock position */
24.9 extern volatile Uint16 SDL_AtariXbios_mouseb; /* buttons */
24.10 extern volatile Sint16 SDL_AtariXbios_mousex; /* X relative motion */
24.11 extern volatile Sint16 SDL_AtariXbios_mousey; /* Y relative motion */
25.1 --- a/src/video/gem/SDL_gemevents.c Sun Sep 24 15:56:36 2006 +0000
25.2 +++ b/src/video/gem/SDL_gemevents.c Sun Sep 24 15:56:55 2006 +0000
25.3 @@ -147,7 +147,8 @@
25.4 /* Key unpressed ? */
25.5 if (gem_previouskeyboard[i] && !gem_currentkeyboard[i])
25.6 SDL_PrivateKeyboard(SDL_RELEASED,
25.7 - SDL_Atari_TranslateKey(i, &keysym, SDL_FALSE));
25.8 + SDL_Atari_TranslateKey(i, &keysym,
25.9 + SDL_FALSE));
25.10 }
25.11
25.12 SDL_memcpy(gem_previouskeyboard, gem_currentkeyboard,
25.13 @@ -291,8 +292,8 @@
25.14 int scancode, asciicode;
25.15
25.16 if (kc) {
25.17 - scancode=(kc>>8) & (ATARIBIOS_MAXKEYS-1);
25.18 - gem_currentkeyboard[scancode]=0xFF;
25.19 + scancode = (kc >> 8) & (ATARIBIOS_MAXKEYS - 1);
25.20 + gem_currentkeyboard[scancode] = 0xFF;
25.21 }
25.22
25.23 /* Read special keys */
26.1 --- a/src/video/gem/SDL_gemvideo.c Sun Sep 24 15:56:36 2006 +0000
26.2 +++ b/src/video/gem/SDL_gemvideo.c Sun Sep 24 15:56:55 2006 +0000
26.3 @@ -204,8 +204,8 @@
26.4 vectors_mask |= ATARI_XBIOS_MOUSEEVENTS; /* XBIOS mouse events */
26.5 }
26.6 /*if (Getcookie(C_MiNT, &dummy) == C_FOUND) {
26.7 - vectors_mask = 0;
26.8 - }*/
26.9 + vectors_mask = 0;
26.10 + } */
26.11
26.12 SDL_AtariXbios_InstallVectors(vectors_mask);
26.13
27.1 --- a/src/video/xbios/SDL_xbios.c Sun Sep 24 15:56:36 2006 +0000
27.2 +++ b/src/video/xbios/SDL_xbios.c Sun Sep 24 15:56:55 2006 +0000
27.3 @@ -171,8 +171,8 @@
27.4 device->VideoQuit = XBIOS_VideoQuit;
27.5
27.6 /* Modes */
27.7 - device->GetDisplayModes = NULL /*XBIOS_GetDisplayModes*/;
27.8 - device->SetDisplayMode = NULL /*XBIOS_SetDisplayMode*/;
27.9 + device->GetDisplayModes = NULL /*XBIOS_GetDisplayModes */ ;
27.10 + device->SetDisplayMode = NULL /*XBIOS_SetDisplayMode */ ;
27.11
27.12 /* Events */
27.13 device->PumpEvents = SDL_Atari_PumpEvents;