From bb1c7946572163d461f2fec0ca4889e3cd35b750 Mon Sep 17 00:00:00 2001
From: Michael Maltese <michaeljosephmaltese@gmail.com>
Date: Thu, 9 Feb 2017 14:49:20 -0800
Subject: [PATCH] Remove unused GCPadStatus.err

---
 Source/Core/Core/HotkeyManager.cpp    | 2 --
 Source/Core/Core/Movie.cpp            | 6 ------
 Source/Core/InputCommon/GCPadStatus.h | 9 ---------
 3 files changed, 17 deletions(-)

diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp
index d989627ad1..6e96aad1d7 100644
--- a/Source/Core/Core/HotkeyManager.cpp
+++ b/Source/Core/Core/HotkeyManager.cpp
@@ -174,8 +174,6 @@ InputConfig* GetConfig()
 
 void GetStatus()
 {
-  s_hotkey.err = PAD_ERR_NONE;
-
   // Get input
   static_cast<HotkeyManager*>(s_config.GetController(0))->GetInput(&s_hotkey);
 }
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
index 75bf23ee43..9ee7d2e818 100644
--- a/Source/Core/Core/Movie.cpp
+++ b/Source/Core/Core/Movie.cpp
@@ -1110,12 +1110,6 @@ void PlayController(GCPadStatus* PadStatus, int controllerID)
     return;
   }
 
-  // dtm files don't save the mic button or error bit. not sure if they're actually used, but better
-  // safe than sorry
-  signed char e = PadStatus->err;
-  memset(PadStatus, 0, sizeof(GCPadStatus));
-  PadStatus->err = e;
-
   memcpy(&s_padState, &s_temp_input[s_currentByte], sizeof(ControllerState));
   s_currentByte += sizeof(ControllerState);
 
diff --git a/Source/Core/InputCommon/GCPadStatus.h b/Source/Core/InputCommon/GCPadStatus.h
index d9aa6c5a91..42784ca6e1 100644
--- a/Source/Core/InputCommon/GCPadStatus.h
+++ b/Source/Core/InputCommon/GCPadStatus.h
@@ -6,14 +6,6 @@
 
 #include "Common/CommonTypes.h"
 
-enum PadError
-{
-  PAD_ERR_NONE = 0,
-  PAD_ERR_NO_CONTROLLER = -1,
-  PAD_ERR_NOT_READY = -2,
-  PAD_ERR_TRANSFER = -3,
-};
-
 enum
 {
   PAD_USE_ORIGIN = 0x0080,
@@ -48,7 +40,6 @@ struct GCPadStatus
   u8 triggerRight;  // 0 <= triggerRight <= 255
   u8 analogA;       // 0 <= analogA      <= 255
   u8 analogB;       // 0 <= analogB      <= 255
-  s8 err;           // one of PAD_ERR_* number
 
   static const u8 MAIN_STICK_CENTER_X = 0x80;
   static const u8 MAIN_STICK_CENTER_Y = 0x80;