Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-07 14:51:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean some header mess

Browse source 
svn path=/trunk/; revision=30005
This commit is contained in:
Hervé Poussineau 2007-10-31 09:45:15 +00:00
parent d5426e5dc0
commit f169cf332d
11 changed files with 39 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
reactos/drivers/video/displays/vga/main/enable.c
View file

@ -6,12 +6,7 @@
* PROGRAMMERS:
*/
#include "../vgaddi.h"
#include "../vgavideo/vgavideo.h"
#define NDEBUG
#include <debug.h>
#define DBG_PREFIX "VGADDI: "
#include <vgaddi.h>
static BOOL VGAInitialized = FALSE;
@ -183,7 +178,7 @@ DrvEnableDriver(IN ULONG EngineVersion,
IN ULONG SizeOfDED,
OUT PDRVENABLEDATA DriveEnableData)
{
/* EngDebugPrint("VGADDI", "DrvEnableDriver called...\n", 0); */
DPRINT("DrvEnableDriver called...\n");
vgaPreCalc();
@ -251,7 +246,7 @@ DrvEnablePDEV(IN DEVMODEW *DM,
PDev = EngAllocMem(FL_ZERO_MEMORY, sizeof(PDEV), ALLOC_TAG);
if (PDev == NULL)
{
EngDebugPrint(DBG_PREFIX, "EngAllocMem failed for PDEV\n", 0);
DPRINT1("EngAllocMem failed for PDEV\n");
return NULL;
}
PDev->KMDriver = Driver;
@ -579,4 +574,13 @@ DrvGetModes(IN HANDLE Driver,
return OutputSize;
}
ULONG DbgPrint(PCCH Format,...)
{
va_list ap;
va_start(ap, Format);
EngDebugPrint("VGADDI", (PCHAR)Format, ap);
va_end(ap);
return 0;
}
/* EOF */

8
reactos/drivers/video/displays/vga/objects/bitblt.c
View file

@ -6,13 +6,7 @@
* PROGRAMMERS:
*/
#include "../vgaddi.h"
#include "../vgavideo/vgavideo.h"
#include "brush.h"
#include "bitblt.h"
#define NDEBUG
#include <debug.h>
#include <vgaddi.h>
typedef BOOL (*PFN_VGABlt)(SURFOBJ*, SURFOBJ*, XLATEOBJ*, RECTL*, POINTL*);
typedef BOOL (APIENTRY *PBLTRECTFUNC)(SURFOBJ* OutputObj,

4
reactos/drivers/video/displays/vga/objects/copybits.c
View file

@ -6,9 +6,7 @@
* PROGRAMMERS:
*/
#include "../vgaddi.h"
#include "../vgavideo/vgavideo.h"
#include <debug.h>
#include <vgaddi.h>
BOOL APIENTRY
DrvCopyBits(

3
reactos/drivers/video/displays/vga/objects/lineto.c
View file

@ -6,8 +6,7 @@
* PROGRAMMERS: Copyright (C) 1998-2003 ReactOS Team
*/
#include "../vgaddi.h"
#include "../vgavideo/vgavideo.h"
#include <vgaddi.h>
/*
* Draw a line from top-left to bottom-right

4
reactos/drivers/video/displays/vga/objects/offscreen.c
View file

@ -8,9 +8,7 @@
/* INCLUDES ******************************************************************/
#include "../vgaddi.h"
#include "../vgavideo/vgavideo.h"
#include <debug.h>
#include <vgaddi.h>
/* GLOBALS *******************************************************************/

6
reactos/drivers/video/displays/vga/objects/paint.c
View file

@ -6,11 +6,7 @@
* PROGRAMMERS:
*/
#include "../vgaddi.h"
#include "../vgavideo/vgavideo.h"
#include "brush.h"
#include <debug.h>
#include <vgaddi.h>
BOOL VGADDIFillSolid(SURFOBJ *Surface, RECTL Dimensions, ULONG iColor)
{

6
reactos/drivers/video/displays/vga/objects/pointer.c
View file

@ -8,11 +8,7 @@
/* INCLUDES ******************************************************************/
#include "../vgaddi.h"
#include "../vgavideo/vgavideo.h"
#define NDEBUG
#include <debug.h>
#include <vgaddi.h>
/* GLOBALS *******************************************************************/

7
reactos/drivers/video/displays/vga/objects/screen.c
View file

@ -6,8 +6,7 @@
* PROGRAMMERS:
*/
#include "../vgaddi.h"
#include "../vgavideo/vgavideo.h"
#include <vgaddi.h>
static WORD PaletteBuffer[] = {
16, 0, // 16 entries, start with 0
@ -125,8 +124,8 @@ BOOL DeinitVGA(PPDEV ppdev)
0,
&ReturnedDataLength))
{
//DPRINT1("Failed to unmap video memory.\n");
DbgBreakPoint();
DPRINT1("Failed to unmap video memory.\n");
EngDebugBreak();
return FALSE;
}
return TRUE;

8
reactos/drivers/video/displays/vga/objects/transblt.c
View file

@ -6,13 +6,7 @@
* PROGRAMMERS:
*/
#include "../vgaddi.h"
#include "../vgavideo/vgavideo.h"
#include "brush.h"
#include "bitblt.h"
#define NDEBUG
#include <debug.h>
#include <vgaddi.h>
BOOL APIENTRY
DrvTransparentBlt(

19
reactos/drivers/video/displays/vga/vgaddi.h
View file

@ -11,6 +11,17 @@
#include <winioctl.h>
#include <ntddvdeo.h>
#include "vgavideo/vgavideo.h"
#include "objects/brush.h"
#include "objects/bitblt.h"
#ifndef NDEBUG
#define DPRINT DbgPrint
#else
#define DPRINT
#endif
#define DPRINT1 DbgPrint
/* FIXME - what a headers mess.... */
#define DDKAPI __stdcall
@ -19,10 +30,10 @@
#define DDKCDECLAPI __cdecl
ULONG DbgPrint(PCCH Format,...);
VOID DDKAPI DbgBreakPoint(VOID);
VOID DDKAPI WRITE_PORT_UCHAR(IN PUCHAR Port, IN UCHAR Value);
VOID DDKAPI WRITE_REGISTER_UCHAR(IN PUCHAR Register, IN UCHAR Value);
UCHAR DDKAPI READ_REGISTER_UCHAR(IN PUCHAR Register);
VOID DDKAPI WRITE_PORT_UCHAR(IN PUCHAR Port, IN UCHAR Value);
VOID DDKAPI WRITE_PORT_USHORT(IN PUSHORT Port, IN USHORT Value);
VOID DDKAPI WRITE_REGISTER_UCHAR(IN PUCHAR Register, IN UCHAR Value);
UCHAR DDKAPI READ_REGISTER_UCHAR(IN PUCHAR Register);
static __inline BOOLEAN
RemoveEntryList(

25
reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
View file

@ -6,25 +6,7 @@
* PROGRAMMERS:
*/
#define _WINBASE_
#define _WINDOWS_H
#include <stdarg.h>
#include <windef.h>
#include <guiddef.h>
#include <wingdi.h>
#include <winddi.h>
#include <winioctl.h>
#include <ntddvdeo.h>
#include <stdlib.h>
#include "vgavideo.h"
#define DDKAPI __stdcall
#define DDKFASTAPI __fastcall
#define FASTCALL __fastcall
#define DDKCDECLAPI __cdecl
VOID DDKAPI WRITE_PORT_UCHAR(IN PUCHAR Port, IN UCHAR Value);
VOID DDKAPI WRITE_PORT_USHORT(IN PUSHORT Port, IN USHORT Value);
#include <vgaddi.h>
UCHAR PreCalcReverseByte[256];
int maskbit[640];
@ -40,9 +22,6 @@ static unsigned char leftMask;
static int byteCounter;
static unsigned char rightMask;
#define READ_REGISTER_UCHAR(p) (*((volatile UCHAR *)(p)))
#define WRITE_REGISTER_UCHAR(p,c) (*((volatile CHAR *)(p))) = (c)
UCHAR bytesPerPixel(ULONG Format)
{
/* This function is taken from /subsys/win32k/eng/surface.c
@ -460,7 +439,7 @@ void DIB_BltFromVGA(int x, int y, int w, int h, void *b, int Dest_lDelta)
c1 = (vgaGetPixel(x + i, y + j) << 4) | (vgaGetPixel(x + i + 1, y + j));
c2 = ((PUCHAR)b)[(j * Dest_lDelta) + (i >> 1)];
if ((c1 & mask) != (c2 & mask))
DbgBreakPoint();
EngDebugBreak();
}
}
#endif /* VGA_VERIFY */