Author: akhaldi Date: Sun Jan 26 20:24:59 2014 New Revision: 61841
URL: http://svn.reactos.org/svn/reactos?rev=61841&view=rev Log: [BOOTVID] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
Modified: trunk/reactos/drivers/base/bootvid/arm/bootvid.c trunk/reactos/drivers/base/bootvid/i386/bootvid.c trunk/reactos/drivers/base/bootvid/i386/vga.c trunk/reactos/drivers/base/bootvid/precomp.h
Modified: trunk/reactos/drivers/base/bootvid/arm/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/arm/bo... ============================================================================== --- trunk/reactos/drivers/base/bootvid/arm/bootvid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/arm/bootvid.c [iso-8859-1] Sun Jan 26 20:24:59 2014 @@ -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)
Modified: trunk/reactos/drivers/base/bootvid/i386/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/b... ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] Sun Jan 26 20:24:59 2014 @@ -1,4 +1,7 @@ #include "precomp.h" + +#include <ntifs.h> +#include <ndk/halfuncs.h>
/* PRIVATE FUNCTIONS *********************************************************/
@@ -472,4 +475,3 @@ InitializePalette(); VidSolidColorFill(0, 0, 639, 479, 0); } -
Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/v... ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] Sun Jan 26 20:24:59 2014 @@ -1152,4 +1152,3 @@ } } } -
Modified: trunk/reactos/drivers/base/bootvid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/precom... ============================================================================== --- trunk/reactos/drivers/base/bootvid/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/precomp.h [iso-8859-1] Sun Jan 26 20:24:59 2014 @@ -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 @@ VOID );
-// -// Globals -// +/* Globals */ extern USHORT AT_Initialization[]; extern ULONG curr_x; extern ULONG curr_y;