Removed outdated OS/2 support

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403810

README

@@ -15,7 +15,7 @@ and 2D framebuffer across multiple platforms.
 The current version supports Linux, Windows, Windows CE, BeOS, MacOS,
 Mac OS X, FreeBSD, NetBSD, OpenBSD, BSD/OS, Solaris, IRIX, and QNX.
 The code contains support for Dreamcast, Atari, AIX, OSF/Tru64,
-RISC OS, SymbianOS, and OS/2, but these are not officially supported.
+RISC OS, SymbianOS, but these are not officially supported.
 
 SDL is written in C, but works with C++ natively, and has bindings to
 several other languages, including Ada, C#, Eiffel, Erlang, Euphoria,

docs.html

@@ -163,13 +163,6 @@ SDL 1.2.10 is a major release, featuring a revamp of the build system and many A
 	Icons set with SDL_WM_SetIcon() now have the proper colors on Intel Macs.
 </BLOCKQUOTE>
 
-<H3> OS/2 Notes </H3>
-
-<BLOCKQUOTE>
-<P>
-	Projects for building SDL on OS/2 with OpenWatcom have been contributed by Doodle.  See the file README.OS2 in the SDL source distribution for details.
-</BLOCKQUOTE>
-
 <IMG SRC="docs/images/rainbow.gif" ALT="[separator]" WIDTH="100%">
 
 </BODY>

include/SDL.h

@@ -39,7 +39,7 @@ and 2D framebuffer across multiple platforms.
 The current version supports Linux, Windows, Windows CE, BeOS, MacOS,
 Mac OS X, FreeBSD, NetBSD, OpenBSD, BSD/OS, Solaris, IRIX, and QNX.
 The code contains support for Dreamcast, Atari, AIX, OSF/Tru64,
-RISC OS, SymbianOS, and OS/2, but these are not officially supported.
+RISC OS, SymbianOS, but these are not officially supported.
 
 SDL is written in C, but works with C++ natively, and has bindings to
 several other languages, including Ada, C#, Eiffel, Erlang, Euphoria,

include/SDL_config.h.default

@@ -36,8 +36,6 @@
 #include "SDL_config_macosx.h"
 #elif defined(__WIN32__)
 #include "SDL_config_win32.h"
-#elif defined(__OS2__)
-#include "SDL_config_os2.h"
 #else
 #include "SDL_config_minimal.h"
 #endif /* platform config */

include/SDL_config.h.in

@@ -214,7 +214,6 @@
 #undef SDL_JOYSTICK_LINUX
 #undef SDL_JOYSTICK_MINT
 #undef SDL_JOYSTICK_NDS
-#undef SDL_JOYSTICK_OS2
 #undef SDL_JOYSTICK_RISCOS
 #undef SDL_JOYSTICK_WINMM
 #undef SDL_JOYSTICK_USBHID
@@ -230,14 +229,12 @@
 #undef SDL_LOADSO_DLOPEN
 #undef SDL_LOADSO_DUMMY
 #undef SDL_LOADSO_LDG
-#undef SDL_LOADSO_OS2
 #undef SDL_LOADSO_WIN32
 
 /* Enable various threading systems */
 #undef SDL_THREAD_BEOS
 #undef SDL_THREAD_DC
 #undef SDL_THREAD_NDS
-#undef SDL_THREAD_OS2
 #undef SDL_THREAD_PTH
 #undef SDL_THREAD_PTHREAD
 #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX
@@ -251,7 +248,6 @@
 #undef SDL_TIMER_DUMMY
 #undef SDL_TIMER_MINT
 #undef SDL_TIMER_NDS
-#undef SDL_TIMER_OS2
 #undef SDL_TIMER_RISCOS
 #undef SDL_TIMER_UNIX
 #undef SDL_TIMER_WIN32
@@ -268,7 +264,6 @@
 #undef SDL_VIDEO_DRIVER_GEM
 #undef SDL_VIDEO_DRIVER_NANOX
 #undef SDL_VIDEO_DRIVER_NDS
-#undef SDL_VIDEO_DRIVER_OS2FS
 #undef SDL_VIDEO_DRIVER_PHOTON
 #undef SDL_VIDEO_DRIVER_QNXGF
 #undef SDL_VIDEO_DRIVER_PS2GS
@@ -315,7 +310,6 @@
 #undef SDL_POWER_LINUX
 #undef SDL_POWER_WINDOWS
 #undef SDL_POWER_MACOSX
-#undef SDL_POWER_OS2
 #undef SDL_POWER_BEOS
 #undef SDL_POWER_NINTENDODS
 #undef SDL_POWER_HARDWIRED

include/SDL_config_os2.h

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_os2_h
-#define _SDL_config_os2_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef unsigned int size_t;
-typedef unsigned long uintptr_t;
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
-
-#define SIZEOF_VOIDP 4
-#define SDL_HAS_64BIT_TYPE	1
-
-/* Use Watcom's LIBC */
-#define HAVE_LIBC 1
-
-/* Useful headers */
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STDARG_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-#define HAVE_SIGNAL_H 1
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#define HAVE_GETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_UNSETENV 1
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_BCOPY 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_STRLEN 1
-#define HAVE_STRLCPY 1
-#define HAVE_STRLCAT 1
-#define HAVE_STRDUP 1
-#define HAVE__STRREV 1
-#define HAVE__STRUPR 1
-#define HAVE__STRLWR 1
-#define HAVE_INDEX 1
-#define HAVE_RINDEX 1
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_ITOA 1
-#define HAVE__LTOA 1
-#define HAVE__UITOA 1
-#define HAVE__ULTOA 1
-#define HAVE_STRTOL 1
-#define HAVE__I64TOA 1
-#define HAVE__UI64TOA 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-#define HAVE_STRICMP 1
-#define HAVE_STRCASECMP 1
-#define HAVE_SSCANF 1
-#define HAVE_SNPRINTF 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_SETJMP 1
-#define HAVE_CLOCK_GETTIME 1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_DART	1
-#define SDL_AUDIO_DRIVER_DISK	1
-#define SDL_AUDIO_DRIVER_DUMMY	1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_OS2	1
-#define SDL_HAPTIC_DUMMY	1
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_OS2	1
-
-/* Enable various threading systems */
-#define SDL_THREAD_OS2	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_OS2	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_DUMMY	1
-#define SDL_VIDEO_DRIVER_OS2FS	1
-
-/* Enable OpenGL support */
-/* Nothing here yet for OS/2... :( */
-
-/* Enable system power support */
-#define SDL_POWER_OS2 1
-
-/* Enable assembly routines where available */
-#define SDL_ASSEMBLY_ROUTINES	1
-
-#endif /* _SDL_config_os2_h */

include/SDL_thread.h

@@ -48,9 +48,9 @@ struct SDL_Thread;
 typedef struct SDL_Thread SDL_Thread;
 
 /* Create a thread */
-#if (defined(__WIN32__) && !defined(HAVE_LIBC)) || defined(__OS2__)
+#if defined(__WIN32__) && !defined(HAVE_LIBC)
 /*
-   We compile SDL into a DLL on OS/2. This means, that it's the DLL which
+   We compile SDL into a DLL. This means, that it's the DLL which
    creates a new thread for the calling process with the SDL_CreateThread()
    API. There is a problem with this, that only the RTL of the SDL.DLL will
    be initialized for those threads, and not the RTL of the calling application!
@@ -67,11 +67,7 @@ typedef struct SDL_Thread SDL_Thread;
 #include <process.h>            /* This has _beginthread() and _endthread() defined! */
 #endif
 
