sdl-ios-xcode: src/power/SDL

annotate src/power/SDL_power.c @ 4426:1bceff8f008f

Fixed bug #943 Ozkan Sezer 2010-02-06 12:31:06 PST Hi: Here are some small fixes for compiling SDL against mingw-w64. (see http://mingw-w64.sourceforge.net/ . Despite the name, it supports both win32 and win64.) src/audio/windx5/directx.h and src/video/windx5/directx.h (both SDL-1.2 and SDL-1.3.) I get compilation errors about some union not having a member named u1 and alike, because of other system headers being included before this one and them already defining DUMMYUNIONNAME and stuff. This header probably assumes that those stuff are defined in windef.h, but mingw-w64 headers define them in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to the top of the file. src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) : The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric because _beginthreadex returns uintptr_t, not unsigned long which is 32 bits in win64. Changing the return type to uintptr_t fixes it. video/SDL_blit.h (and configure.in) (SDL-1.3-only) : MinGW-w64 uses msvcrt version of _aligned_malloc and _aligned_free and they are defined in intrin.h (similar to VC). Adding proper ifdefs fixes it. (Notes about macros to check: __MINGW32__ is defined for both mingw.org and for mingw-w64 for both win32 and win64, __MINGW64__ is only defined for _WIN64, so __MINGW64__ can't be used to detect mingw-w64: including _mingw.h and then checking for __MINGW64_VERSION_MAJOR does the trick.) SDL_win32video.h (SDL-1.3-only) : Tweaked the VINWER definition and location in order to avoid multiple redefinition warnings. Hope these are useful. Thanks.

author	Sam Lantinga <slouken@libsdl.org>
date	Wed, 10 Mar 2010 15:02:58 +0000
parents	f7b03b6838cb
children	42e1092225f9

