Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 05:55:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Much cleaner way to get blue building (remove ugly header hacks)

Browse source 
- Get bootvid working too.

svn path=/trunk/; revision=20644
This commit is contained in:
Alex Ionescu 2006-01-07 02:14:42 +00:00
parent 5e8ce117ba
commit 89b606cb89
2 changed files with 14 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

18
reactos/drivers/dd/blue/blue.c
View file

@ -12,25 +12,9 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <ntddk.h> #include <ntddk.h>
#include <windef.h>
/* FIXME: W32API NEEDS TO BE FIXED */
#ifdef _MSC_VER
/*
* Wincon.h can't be included due to missing user-mode types,
* so we'll define them here
*/
typedef ULONG DWORD, *LPDWORD;
typedef USHORT UINT, *LPWORD;
typedef USHORT WORD;
typedef UCHAR BYTE;
typedef INT BOOL;
typedef PVOID HWND;
typedef PVOID LPVOID;
#define WINAPI NTAPI
#define APIENTRY WINAPI
#define WINBASEAPI #define WINBASEAPI
typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES; typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES;
#endif
#include <wincon.h> #include <wincon.h>
#include <blue/ntddblue.h> #include <blue/ntddblue.h>

25
reactos/drivers/dd/bootvid/bootvid.c
View file

@ -24,6 +24,7 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <ntddk.h> #include <ntddk.h>
#include <windef.h>
#include <ndk/ldrfuncs.h> #include <ndk/ldrfuncs.h>
#include "bootvid.h" #include "bootvid.h"
#include "ntbootvid.h" #include "ntbootvid.h"
@ -78,7 +79,7 @@ static PDRIVER_OBJECT BootVidDriverObject = NULL;
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
STATIC BOOLEAN FASTCALL static BOOLEAN FASTCALL
InbvFindBootimage() InbvFindBootimage()
{ {
PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry; PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry;
@ -119,7 +120,7 @@ InbvFindBootimage()
} }
STATIC BOOLEAN FASTCALL static BOOLEAN FASTCALL
InbvMapVideoMemory(VOID) InbvMapVideoMemory(VOID)
{ {
PHYSICAL_ADDRESS PhysicalAddress; PHYSICAL_ADDRESS PhysicalAddress;
@ -131,7 +132,7 @@ InbvMapVideoMemory(VOID)
} }
STATIC BOOLEAN FASTCALL static BOOLEAN FASTCALL
InbvUnmapVideoMemory(VOID) InbvUnmapVideoMemory(VOID)
{ {
MmUnmapIoSpace(VideoMemory, 0x10000); MmUnmapIoSpace(VideoMemory, 0x10000);
@ -139,7 +140,7 @@ InbvUnmapVideoMemory(VOID)
} }
STATIC VOID FASTCALL static VOID FASTCALL
vgaPreCalc() vgaPreCalc()
{ {
ULONG j; ULONG j;
@ -158,7 +159,7 @@ vgaPreCalc()
} }
STATIC VOID FASTCALL static VOID FASTCALL
vgaSetRegisters(const VGA_REGISTERS *Registers) vgaSetRegisters(const VGA_REGISTERS *Registers)
{ {
UINT i; UINT i;
@ -246,7 +247,7 @@ VidCleanUp(VOID)
} }
STATIC VOID FASTCALL static VOID FASTCALL
InbvSetColor(INT Index, UCHAR Red, UCHAR Green, UCHAR Blue) InbvSetColor(INT Index, UCHAR Red, UCHAR Green, UCHAR Blue)
{ {
WRITE_PORT_UCHAR(PELINDEX, Index); WRITE_PORT_UCHAR(PELINDEX, Index);
@ -256,7 +257,7 @@ InbvSetColor(INT Index, UCHAR Red, UCHAR Green, UCHAR Blue)
} }
STATIC VOID FASTCALL static VOID FASTCALL
InbvSetBlackPalette() InbvSetBlackPalette()
{ {
register ULONG r = 0; register ULONG r = 0;
@ -276,7 +277,7 @@ InbvSetBlackPalette()
} }
STATIC VOID FASTCALL static VOID FASTCALL
InbvDisplayBitmap(ULONG Width, ULONG Height, PCHAR ImageData) InbvDisplayBitmap(ULONG Width, ULONG Height, PCHAR ImageData)
{ {
ULONG j, k, y; ULONG j, k, y;
@ -322,7 +323,7 @@ InbvDisplayBitmap(ULONG Width, ULONG Height, PCHAR ImageData)
} }
STATIC VOID FASTCALL static VOID FASTCALL
InbvDisplayCompressedBitmap() InbvDisplayCompressedBitmap()
{ {
PBITMAPV5HEADER bminfo; PBITMAPV5HEADER bminfo;
@ -470,7 +471,7 @@ InbvDisplayCompressedBitmap()
} }
STATIC VOID FASTCALL static VOID FASTCALL
InbvFadeUpPalette() InbvFadeUpPalette()
{ {
PBITMAPV5HEADER bminfo; PBITMAPV5HEADER bminfo;
@ -542,7 +543,7 @@ InbvFadeUpPalette()
} }
STATIC VOID STDCALL static VOID STDCALL
InbvBitmapThreadMain(PVOID Ignored) InbvBitmapThreadMain(PVOID Ignored)
{ {
if (InbvFindBootimage()) if (InbvFindBootimage())
@ -558,7 +559,7 @@ InbvBitmapThreadMain(PVOID Ignored)
} }
STATIC BOOLEAN STDCALL static BOOLEAN STDCALL
VidInitialize(VOID) VidInitialize(VOID)
{ {
NTSTATUS Status; NTSTATUS Status;