From 4cc2aaf5b93908329fe73a22936de5496d0526f9 Mon Sep 17 00:00:00 2001
From: gibbed <rick@gibbed.us>
Date: Sun, 27 May 2018 16:34:35 -0500
Subject: [PATCH] Remove unnecessary usage of xe::be.

---
 src/xenia/hid/input.h                           | 12 ++++++------
 src/xenia/kernel/kernel_state.h                 | 12 ++++++------
 src/xenia/kernel/util/xex2_info.h               |  4 ++--
 src/xenia/kernel/xboxkrnl/xboxkrnl_audio_xma.cc |  6 +++---
 src/xenia/kernel/xboxkrnl/xboxkrnl_video.cc     |  6 +++---
 src/xenia/kernel/xthread.h                      |  8 ++++----
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/xenia/hid/input.h b/src/xenia/hid/input.h
index 3170a76e5..bf94fd451 100644
--- a/src/xenia/hid/input.h
+++ b/src/xenia/hid/input.h
@@ -39,8 +39,8 @@ enum X_INPUT_GAMEPAD_BUTTON {
 
 struct X_INPUT_GAMEPAD {
   be<uint16_t> buttons;
-  be<uint8_t> left_trigger;
-  be<uint8_t> right_trigger;
+  uint8_t left_trigger;
+  uint8_t right_trigger;
   be<int16_t> thumb_lx;
   be<int16_t> thumb_ly;
   be<int16_t> thumb_rx;
@@ -61,8 +61,8 @@ struct X_INPUT_VIBRATION {
 static_assert_size(X_INPUT_VIBRATION, 4);
 
 struct X_INPUT_CAPABILITIES {
-  be<uint8_t> type;
-  be<uint8_t> sub_type;
+  uint8_t type;
+  uint8_t sub_type;
   be<uint16_t> flags;
   X_INPUT_GAMEPAD gamepad;
   X_INPUT_VIBRATION vibration;
@@ -75,8 +75,8 @@ struct X_INPUT_KEYSTROKE {
   be<uint16_t> virtual_key;
   be<uint16_t> unicode;
   be<uint16_t> flags;
-  be<uint8_t> user_index;
-  be<uint8_t> hid_code;
+  uint8_t user_index;
+  uint8_t hid_code;
 };
 static_assert_size(X_INPUT_KEYSTROKE, 8);
 
diff --git a/src/xenia/kernel/kernel_state.h b/src/xenia/kernel/kernel_state.h
index 8ff2ec493..d78eaf421 100644
--- a/src/xenia/kernel/kernel_state.h
+++ b/src/xenia/kernel/kernel_state.h
@@ -64,17 +64,17 @@ struct ProcessInfoBlock {
   xe::be<uint32_t> unk_0C;
   xe::be<uint32_t> unk_10;
   xe::be<uint32_t> thread_count;
-  xe::be<uint8_t> unk_18;
-  xe::be<uint8_t> unk_19;
-  xe::be<uint8_t> unk_1A;
-  xe::be<uint8_t> unk_1B;
+  uint8_t unk_18;
+  uint8_t unk_19;
+  uint8_t unk_1A;
+  uint8_t unk_1B;
   xe::be<uint32_t> kernel_stack_size;
   xe::be<uint32_t> unk_20;
   xe::be<uint32_t> tls_data_size;
   xe::be<uint32_t> tls_raw_data_size;
   xe::be<uint16_t> tls_slot_size;
-  xe::be<uint8_t> unk_2E;
-  xe::be<uint8_t> process_type;
+  uint8_t unk_2E;
+  uint8_t process_type;
   xe::be<uint32_t> bitmap[0x20 / 4];
   xe::be<uint32_t> unk_50;
   xe::be<uint32_t> unk_54;  // blink
diff --git a/src/xenia/kernel/util/xex2_info.h b/src/xenia/kernel/util/xex2_info.h
index 209aa05d5..1a6ed8644 100644
--- a/src/xenia/kernel/util/xex2_info.h
+++ b/src/xenia/kernel/util/xex2_info.h
@@ -482,8 +482,8 @@ struct xex2_opt_static_library {
   xe::be<uint16_t> version_major;  // 0x8
   xe::be<uint16_t> version_minor;  // 0xA
   xe::be<uint16_t> version_build;  // 0xC
-  xe::be<uint8_t> approval_type;   // 0xE
-  xe::be<uint8_t> version_qfe;     // 0xF
+  uint8_t approval_type;           // 0xE
+  uint8_t version_qfe;             // 0xF
 };
 static_assert_size(xex2_opt_static_library, 0x10);
 
diff --git a/src/xenia/kernel/xboxkrnl/xboxkrnl_audio_xma.cc b/src/xenia/kernel/xboxkrnl/xboxkrnl_audio_xma.cc
index 2be43e850..c312bd554 100644
--- a/src/xenia/kernel/xboxkrnl/xboxkrnl_audio_xma.cc
+++ b/src/xenia/kernel/xboxkrnl/xboxkrnl_audio_xma.cc
@@ -92,9 +92,9 @@ void StoreXmaContextIndexedRegister(KernelState* kernel_state,
 struct XMA_LOOP_DATA {
   xe::be<uint32_t> loop_start;
   xe::be<uint32_t> loop_end;
-  xe::be<uint8_t> loop_count;
-  xe::be<uint8_t> loop_subframe_end;
-  xe::be<uint8_t> loop_subframe_skip;
+  uint8_t loop_count;
+  uint8_t loop_subframe_end;
+  uint8_t loop_subframe_skip;
 };
 static_assert_size(XMA_LOOP_DATA, 12);
 
diff --git a/src/xenia/kernel/xboxkrnl/xboxkrnl_video.cc b/src/xenia/kernel/xboxkrnl/xboxkrnl_video.cc
index d0e72a788..038ec711a 100644
--- a/src/xenia/kernel/xboxkrnl/xboxkrnl_video.cc
+++ b/src/xenia/kernel/xboxkrnl/xboxkrnl_video.cc
@@ -79,8 +79,8 @@ static_assert_size(X_D3DPRIVATE_SCALER_PARAMETERS, 0x38);
 struct X_DISPLAY_INFO {
   xe::be<uint16_t> front_buffer_width;               // 0x0
   xe::be<uint16_t> front_buffer_height;              // 0x2
-  xe::be<uint8_t> front_buffer_color_format;         // 0x4
-  xe::be<uint8_t> front_buffer_pixel_format;         // 0x5
+  uint8_t front_buffer_color_format;                 // 0x4
+  uint8_t front_buffer_pixel_format;                 // 0x5
   X_D3DPRIVATE_SCALER_PARAMETERS scaler_parameters;  // 0x8
   xe::be<uint16_t> display_window_overscan_left;     // 0x40
   xe::be<uint16_t> display_window_overscan_top;      // 0x42
@@ -90,7 +90,7 @@ struct X_DISPLAY_INFO {
   xe::be<uint16_t> display_height;                   // 0x4A
   xe::be<float> display_refresh_rate;                // 0x4C
   xe::be<uint32_t> display_interlaced;               // 0x50
-  xe::be<uint8_t> display_color_format;              // 0x54
+  uint8_t display_color_format;                      // 0x54
   xe::be<uint16_t> actual_display_width;             // 0x56
 };
 static_assert_size(X_DISPLAY_INFO, 0x58);
diff --git a/src/xenia/kernel/xthread.h b/src/xenia/kernel/xthread.h
index 0b38f9689..cfb53967e 100644
--- a/src/xenia/kernel/xthread.h
+++ b/src/xenia/kernel/xthread.h
@@ -39,10 +39,10 @@ struct XAPC {
   // KAPC is 0x28(40) bytes? (what's passed to ExAllocatePoolWithTag)
   // This is 4b shorter than NT - looks like the reserved dword at +4 is gone.
   // NOTE: stored in guest memory.
-  xe::be<uint8_t> type;              // +0
-  xe::be<uint8_t> unk1;              // +1
-  xe::be<uint8_t> processor_mode;    // +2
-  xe::be<uint8_t> enqueued;          // +3
+  uint8_t type;                      // +0
+  uint8_t unk1;                      // +1
+  uint8_t processor_mode;            // +2
+  uint8_t enqueued;                  // +3
   xe::be<uint32_t> thread_ptr;       // +4
   xe::be<uint32_t> flink;            // +8
   xe::be<uint32_t> blink;            // +12