From 80e2f61eabd96eab91e743c8fb5aaebaa6c6c6d7 Mon Sep 17 00:00:00 2001
From: Twinaphex <autechre1024@hotmail.com>
Date: Sat, 14 Apr 2012 03:51:25 +0200
Subject: [PATCH] (PS3/360) Moved some shared enums to console_ext.h

---
 360/shared.h                | 16 ----------------
 console/console_ext.h       |  9 +++++++++
 console/console_ext_input.h | 11 +++++++++--
 ps3/shared.h                | 15 ---------------
 4 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/360/shared.h b/360/shared.h
index 89e7522532..ffbad95ab7 100644
--- a/360/shared.h
+++ b/360/shared.h
@@ -19,22 +19,6 @@
 
 #define MAX_PATH_LENGTH 1024
 
-enum
-{
-   MODE_EMULATION,
-   MODE_MENU,
-   MODE_EXIT
-};
-
-enum
-{
-   ORIENTATION_NORMAL,
-   ORIENTATION_VERTICAL,
-   ORIENTATION_FLIPPED,
-   ORIENTATION_FLIPPED_ROTATED,
-   ORIENTATION_END
-};
-
 enum {
    MENU_ITEM_LOAD_STATE = 0,
    MENU_ITEM_SAVE_STATE,
diff --git a/console/console_ext.h b/console/console_ext.h
index a479278a9a..8cc8680fde 100644
--- a/console/console_ext.h
+++ b/console/console_ext.h
@@ -44,6 +44,15 @@ enum aspect_ratio
    ASPECT_RATIO_END,
 };
 
+enum rotation
+{
+   ORIENTATION_NORMAL = 0,
+   ORIENTATION_VERTICAL,
+   ORIENTATION_FLIPPED,
+   ORIENTATION_FLIPPED_ROTATED,
+   ORIENTATION_END
+};
+
 struct aspect_ratio_elem
 {
    char name[64];
diff --git a/console/console_ext_input.h b/console/console_ext_input.h
index a69d35b6cb..ac191a1d52 100644
--- a/console/console_ext_input.h
+++ b/console/console_ext_input.h
@@ -21,7 +21,7 @@
 
 enum keybind_set_id
 {
-   KEYBIND_NOACTION,
+   KEYBIND_NOACTION = 0,
    KEYBIND_DECREMENT,
    KEYBIND_INCREMENT,
    KEYBIND_DEFAULT
@@ -29,7 +29,14 @@ enum keybind_set_id
 
 enum
 {
-   DPAD_EMULATION_NONE,
+   MODE_EMULATION = 0,
+   MODE_MENU,
+   MODE_EXIT
+};
+
+enum
+{
+   DPAD_EMULATION_NONE = 0,
    DPAD_EMULATION_LSTICK,
    DPAD_EMULATION_RSTICK
 };
diff --git a/ps3/shared.h b/ps3/shared.h
index 916a1b0d81..9042f302c9 100644
--- a/ps3/shared.h
+++ b/ps3/shared.h
@@ -39,21 +39,6 @@ enum
 	EXTERN_LAUNCHER_MULTIMAN
 };
 
-enum
-{
-	MODE_EMULATION,
-	MODE_MENU,
-	MODE_EXIT
-};
-
-enum {
-	ORIENTATION_NORMAL,
-	ORIENTATION_VERTICAL,
-	ORIENTATION_FLIPPED,
-	ORIENTATION_FLIPPED_ROTATED,
-	ORIENTATION_END
-};
-
 enum {
 	CONFIG_FILE,
 	SHADER_PRESET_FILE,