-#ifdef __OS2__
-typedef int (*pfnSDL_CurrentBeginThread) (void (*func) (void *), void *,
-                                          unsigned, void *arg);
-typedef void (*pfnSDL_CurrentEndThread) (void);
-#elif __GNUC__
+#ifdef __GNUC__
 typedef unsigned long (__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned,
                                                              unsigned
                                                              (__stdcall *
@@ -96,9 +92,7 @@ SDL_CreateThread(int (SDLCALL * f) (void *), void *data,
                  pfnSDL_CurrentBeginThread pfnBeginThread,
                  pfnSDL_CurrentEndThread pfnEndThread);
 
-#ifdef __OS2__
-#define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, _beginthread, _endthread)
-#elif defined(_WIN32_WCE)
+#if defined(_WIN32_WCE)
 #define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, NULL, NULL)
 #else
 #define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, _beginthreadex, _endthreadex)

include/begin_code.h

@@ -49,16 +49,6 @@
 #  else
 #   define DECLSPEC	__declspec(dllexport)
 #  endif
-# elif defined(__OS2__)
-#  ifdef __WATCOMC__
-#   ifdef BUILD_SDL
-#    define DECLSPEC	__declspec(dllexport)
-#   else
-#    define DECLSPEC
-#   endif
-#  else
-#   define DECLSPEC
-#  endif
 # else
 #  if defined(__GNUC__) && __GNUC__ >= 4
 #   define DECLSPEC	__attribute__ ((visibility("default")))
@@ -73,14 +63,8 @@
 #if defined(__WIN32__) && !defined(__GNUC__)
 #define SDLCALL __cdecl
 #else
-#ifdef __OS2__
-/* But on OS/2, we use the _System calling convention */
-/* to be compatible with every compiler */
-#define SDLCALL _System
-#else
 #define SDLCALL
 #endif
-#endif
 #endif /* SDLCALL */
 
 /* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */

src/SDL.c

@@ -277,76 +277,7 @@ SDL_GetRevision(void)
     return SDL_REVISION;
 }
 
-#if defined(__OS2__)
-/* Building for OS/2 */
-#ifdef __WATCOMC__
-
-#define INCL_DOSERRORS
-#define INCL_DOSEXCEPTIONS
-#include <os2.h>
-
-/* Exception handler to prevent the Audio thread hanging, making a zombie process! */
-ULONG _System
-SDL_Main_ExceptionHandler(PEXCEPTIONREPORTRECORD pERepRec,
-                          PEXCEPTIONREGISTRATIONRECORD pERegRec,
-                          PCONTEXTRECORD pCtxRec, PVOID p)
-{
-    if (pERepRec->fHandlerFlags & EH_EXIT_UNWIND)
-        return XCPT_CONTINUE_SEARCH;
-    if (pERepRec->fHandlerFlags & EH_UNWINDING)
-        return XCPT_CONTINUE_SEARCH;
-    if (pERepRec->fHandlerFlags & EH_NESTED_CALL)
-        return XCPT_CONTINUE_SEARCH;
-
-    /* Do cleanup at every fatal exception! */
-    if (((pERepRec->ExceptionNum & XCPT_SEVERITY_CODE) ==
-         XCPT_FATAL_EXCEPTION) && (pERepRec->ExceptionNum != XCPT_BREAKPOINT)
-        && (pERepRec->ExceptionNum != XCPT_SINGLE_STEP)) {
-        if (SDL_initialized & SDL_INIT_AUDIO) {
-            /* This removes the zombie audio thread in case of emergency. */
-#ifdef DEBUG_BUILD
-            printf
-                ("[SDL_Main_ExceptionHandler] : Calling SDL_CloseAudio()!\n");
-#endif
-            SDL_CloseAudio();
-        }
-    }
-    return (XCPT_CONTINUE_SEARCH);
-}
-
-
-EXCEPTIONREGISTRATIONRECORD SDL_Main_xcpthand =
-    { 0, SDL_Main_ExceptionHandler };
-
-/* The main DLL entry for DLL Initialization and Uninitialization: */
-unsigned _System
-LibMain(unsigned hmod, unsigned termination)
-{
-    if (termination) {
-#ifdef DEBUG_BUILD
-/*    printf("[SDL DLL Unintialization] : Removing exception handler\n"); */
-#endif
-        DosUnsetExceptionHandler(&SDL_Main_xcpthand);
-        return 1;
-    } else {
-#ifdef DEBUG_BUILD
-        /* Make stdout and stderr unbuffered! */
-        setbuf(stdout, NULL);
-        setbuf(stderr, NULL);
-#endif
-        /* Fire up exception handler */
-#ifdef DEBUG_BUILD
-/*    printf("[SDL DLL Initialization] : Setting exception handler\n"); */
-#endif
-        /* Set exception handler */
-        DosSetExceptionHandler(&SDL_Main_xcpthand);
-
-        return 1;
-    }
-}
-#endif /* __WATCOMC__ */
-
-#elif defined(__WIN32__)
+#if defined(__WIN32__)
 
 #if !defined(HAVE_LIBC) || (defined(__WATCOMC__) && defined(BUILD_DLL))
 /* Need to include DllMain() on Watcom C for some reason.. */
@@ -368,6 +299,6 @@ _DllMainCRTStartup(HANDLE hModule,
 }
 #endif /* building DLL with Watcom C */
 
-#endif /* OS/2 elif __WIN32__ */
+#endif /* __WIN32__ */
 
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/dart/SDL_dart.h

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#ifndef _SDL_dart_h
-#define _SDL_dart_h
-
-#define INCL_TYPES
-#define INCL_DOSSEMAPHORES
-#define INCL_DOSRESOURCES
-#define INCL_DOSMISC
-#define INCL_DOSERRORS
-#define INCL_DOSPROCESS
-
-#define INCL_OS2MM
-#define INCL_MMIOOS2
-#define INCL_MCIOS2
-#include <os2.h>
-#include <os2me.h>              // DART stuff and MMIO stuff
-
-#include "../SDL_sysaudio.h"
-
-/* Hidden "this" pointer for the audio functions */
-#define _THIS	SDL_AudioDevice *_this
-
-/* The DirectSound objects */
-struct SDL_PrivateAudioData
-{
-    int iCurrDeviceOrd;
-    int iCurrFreq;
-    int iCurrBits;
-    int iCurrChannels;
-    int iCurrNumBufs;
-    int iCurrBufSize;
-
-    int iLastPlayedBuf;
-    int iNextFreeBuffer;
-
-    MCI_BUFFER_PARMS BufferParms;       // Sound buffer parameters
-    MCI_MIX_BUFFER *pMixBuffers;        // Sound buffers
-    MCI_MIXSETUP_PARMS MixSetupParms;   // Mixer setup parameters
-    HEV hevAudioBufferPlayed;   // Event semaphore to indicate that an audio buffer has been played by DART
-};
-
-#endif /* _SDL_dart_h */
-
-/* vi: set ts=4 sw=4 expandtab: */

src/events/SDL_events.c

@@ -84,29 +84,11 @@ SDL_Unlock_EventThread(void)
     }
 }
 
