Moving input structs out of xbox.h.

Progress on #297.
2015-06-27 11:37:12 -07:00
parent 8c69a4df09
commit 7e0246c381
7 changed files with 94 additions and 65 deletions
--- a/src/xenia/kernel/xam_input.cc
+++ b/src/xenia/kernel/xam_input.cc
@@ -9,6 +9,7 @@

 #include "xenia/base/logging.h"
 #include "xenia/emulator.h"
+#include "xenia/hid/input.h"
 #include "xenia/hid/input_system.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/util/shim_utils.h"
@@ -18,7 +19,7 @@
 namespace xe {
 namespace kernel {

-using xe::hid::InputSystem;
+using namespace xe::hid;

 SHIM_CALL XamResetInactivity_shim(PPCContext* ppc_context,
                                  KernelState* kernel_state) {