summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Tony Wasserka2014-11-18 16:54:37 +0100
committerGravatar Tony Wasserka2014-11-18 16:54:37 +0100
commited4e59900893df07ec7eb91cbb9b9214c174158a (patch)
treed1d5d7ec71caa43eca2c7dedf22f28632a088abb
parentMerge pull request #206 from lioncash/semicolon (diff)
parentsystem: Get rid of an unnecessary enum typedef (diff)
downloadyuzu-ed4e59900893df07ec7eb91cbb9b9214c174158a.tar.gz
yuzu-ed4e59900893df07ec7eb91cbb9b9214c174158a.tar.xz
yuzu-ed4e59900893df07ec7eb91cbb9b9214c174158a.zip
Merge pull request #210 from lioncash/typedef
system: Get rid of an unnecessary enum typedef
Diffstat (limited to '')
-rw-r--r--src/core/system.h20
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 @@
11namespace System { 11namespace System {
12 12
13// State of the full emulator 13// State of the full emulator
14typedef enum { 14enum State {
15 STATE_NULL = 0, ///< System is in null state, nothing initialized 15 STATE_NULL = 0, ///< System is in null state, nothing initialized
16 STATE_IDLE, ///< System is in an initialized state, but not running 16 STATE_IDLE, ///< System is in an initialized state, but not running
17 STATE_RUNNING, ///< System is running 17 STATE_RUNNING, ///< System is running
18 STATE_LOADING, ///< System is loading a ROM 18 STATE_LOADING, ///< System is loading a ROM
19 STATE_HALTED, ///< System is halted (error) 19 STATE_HALTED, ///< System is halted (error)
20 STATE_STALLED, ///< System is stalled (unused) 20 STATE_STALLED, ///< System is stalled (unused)
21 STATE_DEBUG, ///< System is in a special debug mode (unused) 21 STATE_DEBUG, ///< System is in a special debug mode (unused)
22 STATE_DIE ///< System is shutting down 22 STATE_DIE ///< System is shutting down
23} State; 23};
24 24
25extern volatile State g_state; 25extern volatile State g_state;
26 26