-#ifdef __OS2__
-/*
- * We'll increase the priority of GobbleEvents thread, so it will process
- *  events in time for sure! For this, we need the DosSetPriority() API
- *  from the os2.h include file.
- */
-#define INCL_DOSPROCESS
-#include <os2.h>
-#include <time.h>
-#endif
-
 static int SDLCALL
 SDL_GobbleEvents(void *unused)
 {
     event_thread = SDL_ThreadID();
 
-#ifdef __OS2__
-#ifdef USE_DOSSETPRIORITY
-    /* Increase thread priority, so it will process events in time for sure! */
-    DosSetPriority(PRTYS_THREAD, PRTYC_REGULAR, +16, 0);
-#endif
-#endif
-
     while (SDL_EventQ.active) {
         SDL_VideoDevice *_this = SDL_GetVideoDevice();
 

src/events/SDL_sysevents.h

@@ -33,8 +33,4 @@
 #define CANT_THREAD_EVENTS
 #endif
 
-#ifdef __OS2__                  /* The OS/2 event loop runs in a separate thread */
-#define MUST_THREAD_EVENTS
-#endif
-
 /* vi: set ts=4 sw=4 expandtab: */

src/joystick/os2/joyos2.h

-/*****************************************************************************/
-/*                                                                           */
-/* COPYRIGHT    Copyright (C) 1995 IBM Corporation                           */
-/*                                                                           */
-/*    The following IBM OS/2 source code is provided to you solely for       */
-/*    the purpose of assisting you in your development of OS/2 device        */
-/*    drivers. You may use this code in accordance with the IBM License      */
-/*    Agreement provided in the IBM Device Driver Source Kit for OS/2. This  */
-/*    Copyright statement may not be removed.                                */
-/*                                                                           */
-/*****************************************************************************/
-#ifndef JOYOS2_H
-#define JOYOS2_H
-
-/****** GAMEPORT.SYS joystick definitions, start *****************************/
-#define GAME_VERSION    0x20    /* 2.0 First IBM version */
-#define GAMEPDDNAME     "GAME$   "
-#define IOCTL_CAT_USER	0x80
-#define GAME_PORT_GET	0x20    /* read GAMEPORT.SYS values */
-#define GAME_PORT_RESET 0x60    /* reset joystick mask with given value */
-
-#pragma pack(1)                 /* pack structure size is 1 byte */
-typedef struct
-{                               /* GAMEPORT.SYS structure */
-    USHORT usJs_AxCnt;          /* Joystick_A X position */
-    USHORT usJs_AyCnt;          /* Joystick_A Y position */
-    USHORT usJs_BxCnt;          /* Joystick_B X position */
-    USHORT usJs_ByCnt;          /* Joystick_B Y position */
-    USHORT usJs_ButtonA1Cnt;    /* button A1 press count */
-    USHORT usJs_ButtonA2Cnt;    /* button A2 press count */
-    USHORT usJs_ButtonB1Cnt;    /* button B1 press count */
-    USHORT usJs_ButtonB2Cnt;    /* button B2 press count */
-    UCHAR ucJs_JoyStickMask;    /* mask of connected joystick pots */
-    UCHAR ucJs_ButtonStatus;    /* bits of switches down */
-    ULONG ulJs_Ticks;           /* joystick clock ticks */
-} GAME_PORT_STRUCT;
-#pragma pack()                  /*reset to normal pack size */
-/****** GAMEPORT.SYS joystick definitions, end *******************************/
-
-
-/****************************************************************************/
-#define GAME_GET_VERSION                0x01
-#define GAME_GET_PARMS                  0x02
-#define GAME_SET_PARMS                  0x03
-#define GAME_GET_CALIB                  0x04
-#define GAME_SET_CALIB                  0x05
-#define GAME_GET_DIGSET                 0x06
-#define GAME_SET_DIGSET                 0x07
-#define GAME_GET_STATUS                 0x10
-#define GAME_GET_STATUS_BUTWAIT         0x11
-#define GAME_GET_STATUS_SAMPWAIT        0x12
-/****************************************************************************/
-
-/****************************************************************************/
-// bit masks for each axis
-#define JOY_AX_BIT      0x01
-#define JOY_AY_BIT      0x02
-#define JOY_A_BITS      (JOY_AX_BIT|JOY_AY_BIT)
-#define JOY_BX_BIT      0x04
-#define JOY_BY_BIT      0x08
-#define JOY_B_BITS      (JOY_BX_BIT|JOY_BY_BIT)
-#define JOY_ALLPOS_BITS (JOY_A_BITS|JOY_B_BITS)
-
-// bit masks for each button
-#define JOY_BUT1_BIT    0x10
-#define JOY_BUT2_BIT    0x20
-#define JOY_BUT3_BIT    0x40
-#define JOY_BUT4_BIT    0x80
-#define JOY_ALL_BUTS    (JOY_BUT1_BIT|JOY_BUT2_BIT|JOY_BUT3_BIT|JOY_BUT4_BIT)
-/****************************************************************************/
-
-/****************************************************************************/
-// 1-D position struct used for each axis
-typedef SHORT GAME_POS;         /* some data formats require signed values */
-
-// simple 2-D position for each joystick
-typedef struct
-{
-    GAME_POS x;
-    GAME_POS y;
-}
-GAME_2DPOS_STRUCT;
-
-// struct defining the instantaneous state of both sticks and all buttons
-typedef struct
-{
-    GAME_2DPOS_STRUCT A;
-    GAME_2DPOS_STRUCT B;
-    USHORT butMask;
-}
-GAME_DATA_STRUCT;
-
-// struct to be used for calibration and digital response on each axis
-typedef struct
-{
-    GAME_POS lower;
-    GAME_POS centre;
-    GAME_POS upper;
-}
-GAME_3POS_STRUCT;
-/****************************************************************************/
-
-/****************************************************************************/
-// status struct returned to OS/2 applications:
-// current data for all sticks as well as button counts since last read
-typedef struct
-{
-    GAME_DATA_STRUCT curdata;
-    USHORT b1cnt;
-    USHORT b2cnt;
-    USHORT b3cnt;
-    USHORT b4cnt;
-}
-GAME_STATUS_STRUCT;
-/****************************************************************************/
-
-/****************************************************************************/
-/* in use bitmasks originating in 0.2b */
-#define GAME_USE_BOTH_OLDMASK   0x01    /* for backward compat with bool */
-#define GAME_USE_X_NEWMASK      0x02
-#define GAME_USE_Y_NEWMASK      0x04
-#define GAME_USE_X_EITHERMASK   (GAME_USE_X_NEWMASK|GAME_USE_BOTH_OLDMASK)
-#define GAME_USE_Y_EITHERMASK   (GAME_USE_Y_NEWMASK|GAME_USE_BOTH_OLDMASK)
-#define GAME_USE_BOTH_NEWMASK   (GAME_USE_X_NEWMASK|GAME_USE_Y_NEWMASK)
-
-/* only timed sampling implemented in version 1.0 */
-#define GAME_MODE_TIMED         1       /* timed sampling */
-#define GAME_MODE_REQUEST       2       /* request driven sampling */
-
-/* only raw implemented in version 1.0 */
-#define GAME_DATA_FORMAT_RAW    1       /* [l,c,r]   */
-#define GAME_DATA_FORMAT_SIGNED 2       /* [-l,0,+r] */
-#define GAME_DATA_FORMAT_BINARY 3       /* {-1,0,+1} */
-#define GAME_DATA_FORMAT_SCALED 4       /* [-10,+10] */
-
-// parameters defining the operation of the driver
-typedef struct
-{
-    USHORT useA;                /* new bitmasks: see above */
-    USHORT useB;
-    USHORT mode;                /* see consts above */
-    USHORT format;              /* see consts above */
-    USHORT sampDiv;             /* samp freq = 32 / n */
-    USHORT scale;               /* scaling factor */
-    USHORT res1;                /* must be 0 */
-    USHORT res2;                /* must be 0 */
-}
-GAME_PARM_STRUCT;
-/****************************************************************************/
-
-/****************************************************************************/
-// calibration values for each axis:
-//      - upper limit on value to be considered in lower range
-//      - centre value
-//      - lower limit on value to be considered in upper range
-typedef struct
-{
-    GAME_3POS_STRUCT Ax;
-    GAME_3POS_STRUCT Ay;
-    GAME_3POS_STRUCT Bx;
-    GAME_3POS_STRUCT By;
-}
-GAME_CALIB_STRUCT;
-/****************************************************************************/
-
-/****************************************************************************/
-// struct defining the digital response values for all axes
-typedef struct
-{
-    GAME_3POS_STRUCT Ax;
-    GAME_3POS_STRUCT Ay;
-    GAME_3POS_STRUCT Bx;
-    GAME_3POS_STRUCT By;
-}
-GAME_DIGSET_STRUCT;
-/****************************************************************************/
-
-#endif
-/* vi: set ts=4 sw=4 expandtab: */

src/loadso/os2/SDL_sysloadso.c

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#ifdef SDL_LOADSO_OS2
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* System dependent library loading routines                           */
-
-#include <stdio.h>
-#define INCL_DOSERRORS
-#define INCL_DOSMODULEMGR
-#include <os2.h>
-
-#include "SDL_loadso.h"
-
-void *
-SDL_LoadObject(const char *sofile)
-{
-    HMODULE handle = NULL;
-    char buf[512];
-    APIRET ulrc = DosLoadModule(buf, sizeof(buf), (char *) sofile, &handle);
-
-    /* Generate an error message if all loads failed */
-    if ((ulrc != NO_ERROR) || (handle == NULL))
-        SDL_SetError("Failed loading %s: %s", sofile, buf);
-
-    return ((void *) handle);
-}
-
-void *
-SDL_LoadFunction(void *handle, const char *name)
-{
-    const char *loaderror = "Unknown error";
-    void *symbol = NULL;
-    APIRET ulrc =
-        DosQueryProcAddr((HMODULE) handle, 0, (char *) name, &symbol);
-    if (ulrc == ERROR_INVALID_HANDLE)
-        loaderror = "Invalid module handle";
-    else if (ulrc == ERROR_INVALID_NAME)
-        loaderror = "Symbol not found";
-
-    if (symbol == NULL)
-        SDL_SetError("Failed loading %s: %s", name, loaderror);
-
-    return (symbol);
-}
-
-void
-SDL_UnloadObject(void *handle)
-{
-    if (handle != NULL)
-        DosFreeModule((HMODULE) handle);
-}
-
-#endif /* SDL_LOADSO_OS2 */
-
-/* vi: set ts=4 sw=4 expandtab: */

src/power/SDL_power.c

@@ -34,7 +34,6 @@ SDL_bool SDL_GetPowerInfo_Linux_proc_acpi(SDL_PowerState *, int *, int *);
 SDL_bool SDL_GetPowerInfo_Linux_proc_apm(SDL_PowerState *, int *, int *);
 SDL_bool SDL_GetPowerInfo_Windows(SDL_PowerState *, int *, int *);
 SDL_bool SDL_GetPowerInfo_MacOSX(SDL_PowerState *, int *, int *);
-SDL_bool SDL_GetPowerInfo_OS2(SDL_PowerState *, int *, int *);
 SDL_bool SDL_GetPowerInfo_BeOS(SDL_PowerState *, int *, int *);
 SDL_bool SDL_GetPowerInfo_NintendoDS(SDL_PowerState *, int *, int *);
 
@@ -65,9 +64,6 @@ static SDL_GetPowerInfo_Impl implementations[] = {
 #ifdef SDL_POWER_MACOSX         /* handles Mac OS X, Darwin, iPhone. */
     SDL_GetPowerInfo_MacOSX,
 #endif
-#ifdef SDL_POWER_OS2            /* handles OS/2, Warp, eComStation. */
-    SDL_GetPowerInfo_OS2,
-#endif
 #ifdef SDL_POWER_NINTENDODS     /* handles Nintendo DS. */
     SDL_GetPowerInfo_NintendoDS,
 #endif

src/power/os2/SDL_syspower.c

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* !!! FIXME:
- * Please note that this code has not been tested (or even compiled!). It
- *  should, in theory, run on any version of OS/2, and work with any system
- *  that has APM.SYS loaded. I don't know if ACPI.SYS works.
- */
-
-#ifndef SDL_POWER_DISABLED
-#ifdef SDL_POWER_OS2
-
-#define INCL_DOSFILEMGR
-#define INCL_DOSDEVICES
-#define INCL_DOSDEVIOCTL
-#define INCL_DOSERRORS
-#include <os2.h>
-
-#include "SDL_power.h"
-
-typedef struct
-{
-    USHORT len;
-    USHORT flags;
-    UCHAR ac_status;
-    UCHAR battery_status;
-    UCHAR battery_life;
-    UCHAR battery_time_form;
-    USHORT battery_time;
-    UCHAR battery_flags;
-} PowerStatus;
-extern int CompilerAssertPowerStatus[(sizeof(PowerStatus) == 10) ? 1 : -1];
-
-
-SDL_bool
-SDL_GetPowerInfo_OS2(SDL_PowerState * state, int *seconds, int *percent)
-{
-    PowerStatus status;
-    HFILE hfile = 0;
-    ULONG action = 0;
-    APIRET rc = 0;
-
-    *state = SDL_POWERSTATE_UNKNOWN;
-    *percent = -1;
-    *seconds = -1;
-
-    /* open the power management device */
-    rc = DosOpen("APM$", &hfile, &action, 0, FILE_NORMAL, FILE_OPEN,
-                 OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE, 0);
-
-    if (rc == NO_ERROR) {
-        USHORT iorc = 0;
-        ULONG iorclen = sizeof(iorc);
-        ULONG statuslen = sizeof(status);
-
-        SDL_memset(&status, '\0', sizeof(status));
-        status.len = sizeof(status);
-
-        rc = DosDevIOCtl(hfile, IOCTL_POWER, POWER_GETPOWERSTATUS, &status,
-                         statuslen, &statuslen, &iorc, iorclen, &iorclen);
-        DosClose(hfile);
-
-        /* (status.flags & 0x1) == power subsystem enabled. */
-        if ((rc == NO_ERROR) && (status.flags & 0x1)) {
-            if (statuslen == 7) {       /* older OS/2 APM driver? Less fields. */
-                status.battery_time_form = 0xFF;
-                status.battery_time = 0;
-                if (status.battery_status == 0xFF) {
-                    status.battery_flags = 0xFF;
-                } else {
-                    status.battery_flags = (1 << status.battery_status);
-                }
-            }
-
-            if (status.battery_flags == 0xFF) { /* unknown state */
-                *state = SDL_POWERSTATE_UNKNOWN;
-            } else if (status.battery_flags & (1 << 7)) {       /* no battery */
-                *state = SDL_POWERSTATE_NO_BATTERY;
-            } else if (status.battery_flags & (1 << 3)) {       /* charging */
-                *state = SDL_POWERSTATE_CHARGING;
-                need_details = SDL_TRUE;
-            } else if (status.ac_status == 1) {
-                *state = SDL_POWERSTATE_CHARGED;        /* on AC, not charging. */
-                need_details = SDL_TRUE;
-            } else {
-                *state = SDL_POWERSTATE_ON_BATTERY;     /* not on AC. */
-                need_details = SDL_TRUE;
-            }
-
-            if (need_details) {
-                const int pct = (int) status.battery_life;
-                const int secs = (int) status.battery_time;
-
-                if (pct != 0xFF) {      /* 255 == unknown */
-                    *percent = (pct > 100) ? 100 : pct;
-                }
-
-                if (status.battery_time_form == 0xFF) { /* unknown */
-                    *seconds = -1;
-                } else if (status.battery_time_form == 1) {     /* minutes */
-                    *seconds = secs * 60;
-                } else {
-                    *seconds = secs;
-                }
-            }
-        }
-    }
-
-    return SDL_TRUE;            /* always the definitive answer on OS/2. */
-}
-
-#endif /* SDL_POWER_OS2 */
-#endif /* SDL_POWER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */

src/thread/SDL_thread_c.h

@@ -33,8 +33,6 @@
 #include "dc/SDL_systhread_c.h"
 #elif SDL_THREAD_EPOC
 #include "epoc/SDL_systhread_c.h"
-#elif SDL_THREAD_OS2
-#include "os2/SDL_systhread_c.h"
 #elif SDL_THREAD_PTH
 #include "pth/SDL_systhread_c.h"
 #elif SDL_THREAD_PTHREAD

src/thread/os2/SDL_syscond.c

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* An implementation of condition variables using semaphores and mutexes */
-/*
-   This implementation borrows heavily from the BeOS condition variable
-   implementation, written by Christopher Tate and Owen Smith.  Thanks!
- */
-
-#include "SDL_thread.h"
-
-struct SDL_cond
-{
-    SDL_mutex *lock;
-    int waiting;
-    int signals;
-    SDL_sem *wait_sem;
-    SDL_sem *wait_done;
-};
-
-/* Create a condition variable */
-DECLSPEC SDL_cond *SDLCALL
-SDL_CreateCond(void)
-{
-    SDL_cond *cond;
-
-    cond = (SDL_cond *) SDL_malloc(sizeof(SDL_cond));
-    if (cond) {
-        cond->lock = SDL_CreateMutex();
-        cond->wait_sem = SDL_CreateSemaphore(0);
-        cond->wait_done = SDL_CreateSemaphore(0);
-        cond->waiting = cond->signals = 0;
-        if (!cond->lock || !cond->wait_sem || !cond->wait_done) {
-            SDL_DestroyCond(cond);
-            cond = NULL;
-        }
-    } else {
-        SDL_OutOfMemory();
-    }
-    return (cond);
-}
-
-/* Destroy a condition variable */
-DECLSPEC void SDLCALL
-SDL_DestroyCond(SDL_cond * cond)
-{
-    if (cond) {
-        if (cond->wait_sem) {
-            SDL_DestroySemaphore(cond->wait_sem);
-        }
-        if (cond->wait_done) {
-            SDL_DestroySemaphore(cond->wait_done);
-        }
-        if (cond->lock) {
-            SDL_DestroyMutex(cond->lock);
-        }
-        SDL_free(cond);
-    }
-}
-
-/* Restart one of the threads that are waiting on the condition variable */
-DECLSPEC int SDLCALL
-SDL_CondSignal(SDL_cond * cond)
-{
-    if (!cond) {
-        SDL_SetError("Passed a NULL condition variable");
-        return -1;
-    }
-
-    /* If there are waiting threads not already signalled, then
-       signal the condition and wait for the thread to respond.
-     */
-    SDL_LockMutex(cond->lock);
-    if (cond->waiting > cond->signals) {
-        ++cond->signals;
-        SDL_SemPost(cond->wait_sem);
-        SDL_UnlockMutex(cond->lock);
-        SDL_SemWait(cond->wait_done);
-    } else {
-        SDL_UnlockMutex(cond->lock);
-    }
-
-    return 0;
-}
-
-/* Restart all threads that are waiting on the condition variable */
-DECLSPEC int SDLCALL
-SDL_CondBroadcast(SDL_cond * cond)
-{
-    if (!cond) {
-        SDL_SetError("Passed a NULL condition variable");
-        return -1;
-    }
-
-    /* If there are waiting threads not already signalled, then
-       signal the condition and wait for the thread to respond.
-     */
-    SDL_LockMutex(cond->lock);
-    if (cond->waiting > cond->signals) {
-        int i, num_waiting;
-
-        num_waiting = (cond->waiting - cond->signals);
-        cond->signals = cond->waiting;
-        for (i = 0; i < num_waiting; ++i) {
-            SDL_SemPost(cond->wait_sem);
-        }
-        /* Now all released threads are blocked here, waiting for us.
-           Collect them all (and win fabulous prizes!) :-)
-         */
-        SDL_UnlockMutex(cond->lock);
-        for (i = 0; i < num_waiting; ++i) {
-            SDL_SemWait(cond->wait_done);
-        }
-    } else {
-        SDL_UnlockMutex(cond->lock);
-    }
-
-    return 0;
-}
-
-/* Wait on the condition variable for at most 'ms' milliseconds.
-   The mutex must be locked before entering this function!
-   The mutex is unlocked during the wait, and locked again after the wait.
-
-Typical use:
-
-Thread A:
-	SDL_LockMutex(lock);
-	while ( ! condition ) {
-		SDL_CondWait(cond);
-	}
-	SDL_UnlockMutex(lock);
-
-Thread B:
-	SDL_LockMutex(lock);
-	...
-	condition = true;
-	...
-	SDL_UnlockMutex(lock);
- */
-DECLSPEC int SDLCALL
-SDL_CondWaitTimeout(SDL_cond * cond, SDL_mutex * mutex, Uint32 ms)
-{
-    int retval;
-
-    if (!cond) {
-        SDL_SetError("Passed a NULL condition variable");
-        return -1;
-    }
-
-    /* Obtain the protection mutex, and increment the number of waiters.
-       This allows the signal mechanism to only perform a signal if there
-       are waiting threads.
-     */
-    SDL_LockMutex(cond->lock);
-    ++cond->waiting;
-    SDL_UnlockMutex(cond->lock);
-
-    /* Unlock the mutex, as is required by condition variable semantics */
-    SDL_UnlockMutex(mutex);
-
-    /* Wait for a signal */
-    if (ms == SDL_MUTEX_MAXWAIT) {
-        retval = SDL_SemWait(cond->wait_sem);
-    } else {
-        retval = SDL_SemWaitTimeout(cond->wait_sem, ms);
-    }
-
-    /* Let the signaler know we have completed the wait, otherwise
-       the signaler can race ahead and get the condition semaphore
-       if we are stopped between the mutex unlock and semaphore wait,
-       giving a deadlock.  See the following URL for details:
-       http://www-classic.be.com/aboutbe/benewsletter/volume_III/Issue40.html
-     */
-    SDL_LockMutex(cond->lock);
-    if (cond->signals > 0) {
-        /* If we timed out, we need to eat a condition signal */
-        if (retval > 0) {
-            SDL_SemWait(cond->wait_sem);
-        }
-        /* We always notify the signal thread that we are done */
-        SDL_SemPost(cond->wait_done);
-
-        /* Signal handshake complete */
-        --cond->signals;
-    }
-    --cond->waiting;
-    SDL_UnlockMutex(cond->lock);
-
-    /* Lock the mutex, as is required by condition variable semantics */
-    SDL_LockMutex(mutex);
-
-    return retval;
-}
-
-/* Wait on the condition variable forever */
-DECLSPEC int SDLCALL
-SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex)
-{
-    return SDL_CondWaitTimeout(cond, mutex, SDL_MUTEX_MAXWAIT);
-}
-
-/* vi: set ts=4 sw=4 expandtab: */

src/thread/os2/SDL_syscond_c.h

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-/* vi: set ts=4 sw=4 expandtab: */

src/thread/os2/SDL_sysmutex.c

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* Mutex functions using the OS/2 API */
-
-#define INCL_DOSERRORS
-#define INCL_DOSSEMAPHORES
-#include <os2.h>
-
-#include "SDL_mutex.h"
-
-
-struct SDL_mutex
-{
-    HMTX hmtxID;
-};
-
-/* Create a mutex */
-DECLSPEC SDL_mutex *SDLCALL
-SDL_CreateMutex(void)
-{
-    SDL_mutex *mutex;
-    APIRET ulrc;
-
-    /* Allocate mutex memory */
-    mutex = (SDL_mutex *) SDL_malloc(sizeof(*mutex));
-    if (mutex) {
-        /* Create the mutex, with initial value signaled */
-        ulrc = DosCreateMutexSem(NULL,  // Create unnamed semaphore
-                                 &(mutex->hmtxID),      // Pointer to handle
-                                 0L,    // Flags: create it private (not shared)
-                                 FALSE);        // Initial value: unowned
-        if (ulrc != NO_ERROR) {
-            SDL_SetError("Couldn't create mutex");
-            SDL_free(mutex);
-            mutex = NULL;
-        }
-    } else {
-        SDL_OutOfMemory();
-    }
-    return (mutex);
-}
-
-/* Free the mutex */
-DECLSPEC void SDLCALL
-SDL_DestroyMutex(SDL_mutex * mutex)
-{
-    if (mutex) {
-        if (mutex->hmtxID) {
-            DosCloseMutexSem(mutex->hmtxID);
-            mutex->hmtxID = 0;
-        }
-        SDL_free(mutex);
-    }
-}
-
-/* Lock the mutex */
-DECLSPEC int SDLCALL
-SDL_mutexP(SDL_mutex * mutex)
-{
-    if (mutex == NULL) {
-        SDL_SetError("Passed a NULL mutex");
-        return -1;
-    }
-    if (DosRequestMutexSem(mutex->hmtxID, SEM_INDEFINITE_WAIT) != NO_ERROR) {
-        SDL_SetError("Couldn't wait on mutex");
-        return -1;
-    }
-    return (0);
-}
-
-/* Unlock the mutex */
-DECLSPEC int SDLCALL
-SDL_mutexV(SDL_mutex * mutex)
-{
-    if (mutex == NULL) {
-        SDL_SetError("Passed a NULL mutex");
-        return -1;
-    }
-    if (DosReleaseMutexSem(mutex->hmtxID) != NO_ERROR) {
-        SDL_SetError("Couldn't release mutex");
-        return -1;
-    }
-    return (0);
-}
-
-/* vi: set ts=4 sw=4 expandtab: */

src/thread/os2/SDL_syssem.c

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* Semaphore functions using the OS/2 API */
-
-#define INCL_DOS
-#define INCL_DOSERRORS
-#define INCL_DOSSEMAPHORES
-#include <os2.h>
-
-#include "SDL_thread.h"
-#include "SDL_timer.h"
-
-
-struct SDL_semaphore
-{
-    HMTX id;
-    HEV changed;
-    Uint32 value;
-};
-
-
-/* Create a semaphore */
-DECLSPEC SDL_sem *SDLCALL
-SDL_CreateSemaphore(Uint32 initial_value)
-{
-    SDL_sem *sem;
-    ULONG ulrc;
-
-    /* Allocate sem memory */
-    sem = (SDL_sem *) SDL_malloc(sizeof(*sem));
-    if (sem) {
-        /* Create the mutex semaphore */
-        ulrc = DosCreateMutexSem(NULL, &(sem->id), 0, TRUE);
-        if (ulrc) {
-            SDL_SetError("Couldn't create semaphore");
-            SDL_free(sem);
-            sem = NULL;
-        } else {
-            DosCreateEventSem(NULL, &(sem->changed), 0, FALSE);
-            sem->value = initial_value;
-            DosReleaseMutexSem(sem->id);
-        }
-    } else {
-        SDL_OutOfMemory();
-    }
-    return (sem);
-}
-
-/* Free the semaphore */
-DECLSPEC void SDLCALL
-SDL_DestroySemaphore(SDL_sem * sem)
-{
-    if (sem) {
-        if (sem->id) {
-            DosCloseEventSem(sem->changed);
-            DosCloseMutexSem(sem->id);
-            sem->id = 0;
-        }
-        SDL_free(sem);
-    }
-}
-
-DECLSPEC int SDLCALL
-SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout)
-{
-    ULONG ulrc;
-
-    if (!sem) {
-        SDL_SetError("Passed a NULL sem");
-        return -1;
-    }
-
-    if (timeout == SDL_MUTEX_MAXWAIT) {
-        while (1) {
-            ulrc = DosRequestMutexSem(sem->id, SEM_INDEFINITE_WAIT);
-            if (ulrc) {
-                /* if error waiting mutex */
-                SDL_SetError("DosRequestMutexSem() failed");
-                return -1;
-            } else if (sem->value) {
-                sem->value--;
-                DosReleaseMutexSem(sem->id);
-                return 0;
-            } else {
-                ULONG ulPostCount;
-                DosResetEventSem(sem->changed, &ulPostCount);
-                DosReleaseMutexSem(sem->id);
-                /* continue waiting until somebody posts the semaphore */
-                DosWaitEventSem(sem->changed, SEM_INDEFINITE_WAIT);
-            }
-        }
-    } else if (timeout == 0) {
-        ulrc = DosRequestMutexSem(sem->id, SEM_INDEFINITE_WAIT);
-        if (ulrc == NO_ERROR) {
-            if (sem->value) {
-                sem->value--;
-                DosReleaseMutexSem(sem->id);
-                return 0;
-            } else {
-                DosReleaseMutexSem(sem->id);
-                return SDL_MUTEX_TIMEDOUT;
-            }
-        } else {
-            SDL_SetError("DosRequestMutexSem() failed");
-            return -1;
-        }
-    } else {
-        ulrc = DosRequestMutexSem(sem->id, SEM_INDEFINITE_WAIT);
-        if (ulrc) {
-            /* if error waiting mutex */
-            SDL_SetError("DosRequestMutexSem() failed");
-            return -1;
-        } else if (sem->value) {
-            sem->value--;
-            DosReleaseMutexSem(sem->id);
-            return 0;
-        } else {
-            ULONG ulPostCount;
-            DosResetEventSem(sem->changed, &ulPostCount);
-            DosReleaseMutexSem(sem->id);
-            /* continue waiting until somebody posts the semaphore */
-            ulrc = DosWaitEventSem(sem->changed, timeout);
-            if (ulrc == NO_ERROR)
-                return 0;
-            else
-                return SDL_MUTEX_TIMEDOUT;
-        }
-    }
-    /* never reached */
-    return -1;
-}
-
-DECLSPEC int SDLCALL
-SDL_SemTryWait(SDL_sem * sem)
-{
-    return SDL_SemWaitTimeout(sem, 0);
-}
-
-DECLSPEC int SDLCALL
-SDL_SemWait(SDL_sem * sem)
-{
-    return SDL_SemWaitTimeout(sem, SDL_MUTEX_MAXWAIT);
-}
-
-/* Returns the current count of the semaphore */
-DECLSPEC Uint32 SDLCALL
-SDL_SemValue(SDL_sem * sem)
-{
-    if (!sem) {
-        SDL_SetError("Passed a NULL sem");
-        return 0;
-    }
-    return sem->value;
-}
-
-DECLSPEC int SDLCALL
-SDL_SemPost(SDL_sem * sem)
-{
-    if (!sem) {
-        SDL_SetError("Passed a NULL sem");
-        return -1;
-    }
-    if (DosRequestMutexSem(sem->id, SEM_INDEFINITE_WAIT)) {
-        SDL_SetError("DosRequestMutexSem() failed");
-        return -1;
-    }
-    sem->value++;
-    DosPostEventSem(sem->changed);
-    DosReleaseMutexSem(sem->id);
-    return 0;
-}
-
-/* vi: set ts=4 sw=4 expandtab: */

src/thread/os2/SDL_systhread.c

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* OS/2 thread management routines for SDL */
-
-#include <process.h>
-#define INCL_DOSERRORS
-#define INCL_DOSPROCESS
-#include <os2.h>
-
-#include "SDL_thread.h"
-#include "../SDL_systhread.h"
-#include "../SDL_thread_c.h"
-
-typedef struct ThreadStartParms
-{
-    void *args;
-    pfnSDL_CurrentEndThread pfnCurrentEndThread;
-} tThreadStartParms, *pThreadStartParms;
-
-static void
-threadfunc(void *pparm)
-{
-    pThreadStartParms pThreadParms = pparm;
-    pfnSDL_CurrentEndThread pfnCurrentEndThread = NULL;
-
-    // Call the thread function!
-    SDL_RunThread(pThreadParms->args);
-
-    // Get the current endthread we have to use!
-    if (pThreadParms) {
-        pfnCurrentEndThread = pThreadParms->pfnCurrentEndThread;
-        SDL_free(pThreadParms);
-    }
-    // Call endthread!
-    if (pfnCurrentEndThread)
-        (*pfnCurrentEndThread) ();
-}
-
-int
-SDL_SYS_CreateThread(SDL_Thread * thread, void *args,
-                     pfnSDL_CurrentBeginThread pfnBeginThread,
-                     pfnSDL_CurrentEndThread pfnEndThread)
-{
-    pThreadStartParms pThreadParms = SDL_malloc(sizeof(tThreadStartParms));
-    if (!pThreadParms) {
-        SDL_SetError("Not enough memory to create thread");
-        return (-1);
-    }
-    // Save the function which we will have to call to clear the RTL of calling app!
-    pThreadParms->pfnCurrentEndThread = pfnEndThread;
-    // Also save the real parameters we have to pass to thread function
-    pThreadParms->args = args;
-    // Start the thread using the runtime library of calling app!
-    thread->threadid = thread->handle =
-        (*pfnBeginThread) (threadfunc, NULL, 512 * 1024, pThreadParms);
-    if ((int) thread->threadid <= 0) {
-        SDL_SetError("Not enough resources to create thread");
-        return (-1);
-    }
-    return (0);
-}
-
-void
-SDL_SYS_SetupThread(void)
-{
-    return;
-}
-
-DECLSPEC Uint32 SDLCALL
-SDL_ThreadID(void)
-{
-    PTIB tib;
-    DosGetInfoBlocks(&tib, NULL);
-    return ((Uint32) (tib->tib_ptib2->tib2_ultid));
-}
-
-void
-SDL_SYS_WaitThread(SDL_Thread * thread)
-{
-    TID tid = thread->handle;
-    DosWaitThread(&tid, DCWW_WAIT);
-}
-
-/* vi: set ts=4 sw=4 expandtab: */

src/thread/os2/SDL_systhread_c.h

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#define INCL_DOSPROCESS
-#include <os2.h>
-
-typedef TID SYS_ThreadHandle;
-/* vi: set ts=4 sw=4 expandtab: */

src/timer/os2/SDL_systimer.c

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#ifdef SDL_TIMER_OS2
-
-#define INCL_DOSMISC
-#define INCL_DOSERRORS
-#define INCL_DOSSEMAPHORES
-#define INCL_DOSDATETIME
-#define INCL_DOSPROCESS
-#define INCL_DOSPROFILE
-#define INCL_DOSEXCEPTIONS
-#include <os2.h>
-
-#include "SDL_thread.h"
-#include "SDL_timer.h"
-#include "../SDL_timer_c.h"
-
-
-#define TIME_WRAP_VALUE (~(DWORD)0)
-
-/* The first high-resolution ticks value of the application */
-static long long hires_start_ticks;
-/* The number of ticks per second of the high-resolution performance counter */
-static ULONG hires_ticks_per_second;
-
-void
-SDL_StartTicks(void)
-{
-    DosTmrQueryFreq(&hires_ticks_per_second);
-    DosTmrQueryTime((PQWORD) & hires_start_ticks);
-}
-
-DECLSPEC Uint32 SDLCALL
-SDL_GetTicks(void)
-{
-    long long hires_now;
-    ULONG ticks = ticks;
-
-    DosTmrQueryTime((PQWORD) & hires_now);
-/*
-        hires_now -= hires_start_ticks;
-        hires_now *= 1000;
-        hires_now /= hires_ticks_per_second;
-*/
-    /* inline asm to avoid runtime inclusion */
-    /* *INDENT-OFF* */
-    _asm {
-        push edx
-        push eax
-        mov eax, dword ptr hires_now
-        mov edx, dword ptr hires_now + 4
-        sub eax, dword ptr hires_start_ticks
-        sbb edx, dword ptr hires_start_ticks + 4
-        mov ebx, 1000
-        mov ecx, edx
-        mul ebx
-        push eax
-        push edx
-        mov eax, ecx
-        mul ebx
-        pop eax
-        add edx, eax
-        pop eax
-        mov ebx, dword ptr hires_ticks_per_second
-        div ebx
-        mov dword ptr ticks, eax
-        pop edx
-        pop eax
-    }
-    /* *INDENT-ON* */
-
-    return ticks;
-
-}
-
-/* High resolution sleep, originally made by Ilya Zakharevich */
-DECLSPEC void SDLCALL
-SDL_Delay(Uint32 ms)
-{
-    /* This is similar to DosSleep(), but has 8ms granularity in time-critical
-       threads even on Warp3. */
-    HEV hevEvent1 = 0;          /* Event semaphore handle    */
-    HTIMER htimerEvent1 = 0;    /* Timer handle              */
-    APIRET rc = NO_ERROR;       /* Return code               */
-    int ret = 1;
-    ULONG priority = 0, nesting;        /* Shut down the warnings */
-    PPIB pib;
-    PTIB tib;
-    char *e = NULL;
-    APIRET badrc;
-    int switch_priority = 50;
-
-    DosCreateEventSem(NULL,     /* Unnamed */
-                      &hevEvent1,       /* Handle of semaphore returned */
-                      DC_SEM_SHARED,    /* Shared needed for DosAsyncTimer */
-                      FALSE);   /* Semaphore is in RESET state  */
-
-    if (ms >= switch_priority)
-        switch_priority = 0;
-    if (switch_priority) {
-        if (DosGetInfoBlocks(&tib, &pib) != NO_ERROR)
-            switch_priority = 0;
-        else {
-            /* In Warp3, to switch scheduling to 8ms step, one needs to do 
-               DosAsyncTimer() in time-critical thread.  On laters versions,
-               more and more cases of wait-for-something are covered.
-
-               It turns out that on Warp3fp42 it is the priority at the time
-               of DosAsyncTimer() which matters.  Let's hope that this works
-               with later versions too...  XXXX
-             */
-            priority = (tib->tib_ptib2->tib2_ulpri);
-            if ((priority & 0xFF00) == 0x0300)  /* already time-critical */
-                switch_priority = 0;
-            /* Make us time-critical.  Just modifying TIB is not enough... */
-            /* tib->tib_ptib2->tib2_ulpri = 0x0300; */
-            /* We do not want to run at high priority if a signal causes us
-               to longjmp() out of this section... */
-            if (DosEnterMustComplete(&nesting))
-                switch_priority = 0;
-            else
-                DosSetPriority(PRTYS_THREAD, PRTYC_TIMECRITICAL, 0, 0);
-        }
-    }
-
-    if ((badrc = DosAsyncTimer(ms, (HSEM) hevEvent1,    /* Semaphore to post        */
-                               &htimerEvent1))) /* Timer handler (returned) */
-        e = "DosAsyncTimer";
-
-    if (switch_priority && tib->tib_ptib2->tib2_ulpri == 0x0300) {
-        /* Nobody switched priority while we slept...  Ignore errors... */
-        /* tib->tib_ptib2->tib2_ulpri = priority; *//* Get back... */
-        if (!
-            (rc = DosSetPriority(PRTYS_THREAD, (priority >> 8) & 0xFF, 0, 0)))
-            rc = DosSetPriority(PRTYS_THREAD, 0, priority & 0xFF, 0);
-    }
-    if (switch_priority)
-        rc = DosExitMustComplete(&nesting);     /* Ignore errors */
-
-    /* The actual blocking call is made with "normal" priority.  This way we
-       should not bother with DosSleep(0) etc. to compensate for us interrupting
-       higher-priority threads.  The goal is to prohibit the system spending too
-       much time halt()ing, not to run us "no matter what". */
-    if (!e)                     /* Wait for AsyncTimer event */
-        badrc = DosWaitEventSem(hevEvent1, SEM_INDEFINITE_WAIT);
-
-    if (e);                     /* Do nothing */
-    else if (badrc == ERROR_INTERRUPT)
-        ret = 0;
-    else if (badrc)
-        e = "DosWaitEventSem";
-    if ((rc = DosCloseEventSem(hevEvent1)) && !e) {     /* Get rid of semaphore */
-        e = "DosCloseEventSem";
-        badrc = rc;
-    }
-    if (e) {
-        SDL_SetError("[SDL_Delay] : Had error in %s(), rc is 0x%x\n", e,
-                     badrc);
-    }
-}
-
-/* Data to handle a single periodic alarm */
-static int timer_alive = 0;
-static SDL_Thread *timer = NULL;
-
-static int SDLCALL
-RunTimer(void *unused)
-{
-    DosSetPriority(PRTYS_THREAD, PRTYC_TIMECRITICAL, 0, 0);
-    while (timer_alive) {
-        if (SDL_timer_running) {
-            SDL_ThreadedTimerCheck();
-        }
-        SDL_Delay(10);
-    }
-    return (0);
-}
-
-/* This is only called if the event thread is not running */
-int
-SDL_SYS_TimerInit(void)
-{
-    timer_alive = 1;
-    timer = SDL_CreateThread(RunTimer, NULL);
-    if (timer == NULL)
-        return (-1);
-    return (SDL_SetTimerThreaded(1));
-}
-
-void
-SDL_SYS_TimerQuit(void)
-{
-    timer_alive = 0;
-    if (timer) {
-        SDL_WaitThread(timer, NULL);
-        timer = NULL;
-    }
-}
-
-int
-SDL_SYS_StartTimer(void)
-{
-    SDL_SetError("Internal logic error: OS/2 uses threaded timer");
-    return (-1);
-}
-
-void
-SDL_SYS_StopTimer(void)
-{
-    return;
-}
-
-#endif /* SDL_TIMER_OS2 */
-/* vi: set ts=4 sw=4 expandtab: */

src/video/SDL_sysvideo.h

@@ -395,9 +395,6 @@ extern VideoBootStrap DC_bootstrap;
 #if SDL_VIDEO_DRIVER_RISCOS
 extern VideoBootStrap RISCOS_bootstrap;
 #endif
-#if SDL_VIDEO_DRIVER_OS2FS
-extern VideoBootStrap OS2FSLib_bootstrap;
-#endif
 #if SDL_VIDEO_DRIVER_UIKIT
 extern VideoBootStrap UIKIT_bootstrap;
 #endif

src/video/SDL_video.c

@@ -109,9 +109,6 @@ static VideoBootStrap *bootstrap[] = {
 #if SDL_VIDEO_DRIVER_RISCOS
     &RISCOS_bootstrap,
 #endif
-#if SDL_VIDEO_DRIVER_OS2FS
-    &OS2FSLib_bootstrap,
-#endif
 #if SDL_VIDEO_DRIVER_NDS
     &NDS_bootstrap,
 #endif

src/video/os2fslib/SDL_os2fslib.h

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#ifndef _SDL_os2fslib_h
-#define _SDL_os2fslib_h
-
-
-// OS2 specific includes
-#define INCL_TYPES
-#define INCL_DOS
-#define INCL_DOSERRORS
-#define INCL_DOSPROCESS
-#define INCL_WIN
-#define INCL_GPI
-#include <os2.h>
-
-#include <FSLib.h>
-
-/* Hidden "this" pointer for the video functions */
-#define _THIS	SDL_VideoDevice *_this
-
-/* Private display data */
-struct SDL_PrivateVideoData
-{
-    FSLib_VideoMode_p pAvailableFSLibVideoModes;
-    SDL_Rect **pListModesResult;        // Allocated memory to return list of modes for os2fslib_ListModes() API
-
-    FSLib_VideoMode SrcBufferDesc;      // Description of current source image buffer
-    char *pchSrcBuffer;         // The source image buffer itself
-    SDL_Surface *pSDLSurface;   // The SDL surface describing the buffer
-    HMTX hmtxUseSrcBuffer;      // Mutex semaphore to manipulate src buffer
-    HWND hwndFrame, hwndClient; // Window handle of frame and client
-    int iPMThreadStatus;        // 0: Not running
-    // 1: Running
-    // Other: Not running, had an error
-    int tidPMThread;            // Thread ID of PM Thread
-    int fInFocus;               // True if we're in focus!
-    int iSkipWMMOUSEMOVE;       // Number of WM_MOUSEMOVE messages to skip!
-    int iMouseVisible;          //
-
-    PFNWP pfnOldFrameProc;      // Old window frame procedure
-    int bProportionalResize;    // 0: No proportional resizing
-    // 1: Do proportional resizing
-    ULONG ulResizingFlag;       // First resizing flag value
-};
-
-/* OS/2 specific backdoor function to be able to set FrameControlFlags of */
-/* the SDL window before creating it. */
-extern DECLSPEC void SDLCALL SDL_OS2FSLIB_SetFCFToUse(ULONG ulFCF);
-
-#endif /* _SDL_os2fslib_h */
-/* vi: set ts=4 sw=4 expandtab: */

src/video/os2fslib/SDL_vkeys.h

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef VK_0
-#define VK_0	'0'
-#define VK_1	'1'
-#define VK_2	'2'
-#define VK_3	'3'
-#define VK_4	'4'
-#define VK_5	'5'
-#define VK_6	'6'
-#define VK_7	'7'
-#define VK_8	'8'
-#define VK_9	'9'
-#define VK_A	'A'
-#define VK_B	'B'
-#define VK_C	'C'
-#define VK_D	'D'
-#define VK_E	'E'
-#define VK_F	'F'
-#define VK_G	'G'
-#define VK_H	'H'
-#define VK_I	'I'
-#define VK_J	'J'
-#define VK_K	'K'
-#define VK_L	'L'
-#define VK_M	'M'
-#define VK_N	'N'
-#define VK_O	'O'
-#define VK_P	'P'
-#define VK_Q	'Q'
-#define VK_R	'R'
-#define VK_S	'S'
-#define VK_T	'T'
-#define VK_U	'U'
-#define VK_V	'V'
-#define VK_W	'W'
-#define VK_X	'X'
-#define VK_Y	'Y'
-#define VK_Z	'Z'
-#endif /* VK_0 */
-
-/* These keys haven't been defined, but were experimentally determined */
-#define VK_SEMICOLON	0xBA
-#define VK_EQUALS	0xBB
-#define VK_COMMA	0xBC
-#define VK_MINUS	0xBD
-#define VK_PERIOD	0xBE
-#define VK_SLASH	0xBF
-#define VK_GRAVE	0xC0
-#define VK_LBRACKET	0xDB
-#define VK_BACKSLASH	0xDC
-#define VK_RBRACKET	0xDD
-#define VK_APOSTROPHE	0xDE
-#define VK_BACKTICK	0xDF
-/* vi: set ts=4 sw=4 expandtab: */