From de6f74e7619357c816a2ad2b666b7e8a97c0a819 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Wed, 13 Jun 2018 16:57:05 -0500 Subject: [PATCH] Revert "Give a better description in EmuShared.h" This reverts commit 7ef5a4a8d0165b492ead8aed943d870836ada120. --- src/CxbxKrnl/EmuShared.h | 436 +++++++++++++++++++-------------------- 1 file changed, 218 insertions(+), 218 deletions(-) diff --git a/src/CxbxKrnl/EmuShared.h b/src/CxbxKrnl/EmuShared.h index 98faad1f9..ed116ebc6 100644 --- a/src/CxbxKrnl/EmuShared.h +++ b/src/CxbxKrnl/EmuShared.h @@ -1,224 +1,224 @@ -// ****************************************************************** -// * -// * .,-::::: .,:: .::::::::. .,:: .: -// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; -// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' -// * $$$ Y$$$P $$""""Y$$ Y$$$P -// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, -// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, -// * -// * Cxbx->Win32->CxbxKrnl->EmuShared.h -// * -// * This file is part of the Cxbx project. -// * -// * Cxbx and Cxbe are free software; you can redistribute them -// * and/or modify them under the terms of the GNU General Public -// * License as published by the Free Software Foundation; either -// * version 2 of the license, or (at your option) any later version. -// * -// * This program 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 General Public License for more details. -// * -// * You should have recieved a copy of the GNU General Public License -// * along with this program; see the file COPYING. -// * If not, write to the Free Software Foundation, Inc., -// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. -// * -// * (c) 2002-2003 Aaron Robinson -// * -// * All rights reserved -// * -// ****************************************************************** -#ifndef EMUSHARED_H -#define EMUSHARED_H - -#include "Cxbx.h" -#include "Common/Win32/XBController.h" -#include "Common/Win32/XBVideo.h" -#include "Common/Win32/XBAudio.h" - -#include - -enum { - XBOX_LED_COLOUR_OFF, - XBOX_LED_COLOUR_GREEN, - XBOX_LED_COLOUR_RED, - XBOX_LED_COLOUR_ORANGE, -}; - -enum { - LLE_APU = 1 << 0, - LLE_GPU = 1 << 1, - LLE_JIT = 1 << 2, -}; - -// ****************************************************************** -// * EmuShared : Shared memory -// ****************************************************************** -class EmuShared : public Mutex -{ - public: - int m_RefCount; - - // ****************************************************************** - // * Each process needs to call this to initialize shared memory - // ****************************************************************** - static void Init(); - - void EmuShared::Load(); - void EmuShared::Save(); - - // ****************************************************************** - // * Each process needs to call this to cleanup shared memory - // ****************************************************************** - static void Cleanup(); - - // ****************************************************************** - // * Xbox Video Accessors - // ****************************************************************** - void GetXBVideo( XBVideo *video) { Lock(); *video = XBVideo(m_XBVideo); Unlock(); } - void SetXBVideo(const XBVideo *video) { Lock(); m_XBVideo = XBVideo(*video); Unlock(); } - - // ****************************************************************** - // * Xbox Audio Accessors - // ****************************************************************** - void GetXBAudio( XBAudio *audio) { Lock(); *audio = XBAudio(m_XBAudio); Unlock(); } - void SetXBAudio(const XBAudio *audio) { Lock(); m_XBAudio = XBAudio(*audio); Unlock(); } - - // ****************************************************************** - // * Xbox Controller Accessors - // ****************************************************************** - void GetXBController( XBController *ctrl) { Lock(); *ctrl = XBController(m_XBController); Unlock(); } - void SetXBController(const XBController *ctrl) { Lock(); m_XBController = XBController(*ctrl); Unlock(); } - - // ****************************************************************** - // * Xbe Path Accessors - // ****************************************************************** - void GetXbePath( char *path) { Lock(); strcpy(path, m_XbePath); Unlock(); } - void SetXbePath(const char *path) { Lock(); strcpy(m_XbePath, path); Unlock(); } - - // ****************************************************************** - // * LLE Flags Accessors - // ****************************************************************** - void GetFlagsLLE( int *flags) { Lock(); *flags = m_FlagsLLE; Unlock(); } - void SetFlagsLLE(const int *flags) { Lock(); m_FlagsLLE = *flags; Unlock(); } - - // ****************************************************************** - // * Boot flag Accessors - // ****************************************************************** - void GetBootFlags(int *value) { Lock(); *value = m_BootFlags; Unlock(); } - void SetBootFlags(int *value) { Lock(); m_BootFlags = *value; Unlock(); } - - // ****************************************************************** - // * XInput Flag Accessors - // ****************************************************************** - void GetXInputEnabled(int* value) { Lock(); *value = m_XInputEnabled; Unlock(); } - void SetXInputEnabled(int* value) { Lock(); m_XInputEnabled = *value; Unlock(); } - - // ****************************************************************** - // * Hack Flag Accessors - // ****************************************************************** - void GetDisablePixelShaders(int* value) { Lock(); *value = m_DisablePixelShaders; Unlock(); } - void SetDisablePixelShaders(int* value) { Lock(); m_DisablePixelShaders = *value; Unlock(); } - void GetUncapFramerate(int* value) { Lock(); *value = m_UncapFramerate; Unlock(); } - void SetUncapFramerate(int* value) { Lock(); m_UncapFramerate = *value; Unlock(); } - void GetUseAllCores(int* value) { Lock(); *value = m_UseAllCores; Unlock(); } - void SetUseAllCores(int* value) { Lock(); m_UseAllCores = *value; Unlock(); } - void GetSkipRdtscPatching(int* value) { Lock(); *value = m_SkipRdtscPatching; Unlock(); } - void SetSkipRdtscPatching(int* value) { Lock(); m_SkipRdtscPatching = *value; Unlock(); } - void GetScaleViewport(int* value) { Lock(); *value = m_ScaleViewport; Unlock(); } +// ****************************************************************** +// * +// * .,-::::: .,:: .::::::::. .,:: .: +// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; +// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' +// * $$$ Y$$$P $$""""Y$$ Y$$$P +// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, +// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, +// * +// * Cxbx->Win32->CxbxKrnl->EmuShared.h +// * +// * This file is part of the Cxbx project. +// * +// * Cxbx and Cxbe are free software; you can redistribute them +// * and/or modify them under the terms of the GNU General Public +// * License as published by the Free Software Foundation; either +// * version 2 of the license, or (at your option) any later version. +// * +// * This program 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 General Public License for more details. +// * +// * You should have recieved a copy of the GNU General Public License +// * along with this program; see the file COPYING. +// * If not, write to the Free Software Foundation, Inc., +// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. +// * +// * (c) 2002-2003 Aaron Robinson +// * +// * All rights reserved +// * +// ****************************************************************** +#ifndef EMUSHARED_H +#define EMUSHARED_H + +#include "Cxbx.h" +#include "Common/Win32/XBController.h" +#include "Common/Win32/XBVideo.h" +#include "Common/Win32/XBAudio.h" + +#include + +enum { + XBOX_LED_COLOUR_OFF, + XBOX_LED_COLOUR_GREEN, + XBOX_LED_COLOUR_RED, + XBOX_LED_COLOUR_ORANGE, +}; + +enum { + LLE_APU = 1 << 0, + LLE_GPU = 1 << 1, + LLE_JIT = 1 << 2, +}; + +// ****************************************************************** +// * EmuShared : Shared memory +// ****************************************************************** +class EmuShared : public Mutex +{ + public: + int m_RefCount; + + // ****************************************************************** + // * Each process needs to call this to initialize shared memory + // ****************************************************************** + static void Init(); + + void EmuShared::Load(); + void EmuShared::Save(); + + // ****************************************************************** + // * Each process needs to call this to cleanup shared memory + // ****************************************************************** + static void Cleanup(); + + // ****************************************************************** + // * Xbox Video Accessors + // ****************************************************************** + void GetXBVideo( XBVideo *video) { Lock(); *video = XBVideo(m_XBVideo); Unlock(); } + void SetXBVideo(const XBVideo *video) { Lock(); m_XBVideo = XBVideo(*video); Unlock(); } + + // ****************************************************************** + // * Xbox Audio Accessors + // ****************************************************************** + void GetXBAudio( XBAudio *audio) { Lock(); *audio = XBAudio(m_XBAudio); Unlock(); } + void SetXBAudio(const XBAudio *audio) { Lock(); m_XBAudio = XBAudio(*audio); Unlock(); } + + // ****************************************************************** + // * Xbox Controller Accessors + // ****************************************************************** + void GetXBController( XBController *ctrl) { Lock(); *ctrl = XBController(m_XBController); Unlock(); } + void SetXBController(const XBController *ctrl) { Lock(); m_XBController = XBController(*ctrl); Unlock(); } + + // ****************************************************************** + // * Xbe Path Accessors + // ****************************************************************** + void GetXbePath( char *path) { Lock(); strcpy(path, m_XbePath); Unlock(); } + void SetXbePath(const char *path) { Lock(); strcpy(m_XbePath, path); Unlock(); } + + // ****************************************************************** + // * LLE Flags Accessors + // ****************************************************************** + void GetFlagsLLE( int *flags) { Lock(); *flags = m_FlagsLLE; Unlock(); } + void SetFlagsLLE(const int *flags) { Lock(); m_FlagsLLE = *flags; Unlock(); } + + // ****************************************************************** + // * Boot flag Accessors + // ****************************************************************** + void GetBootFlags(int *value) { Lock(); *value = m_BootFlags; Unlock(); } + void SetBootFlags(int *value) { Lock(); m_BootFlags = *value; Unlock(); } + + // ****************************************************************** + // * XInput Flag Accessors + // ****************************************************************** + void GetXInputEnabled(int* value) { Lock(); *value = m_XInputEnabled; Unlock(); } + void SetXInputEnabled(int* value) { Lock(); m_XInputEnabled = *value; Unlock(); } + + // ****************************************************************** + // * Hack Flag Accessors + // ****************************************************************** + void GetDisablePixelShaders(int* value) { Lock(); *value = m_DisablePixelShaders; Unlock(); } + void SetDisablePixelShaders(int* value) { Lock(); m_DisablePixelShaders = *value; Unlock(); } + void GetUncapFramerate(int* value) { Lock(); *value = m_UncapFramerate; Unlock(); } + void SetUncapFramerate(int* value) { Lock(); m_UncapFramerate = *value; Unlock(); } + void GetUseAllCores(int* value) { Lock(); *value = m_UseAllCores; Unlock(); } + void SetUseAllCores(int* value) { Lock(); m_UseAllCores = *value; Unlock(); } + void GetSkipRdtscPatching(int* value) { Lock(); *value = m_SkipRdtscPatching; Unlock(); } + void SetSkipRdtscPatching(int* value) { Lock(); m_SkipRdtscPatching = *value; Unlock(); } + void GetScaleViewport(int* value) { Lock(); *value = m_ScaleViewport; Unlock(); } void SetScaleViewport(int* value) { Lock(); m_ScaleViewport = *value; Unlock(); } - void GetDirectHostBackBufferAccess(int* value) { Lock(); *value = m_DirectHostBackBufferAccess; Unlock(); } - void SetDirectHostBackBufferAccess(int* value) { Lock(); m_DirectHostBackBufferAccess = *value; Unlock(); } + void GetDirectHostBackBufferAccess(int* value) { Lock(); *value = m_DirectHostBackBufferAccess; Unlock(); } + void SetDirectHostBackBufferAccess(int* value) { Lock(); m_DirectHostBackBufferAccess = *value; Unlock(); } + + // ****************************************************************** + // * MSpF/Benchmark values Accessors + // ****************************************************************** + void GetCurrentMSpF(float *value) { Lock(); *value = m_MSpF; Unlock(); } + void SetCurrentMSpF(float *value) { Lock(); m_MSpF = *value; Unlock(); } + + // ****************************************************************** + // * FPS/Benchmark values Accessors + // ****************************************************************** + void GetCurrentFPS(float *value) { Lock(); *value = m_FPS; Unlock(); } + void SetCurrentFPS(float *value) { Lock(); m_FPS = *value; Unlock(); } + + // ****************************************************************** + // * MultiXbe flag Accessors + // ****************************************************************** + void GetMultiXbeFlag(bool *value) { Lock(); *value = m_bMultiXbeFlag; Unlock(); } + void SetMultiXbeFlag(bool *value) { Lock(); m_bMultiXbeFlag = *value; Unlock(); } + + // ****************************************************************** + // * Debugging flag Accessors + // ****************************************************************** + void GetDebuggingFlag(bool *value) { Lock(); *value = m_bDebugging; Unlock(); } + void SetDebuggingFlag(bool *value) { Lock(); m_bDebugging = *value; Unlock(); } + + // ****************************************************************** + // * Xbox LED values Accessors + // ****************************************************************** + void GetLedSequence(int *value) + { + Lock(); + for (int i = 0; i < 4; ++i) + { + value[i] = m_LedSequence[i]; + } + Unlock(); + } + void SetLedSequence(int *value) + { + Lock(); + for (int i = 0; i < 4; ++i) + { + m_LedSequence[i] = value[i]; + } + Unlock(); + } - // ****************************************************************** - // * MSpF/Benchmark values Accessors - // ****************************************************************** - void GetCurrentMSpF(float *value) { Lock(); *value = m_MSpF; Unlock(); } - void SetCurrentMSpF(float *value) { Lock(); m_MSpF = *value; Unlock(); } - - // ****************************************************************** - // * FPS/Benchmark values Accessors - // ****************************************************************** - void GetCurrentFPS(float *value) { Lock(); *value = m_FPS; Unlock(); } - void SetCurrentFPS(float *value) { Lock(); m_FPS = *value; Unlock(); } - - // ****************************************************************** - // * MultiXbe flag Accessors - // ****************************************************************** - void GetMultiXbeFlag(bool *value) { Lock(); *value = m_bMultiXbeFlag; Unlock(); } - void SetMultiXbeFlag(bool *value) { Lock(); m_bMultiXbeFlag = *value; Unlock(); } - - // ****************************************************************** - // * Debugging flag Accessors - // ****************************************************************** - void GetDebuggingFlag(bool *value) { Lock(); *value = m_bDebugging; Unlock(); } - void SetDebuggingFlag(bool *value) { Lock(); m_bDebugging = *value; Unlock(); } - - // ****************************************************************** - // * Xbox LED values Accessors - // ****************************************************************** - void GetLedSequence(int *value) - { - Lock(); - for (int i = 0; i < 4; ++i) - { - value[i] = m_LedSequence[i]; - } - Unlock(); - } - void SetLedSequence(int *value) - { - Lock(); - for (int i = 0; i < 4; ++i) - { - m_LedSequence[i] = value[i]; - } - Unlock(); - } - - // ****************************************************************** - // * File storage location + // ****************************************************************** + // * Xbox LED values Accessors // ****************************************************************** void GetStorageLocation(char *path) { Lock(); strcpy(path, m_StorageLocation); Unlock(); } - void SetStorageLocation(char *path) { Lock(); strcpy(m_StorageLocation, path); Unlock(); } - - private: - // ****************************************************************** - // * Constructor / Deconstructor - // ****************************************************************** - EmuShared(); - ~EmuShared(); - - // ****************************************************************** - // * Shared configuration - // ****************************************************************** - XBController m_XBController; - XBVideo m_XBVideo; - XBAudio m_XBAudio; - char m_XbePath[MAX_PATH]; - int m_BootFlags; - int m_FlagsLLE; - int m_XInputEnabled; - int m_DisablePixelShaders; - int m_UncapFramerate; - int m_UseAllCores; - int m_SkipRdtscPatching; - float m_MSpF; - float m_FPS; - bool m_bMultiXbeFlag; - bool m_bDebugging; - int m_LedSequence[4]; + void SetStorageLocation(char *path) { Lock(); strcpy(m_StorageLocation, path); Unlock(); } + + private: + // ****************************************************************** + // * Constructor / Deconstructor + // ****************************************************************** + EmuShared(); + ~EmuShared(); + + // ****************************************************************** + // * Shared configuration + // ****************************************************************** + XBController m_XBController; + XBVideo m_XBVideo; + XBAudio m_XBAudio; + char m_XbePath[MAX_PATH]; + int m_BootFlags; + int m_FlagsLLE; + int m_XInputEnabled; + int m_DisablePixelShaders; + int m_UncapFramerate; + int m_UseAllCores; + int m_SkipRdtscPatching; + float m_MSpF; + float m_FPS; + bool m_bMultiXbeFlag; + bool m_bDebugging; + int m_LedSequence[4]; int m_ScaleViewport; int m_DirectHostBackBufferAccess; - char m_StorageLocation[MAX_PATH]; -}; - -// ****************************************************************** -// * Exported Global Shared Memory Pointer -// ****************************************************************** -extern EmuShared *g_EmuShared; - -#endif + char m_StorageLocation[MAX_PATH]; +}; + +// ****************************************************************** +// * Exported Global Shared Memory Pointer +// ****************************************************************** +extern EmuShared *g_EmuShared; + +#endif