diff options
| author | Tony Wasserka <neobrainx@gmail.com> | 2014-11-18 16:54:37 +0100 |
|---|---|---|
| committer | Tony Wasserka <neobrainx@gmail.com> | 2014-11-18 16:54:37 +0100 |
| commit | ed4e59900893df07ec7eb91cbb9b9214c174158a (patch) | |
| tree | d1d5d7ec71caa43eca2c7dedf22f28632a088abb /src/core | |
| parent | Merge pull request #206 from lioncash/semicolon (diff) | |
| parent | system: Get rid of an unnecessary enum typedef (diff) | |
| download | yuzu-ed4e59900893df07ec7eb91cbb9b9214c174158a.tar yuzu-ed4e59900893df07ec7eb91cbb9b9214c174158a.tar.gz yuzu-ed4e59900893df07ec7eb91cbb9b9214c174158a.tar.bz2 yuzu-ed4e59900893df07ec7eb91cbb9b9214c174158a.tar.lz yuzu-ed4e59900893df07ec7eb91cbb9b9214c174158a.tar.xz yuzu-ed4e59900893df07ec7eb91cbb9b9214c174158a.tar.zst yuzu-ed4e59900893df07ec7eb91cbb9b9214c174158a.zip | |
Diffstat (limited to 'src/core')
| -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 b5f0c5a55..0be8711e4 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; |