diff options
| author | bunnei <bunneidev@gmail.com> | 2014-11-19 21:24:46 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-11-19 21:24:46 +0100 |
| commit | c0cd0fa78edc37795176c6fb45a52c1d015f3690 (patch) | |
| tree | 237f15dd9d986309000c995fde07088625e62239 /src/core/system.h | |
| parent | Merge pull request #208 from lioncash/statics (diff) | |
| parent | Remove tabs in all files except in skyeye imports and in generated GL code (diff) | |
| download | yuzu-c0cd0fa78edc37795176c6fb45a52c1d015f3690.tar yuzu-c0cd0fa78edc37795176c6fb45a52c1d015f3690.tar.gz yuzu-c0cd0fa78edc37795176c6fb45a52c1d015f3690.tar.bz2 yuzu-c0cd0fa78edc37795176c6fb45a52c1d015f3690.tar.lz yuzu-c0cd0fa78edc37795176c6fb45a52c1d015f3690.tar.xz yuzu-c0cd0fa78edc37795176c6fb45a52c1d015f3690.tar.zst yuzu-c0cd0fa78edc37795176c6fb45a52c1d015f3690.zip | |
Diffstat (limited to 'src/core/system.h')
| -rw-r--r-- | src/core/system.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/system.h b/src/core/system.h index 0be8711e4..2bc2edc75 100644 --- a/src/core/system.h +++ b/src/core/system.h @@ -12,14 +12,14 @@ namespace System { // State of the full emulator 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 + 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; |