diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-11-18 14:57:25 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-11-18 15:00:32 +0100 |
| commit | b37f91c617964cfe37aff0c015f6bc46eb47e7dd (patch) | |
| tree | a6def463ed91ca0ef106223855b23dbbd5824aab /src/core/system.h | |
| parent | Merge pull request #200 from lioncash/statics (diff) | |
| download | yuzu-b37f91c617964cfe37aff0c015f6bc46eb47e7dd.tar yuzu-b37f91c617964cfe37aff0c015f6bc46eb47e7dd.tar.gz yuzu-b37f91c617964cfe37aff0c015f6bc46eb47e7dd.tar.bz2 yuzu-b37f91c617964cfe37aff0c015f6bc46eb47e7dd.tar.lz yuzu-b37f91c617964cfe37aff0c015f6bc46eb47e7dd.tar.xz yuzu-b37f91c617964cfe37aff0c015f6bc46eb47e7dd.tar.zst yuzu-b37f91c617964cfe37aff0c015f6bc46eb47e7dd.zip | |
Diffstat (limited to 'src/core/system.h')
| -rw-r--r-- | src/core/system.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/core/system.h b/src/core/system.h index 8f8ddf87b..c90f7e1a9 100644 --- a/src/core/system.h +++ b/src/core/system.h @@ -11,16 +11,16 @@ namespace System { // State of the full emulator -typedef enum { - STATE_NULL = 0, ///< System is in null state, nothing initialized - STATE_IDLE, ///< System is in an initialized state, but not running - STATE_RUNNING, ///< System is running - STATE_LOADING, ///< System is loading a ROM - STATE_HALTED, ///< System is halted (error) - STATE_STALLED, ///< System is stalled (unused) - STATE_DEBUG, ///< System is in a special debug mode (unused) - STATE_DIE ///< System is shutting down -} State; +enum State { + STATE_NULL = 0, ///< System is in null state, nothing initialized + STATE_IDLE, ///< System is in an initialized state, but not running + STATE_RUNNING, ///< System is running + STATE_LOADING, ///< System is loading a ROM + STATE_HALTED, ///< System is halted (error) + STATE_STALLED, ///< System is stalled (unused) + STATE_DEBUG, ///< System is in a special debug mode (unused) + STATE_DIE ///< System is shutting down +}; extern volatile State g_state; |