style: [patch 1/22] use /r/3648/ to reorganize includes

9 files changed, 18 insertions, 9 deletions

diff --git a/src/dev/x86/cmos.cc b/src/dev/x86/cmos.cc
index 73cfe853e..16286f07e 100644
--- a/src/dev/x86/cmos.cc
+++ b/src/dev/x86/cmos.cc
@@ -28,8 +28,9 @@
  * Authors: Gabe Black
  */
 
-#include "debug/CMOS.hh"
 #include "dev/x86/cmos.hh"
+
+#include "debug/CMOS.hh"
 #include "dev/x86/intdev.hh"
 #include "mem/packet_access.hh"
 
diff --git a/src/dev/x86/i8042.cc b/src/dev/x86/i8042.cc
index 8aef93223..39b02055b 100644
--- a/src/dev/x86/i8042.cc
+++ b/src/dev/x86/i8042.cc
@@ -28,9 +28,10 @@
  * Authors: Gabe Black
  */
 
+#include "dev/x86/i8042.hh"
+
 #include "base/bitunion.hh"
 #include "debug/I8042.hh"
-#include "dev/x86/i8042.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 
diff --git a/src/dev/x86/i82094aa.cc b/src/dev/x86/i82094aa.cc
index 7388036fb..a4b05b007 100644
--- a/src/dev/x86/i82094aa.cc
+++ b/src/dev/x86/i82094aa.cc
@@ -28,11 +28,12 @@
  * Authors: Gabe Black
  */
 
+#include "dev/x86/i82094aa.hh"
+
 #include "arch/x86/interrupts.hh"
 #include "arch/x86/intmessage.hh"
 #include "cpu/base.hh"
 #include "debug/I82094AA.hh"
-#include "dev/x86/i82094aa.hh"
 #include "dev/x86/i8259.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
diff --git a/src/dev/x86/i8237.cc b/src/dev/x86/i8237.cc
index b16f78883..a9ef53c2c 100644
--- a/src/dev/x86/i8237.cc
+++ b/src/dev/x86/i8237.cc
@@ -29,6 +29,7 @@
  */
 
 #include "dev/x86/i8237.hh"
+
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 
diff --git a/src/dev/x86/i8254.cc b/src/dev/x86/i8254.cc
index f784a0107..457db13f7 100644
--- a/src/dev/x86/i8254.cc
+++ b/src/dev/x86/i8254.cc
@@ -28,8 +28,9 @@
  * Authors: Gabe Black
  */
 
-#include "debug/I8254.hh"
 #include "dev/x86/i8254.hh"
+
+#include "debug/I8254.hh"
 #include "dev/x86/intdev.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
diff --git a/src/dev/x86/i8259.cc b/src/dev/x86/i8259.cc
index 84f2d1321..03c5cb948 100644
--- a/src/dev/x86/i8259.cc
+++ b/src/dev/x86/i8259.cc
@@ -28,10 +28,11 @@
  * Authors: Gabe Black
  */
 
+#include "dev/x86/i8259.hh"
+
 #include "base/bitfield.hh"
 #include "debug/I8259.hh"
 #include "dev/x86/i82094aa.hh"
-#include "dev/x86/i8259.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 
diff --git a/src/dev/x86/pc.cc b/src/dev/x86/pc.cc
index fe3119803..6d182c078 100644
--- a/src/dev/x86/pc.cc
+++ b/src/dev/x86/pc.cc
@@ -32,6 +32,8 @@
  * Implementation of PC platform.
  */
 
+#include "dev/x86/pc.hh"
+
 #include <deque>
 #include <string>
 #include <vector>
@@ -40,12 +42,11 @@
 #include "arch/x86/x86_traits.hh"
 #include "config/the_isa.hh"
 #include "cpu/intr_control.hh"
+#include "dev/terminal.hh"
 #include "dev/x86/i82094aa.hh"
 #include "dev/x86/i8254.hh"
 #include "dev/x86/i8259.hh"
-#include "dev/x86/pc.hh"
 #include "dev/x86/south_bridge.hh"
-#include "dev/terminal.hh"
 #include "sim/system.hh"
 
 using namespace std;
diff --git a/src/dev/x86/south_bridge.cc b/src/dev/x86/south_bridge.cc
index dbb1ef1be..e426c7049 100644
--- a/src/dev/x86/south_bridge.cc
+++ b/src/dev/x86/south_bridge.cc
@@ -28,10 +28,11 @@
  * Authors: Gabe Black
  */
 
+#include "dev/x86/south_bridge.hh"
+
 #include <cassert>
 
 #include "dev/x86/pc.hh"
-#include "dev/x86/south_bridge.hh"
 
 using namespace X86ISA;
 
diff --git a/src/dev/x86/speaker.cc b/src/dev/x86/speaker.cc
index 235860815..61a296719 100644
--- a/src/dev/x86/speaker.cc
+++ b/src/dev/x86/speaker.cc
@@ -28,11 +28,12 @@
  * Authors: Gabe Black
  */
 
+#include "dev/x86/speaker.hh"
+
 #include "base/bitunion.hh"
 #include "base/trace.hh"
 #include "debug/PcSpeaker.hh"
 #include "dev/x86/i8254.hh"
-#include "dev/x86/speaker.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"