[BOOTVID]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61841

diff --git a/reactos/drivers/base/bootvid/arm/bootvid.c b/reactos/drivers/base/bootvid/arm/bootvid.c
index 488550d..925c58b 100644 (file)
--- a/reactos/drivers/base/bootvid/arm/bootvid.c
+++ b/reactos/drivers/base/bootvid/arm/bootvid.c
@@ -1,6 +1,7 @@
 #include "precomp.h"
+
 #define NDEBUG
-#include "debug.h"
+#include <debug.h>
 
 #define LCDTIMING0_PPL(x)              ((((x) / 16 - 1) & 0x3f) << 2)
 #define LCDTIMING1_LPP(x)              (((x) & 0x3ff) - 1)

diff --git a/reactos/drivers/base/bootvid/i386/bootvid.c b/reactos/drivers/base/bootvid/i386/bootvid.c
index 08d0dc1..59f28c6 100644 (file)
--- a/reactos/drivers/base/bootvid/i386/bootvid.c
+++ b/reactos/drivers/base/bootvid/i386/bootvid.c
@@ -1,5 +1,8 @@
 #include "precomp.h"
 
+#include <ntifs.h>
+#include <ndk/halfuncs.h>
+
 /* PRIVATE FUNCTIONS *********************************************************/
 
 BOOLEAN
@@ -472,4 +475,3 @@ VidResetDisplay(IN BOOLEAN HalReset)
     InitializePalette();
     VidSolidColorFill(0, 0, 639, 479, 0);
 }
-

diff --git a/reactos/drivers/base/bootvid/i386/vga.c b/reactos/drivers/base/bootvid/i386/vga.c
index ae66001..add073f 100644 (file)
--- a/reactos/drivers/base/bootvid/i386/vga.c
+++ b/reactos/drivers/base/bootvid/i386/vga.c
@@ -1152,4 +1152,3 @@ VidSolidColorFill(IN ULONG Left,
         }
     }
 }
-

diff --git a/reactos/drivers/base/bootvid/precomp.h b/reactos/drivers/base/bootvid/precomp.h
index 1a7d4a6..8b76775 100644 (file)
--- a/reactos/drivers/base/bootvid/precomp.h
+++ b/reactos/drivers/base/bootvid/precomp.h
@@ -1,26 +1,18 @@
-#include "ntddk.h"
-#include "ntifs.h"
-#include "arc/arc.h"
-#include "halfuncs.h"
-#include "drivers/bootvid/bootvid.h"
-#include "ioaccess.h"
+#include <wdm.h>
+#include <drivers/bootvid/bootvid.h>
 
 /* Define if FontData has upside down characters */
 #undef CHAR_GEN_UPSIDE_DOWN
 
 #define BOOTCHAR_HEIGHT             13
 
-//
-// Command Stream Definitions
-//
+/* Command Stream Definitions */
 #define CMD_STREAM_WRITE            0x0
 #define CMD_STREAM_WRITE_ARRAY      0x2
 #define CMD_STREAM_USHORT           0x4
 #define CMD_STREAM_READ             0x8
 
-//
-// Bitmap Header
-//
+/* Bitmap Header */
 typedef struct tagBITMAPINFOHEADER
 {
     ULONG biSize;
@@ -42,9 +34,7 @@ InitializePalette(
     VOID
 );
 
-//
-// Globals
-//
+/* Globals */
 extern USHORT AT_Initialization[];
 extern ULONG curr_x;
 extern ULONG curr_y;