From 38cde55b78b227d22fb37ed794868c72f2f85011 Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Mon, 16 Jul 2012 05:13:30 +0200
Subject: [PATCH] (360/Xbox 1) Move frontend/main.c to xdk dir

---
 console/griffin/griffin.c                 | 2 +-
 console/retroarch_console_input.h         | 2 +-
 xbox1/xinput_xbox_input.c                 | 3 ++-
 {360/frontend-xdk => xdk/frontend}/main.c | 5 ++---
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename {360/frontend-xdk => xdk/frontend}/main.c (99%)

diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index a6088c3475..2cd9fc6b4d 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -230,7 +230,7 @@ REWIND
 MAIN
 ============================================================ */
 #if defined(_XBOX)
-#include "../../360/frontend-xdk/main.c"
+#include "../../xdk/frontend/main.c"
 #elif defined(GEKKO)
 #include "../../wii/frontend/main.c"
 #endif
diff --git a/console/retroarch_console_input.h b/console/retroarch_console_input.h
index 21011ac4f5..bf4af5ad86 100644
--- a/console/retroarch_console_input.h
+++ b/console/retroarch_console_input.h
@@ -41,7 +41,7 @@ enum
    DPAD_EMULATION_RSTICK
 };
 
-#ifdef _XBOX
+#ifdef _XBOX360
 #include "../360/xinput_360_input.h"
 #endif
 
diff --git a/xbox1/xinput_xbox_input.c b/xbox1/xinput_xbox_input.c
index 85ee7cdb56..42eecffc94 100644
--- a/xbox1/xinput_xbox_input.c
+++ b/xbox1/xinput_xbox_input.c
@@ -24,7 +24,6 @@
 #include "../driver.h"
 #include "../general.h"
 #include "../libretro.h"
-#include "../input/rarch_xinput2.h"
 #include "xinput_xbox_input.h"
 
 static XINPUT_STATE state[4];
@@ -34,6 +33,8 @@ bool bInserted[4];
 bool bRemoved[4];
 XINPUT_CAPABILITIES caps[4];
 
+#define DEADZONE (16000)
+
 static unsigned pads_connected;
 
 static void xinput_input_poll(void *data)
diff --git a/360/frontend-xdk/main.c b/xdk/frontend/main.c
similarity index 99%
rename from 360/frontend-xdk/main.c
rename to xdk/frontend/main.c
index 05e650ddbf..12f88a38b4 100644
--- a/360/frontend-xdk/main.c
+++ b/xdk/frontend/main.c
@@ -22,17 +22,16 @@
 
 #ifdef _XBOX360
 #include <xfilecache.h>
-#include "menu.h"
+#include "../../360/frontend-xdk/menu.h"
 #endif
 
 #include <xbdm.h>
-#include "../../360/xinput_360_input.h"
 
 #ifdef _XBOX
 #if defined(_XBOX1)
 #include "../../xbox1/xdk_d3d8.h"
 #elif defined(_XBOX360)
-#include "../xdk_d3d9.h"
+#include "../../360/xdk_d3d9.h"
 #endif
 #endif