rev	line source
3170 b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	1 /*
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
3697 f7b03b6838cb Fixed bug #926 Sam Lantinga <slouken@libsdl.org> parents: 3272 diff changeset	3 Copyright (C) 1997-2010 Sam Lantinga
3170 b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	4
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	9
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	13 Lesser General Public License for more details.
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	14
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	16 License along with this library; if not, write to the Free Software
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	18
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	19 Sam Lantinga
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	20 slouken@libsdl.org
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	21 */
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	22 #include "SDL_config.h"
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	23 #include "SDL_power.h"
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	24
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	25 /*
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	26 * Returns SDL_TRUE if we have a definitive answer.
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	27 * SDL_FALSE to try next implementation.
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	28 */
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	29 typedef SDL_bool
3186 51750b7a966f indent Sam Lantinga <slouken@libsdl.org> parents: 3174 diff changeset	30 (SDL_GetPowerInfo_Impl) (SDL_PowerState state, int *seconds,
51750b7a966f indent Sam Lantinga <slouken@libsdl.org> parents: 3174 diff changeset	31 int *percent);
3170 b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	32
3186 51750b7a966f indent Sam Lantinga <slouken@libsdl.org> parents: 3174 diff changeset	33 SDL_bool SDL_GetPowerInfo_Linux_proc_acpi(SDL_PowerState , int , int *);
51750b7a966f indent Sam Lantinga <slouken@libsdl.org> parents: 3174 diff changeset	34 SDL_bool SDL_GetPowerInfo_Linux_proc_apm(SDL_PowerState , int , int *);
51750b7a966f indent Sam Lantinga <slouken@libsdl.org> parents: 3174 diff changeset	35 SDL_bool SDL_GetPowerInfo_Windows(SDL_PowerState , int , int *);
51750b7a966f indent Sam Lantinga <slouken@libsdl.org> parents: 3174 diff changeset	36 SDL_bool SDL_GetPowerInfo_MacOSX(SDL_PowerState , int , int *);
51750b7a966f indent Sam Lantinga <slouken@libsdl.org> parents: 3174 diff changeset	37 SDL_bool SDL_GetPowerInfo_BeOS(SDL_PowerState , int , int *);
51750b7a966f indent Sam Lantinga <slouken@libsdl.org> parents: 3174 diff changeset	38 SDL_bool SDL_GetPowerInfo_NintendoDS(SDL_PowerState , int , int *);
3170 b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	39
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	40 #ifndef SDL_POWER_DISABLED
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	41 #ifdef SDL_POWER_HARDWIRED
3272 e8f63b28947d Removed outdated Dreamcast support Sam Lantinga <slouken@libsdl.org> parents: 3269 diff changeset	42 /* This is for things that _never_ have a battery */
3170 b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	43 static SDL_bool
3186 51750b7a966f indent Sam Lantinga <slouken@libsdl.org> parents: 3174 diff changeset	44 SDL_GetPowerInfo_Hardwired(SDL_PowerState * state, int seconds, int percent)
3170 b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	45 {
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	46 *seconds = -1;
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	47 *percent = -1;
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	48 *state = SDL_POWERSTATE_NO_BATTERY;
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	49 return SDL_TRUE;
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	50 }
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	51 #endif
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	52 #endif
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	53
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	54
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	55 static SDL_GetPowerInfo_Impl implementations[] = {
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	56 #ifndef SDL_POWER_DISABLED
3186 51750b7a966f indent Sam Lantinga <slouken@libsdl.org> parents: 3174 diff changeset	57 #ifdef SDL_POWER_LINUX /* in order of preference. More than could work. */
3174 c8b9c6d27476 Fixed some typos and added a couple of includes. All were need to get SDL_power to compile on Linux. Bob Pendleton <bob@pendleton.com> parents: 3173 diff changeset	58 SDL_GetPowerInfo_Linux_proc_acpi,
3170 b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	59 SDL_GetPowerInfo_Linux_proc_apm,
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	60 #endif
3186 51750b7a966f indent Sam Lantinga <slouken@libsdl.org> parents: 3174 diff changeset	61 #ifdef SDL_POWER_WINDOWS /* handles Win32, Win64, PocketPC. */
3170 b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	62 SDL_GetPowerInfo_Windows,
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	63 #endif
3186 51750b7a966f indent Sam Lantinga <slouken@libsdl.org> parents: 3174 diff changeset	64 #ifdef SDL_POWER_MACOSX /* handles Mac OS X, Darwin, iPhone. */
3170 b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	65 SDL_GetPowerInfo_MacOSX,
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	66 #endif
3186 51750b7a966f indent Sam Lantinga <slouken@libsdl.org> parents: 3174 diff changeset	67 #ifdef SDL_POWER_NINTENDODS /* handles Nintendo DS. */
3170 b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	68 SDL_GetPowerInfo_NintendoDS,
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	69 #endif
3186 51750b7a966f indent Sam Lantinga <slouken@libsdl.org> parents: 3174 diff changeset	70 #ifdef SDL_POWER_BEOS /* handles BeOS, Zeta, with euc.jp apm driver. */
3173 510e3f36c04a BeOS support for power subsystem. Ryan C. Gordon <icculus@icculus.org> parents: 3170 diff changeset	71 SDL_GetPowerInfo_BeOS,
510e3f36c04a BeOS support for power subsystem. Ryan C. Gordon <icculus@icculus.org> parents: 3170 diff changeset	72 #endif
3170 b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	73 #ifdef SDL_POWER_HARDWIRED
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	74 SDL_GetPowerInfo_Hardwired,
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	75 #endif
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	76 #endif
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	77 };
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	78
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	79 SDL_PowerState
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	80 SDL_GetPowerInfo(int seconds, int percent)
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	81 {
3186 51750b7a966f indent Sam Lantinga <slouken@libsdl.org> parents: 3174 diff changeset	82 const int total = sizeof(implementations) / sizeof(implementations[0]);
3170 b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	83 int _seconds, _percent;
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	84 SDL_PowerState retval;
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	85 int i;
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	86
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	87 /* Make these never NULL for platform-specific implementations. */
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	88 if (seconds == NULL) {
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	89 seconds = &_seconds;
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	90 }
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	91
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	92 if (percent == NULL) {
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	93 percent = &_percent;
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	94 }
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	95
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	96 for (i = 0; i < total; i++) {
3186 51750b7a966f indent Sam Lantinga <slouken@libsdl.org> parents: 3174 diff changeset	97 if (implementations[i] (&retval, seconds, percent)) {
3170 b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	98 return retval;
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	99 }
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	100 }
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	101
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	102 /* nothing was definitive. */
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	103 *seconds = -1;
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	104 *percent = -1;
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	105 return SDL_POWERSTATE_UNKNOWN;
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	106 }
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	107
b7a48f533966 Initial work on power subsystem for SDL 1.3. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	108 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/power/SDL_power.c @ 4426:1bceff8f008f