From 11c95f7b5d44534b6634c458d22a2a3a95a10775 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herv=C3=A9=20Poussineau?= Date: Thu, 1 Dec 2005 19:51:08 +0000 Subject: [PATCH] Link video miniports to videoprt library only svn path=/trunk/; revision=19801 --- reactos/drivers/video/miniport/vbe/vbemp.c | 31 ++++++++------------ reactos/drivers/video/miniport/vbe/vbemp.h | 3 ++ reactos/drivers/video/miniport/vbe/vbemp.xml | 3 -- reactos/drivers/video/miniport/vga/vgamp.c | 2 +- reactos/drivers/video/miniport/vga/vgamp.h | 4 ++- reactos/drivers/video/miniport/vga/vgamp.xml | 3 -- reactos/drivers/video/videoprt/videoprt.c | 2 +- reactos/drivers/video/videoprt/videoprt.h | 2 ++ 8 files changed, 23 insertions(+), 27 deletions(-) diff --git a/reactos/drivers/video/miniport/vbe/vbemp.c b/reactos/drivers/video/miniport/vbe/vbemp.c index d71f020e5c6..0b97194e6ea 100644 --- a/reactos/drivers/video/miniport/vbe/vbemp.c +++ b/reactos/drivers/video/miniport/vbe/vbemp.c @@ -29,9 +29,6 @@ #include "vbemp.h" -#define NDEBUG -#include - /* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ VP_STATUS STDCALL @@ -80,7 +77,7 @@ VBEFindAdapter( static int VBESortModesCallback(PVBE_MODEINFO VbeModeInfoA, PVBE_MODEINFO VbeModeInfoB) { - DPRINT("VBESortModesCallback: %dx%dx%d / %dx%dx%d\n", + VideoPortDebugPrint(Info, "VBESortModesCallback: %dx%dx%d / %dx%dx%d\n", VbeModeInfoA->XResolution, VbeModeInfoA->YResolution, VbeModeInfoA->BitsPerPixel, VbeModeInfoB->XResolution, VbeModeInfoB->YResolution, @@ -190,7 +187,7 @@ VBEInitialize(PVOID HwDeviceExtension) if (Status != NO_ERROR) { - DPRINT1("Failed to get Int 10 service functions (Status %x)\n", Status); + VideoPortDebugPrint(Error, "Failed to get Int 10 service functions (Status %x)\n", Status); return FALSE; } @@ -209,7 +206,7 @@ VBEInitialize(PVOID HwDeviceExtension) if (Status != NO_ERROR) { - DPRINT1("Failed to allocate virtual memory (Status %x)\n", Status); + VideoPortDebugPrint(Error, "Failed to allocate virtual memory (Status %x)\n", Status); return FALSE; } @@ -242,9 +239,9 @@ VBEInitialize(PVOID HwDeviceExtension) sizeof(VBEDeviceExtension->VbeInfo)); /* Verify VBE is found and not anýthing else */ - if (strncmp(VBEDeviceExtension->VbeInfo.Signature,"VESA",4) != 0) + if (VideoPortCompareMemory(VBEDeviceExtension->VbeInfo.Signature, "VESA", 4) != 4) { - DPRINT("No VBE BIOS present\n"); + VideoPortDebugPrint(Warn, "No VBE BIOS present\n"); return FALSE; } @@ -254,7 +251,7 @@ VBEInitialize(PVOID HwDeviceExtension) VBEDeviceExtension->VbeInfo.Version = 0x102; } - DPRINT("VBE BIOS Present (%d.%d, %8ld Kb)\n", + VideoPortDebugPrint(Trace, "VBE BIOS Present (%d.%d, %8ld Kb)\n", VBEDeviceExtension->VbeInfo.Version / 0x100, VBEDeviceExtension->VbeInfo.Version & 0xFF, VBEDeviceExtension->VbeInfo.TotalMemory * 64); @@ -265,13 +262,13 @@ VBEInitialize(PVOID HwDeviceExtension) if (VBEDeviceExtension->VbeInfo.Version < 0x200) #endif { - DPRINT("VBE BIOS present, but incompatible version.\n"); + VideoPortDebugPrint(Warn, "VBE BIOS present, but incompatible version.\n"); return FALSE; } } else { - DPRINT("No VBE BIOS found.\n"); + VideoPortDebugPrint(Warn, "No VBE BIOS found.\n"); return FALSE; } @@ -308,9 +305,9 @@ VBEInitialize(PVOID HwDeviceExtension) */ VBEDeviceExtension->ModeInfo = - ExAllocatePool(PagedPool, ModeCount * sizeof(VBE_MODEINFO)); + VideoPortAllocatePool(HwDeviceExtension, VpPagedPool, ModeCount * sizeof(VBE_MODEINFO), TAG_VBE); VBEDeviceExtension->ModeNumbers = - ExAllocatePool(PagedPool, ModeCount * sizeof(WORD)); + VideoPortAllocatePool(HwDeviceExtension, VpPagedPool, ModeCount * sizeof(WORD), TAG_VBE); /* * Get the actual mode infos. @@ -372,7 +369,7 @@ VBEInitialize(PVOID HwDeviceExtension) if (SuitableModeCount == 0) { - DPRINT("VBEMP: No video modes supported\n"); + VideoPortDebugPrint(Warn, "VBEMP: No video modes supported\n"); return FALSE; } @@ -388,17 +385,15 @@ VBEInitialize(PVOID HwDeviceExtension) * Print the supported video modes when NDEBUG is not set. */ -#ifndef NDEBUG for (CurrentMode = 0; CurrentMode < SuitableModeCount; CurrentMode++) { - DPRINT("%dx%dx%d\n", + VideoPortDebugPrint(Trace, "%dx%dx%d\n", VBEDeviceExtension->ModeInfo[CurrentMode].XResolution, VBEDeviceExtension->ModeInfo[CurrentMode].YResolution, VBEDeviceExtension->ModeInfo[CurrentMode].BitsPerPixel); } -#endif return TRUE; } @@ -746,7 +741,7 @@ VBESetCurrentMode( } else { - DPRINT1("VBEMP: VBESetCurrentMode failed (%x)\n", BiosRegisters.Eax); + VideoPortDebugPrint(Error, "VBEMP: VBESetCurrentMode failed (%x)\n", BiosRegisters.Eax); DeviceExtension->CurrentMode = -1; } diff --git a/reactos/drivers/video/miniport/vbe/vbemp.h b/reactos/drivers/video/miniport/vbe/vbemp.h index 5085be8748a..14f295c8eb4 100644 --- a/reactos/drivers/video/miniport/vbe/vbemp.h +++ b/reactos/drivers/video/miniport/vbe/vbemp.h @@ -28,6 +28,9 @@ #include #include +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#define TAG_VBE TAG('V', 'B', 'E', ' ') + /* * Compile-time define to get VBE 1.2 support. The implementation * is far from complete now and so it's left undefined. diff --git a/reactos/drivers/video/miniport/vbe/vbemp.xml b/reactos/drivers/video/miniport/vbe/vbemp.xml index 48f142c81af..52f7c86f4e8 100644 --- a/reactos/drivers/video/miniport/vbe/vbemp.xml +++ b/reactos/drivers/video/miniport/vbe/vbemp.xml @@ -1,9 +1,6 @@ . - include - ntoskrnl - hal videoprt vbemp.c vbemp.rc diff --git a/reactos/drivers/video/miniport/vga/vgamp.c b/reactos/drivers/video/miniport/vga/vgamp.c index fcc26424096..a45cc4161e6 100644 --- a/reactos/drivers/video/miniport/vga/vgamp.c +++ b/reactos/drivers/video/miniport/vga/vgamp.c @@ -526,7 +526,7 @@ BOOL VGASetCurrentMode(IN PVIDEO_MODE RequestedMode, InitVGAMode(); return TRUE; } else { - DPRINT1("Unrecognised mode for VGASetCurrentMode\n"); + VideoPortDebugPrint(Warn, "Unrecognised mode for VGASetCurrentMode\n"); return FALSE; } } diff --git a/reactos/drivers/video/miniport/vga/vgamp.h b/reactos/drivers/video/miniport/vga/vgamp.h index aafddf4eae2..ac003d7fc29 100644 --- a/reactos/drivers/video/miniport/vga/vgamp.h +++ b/reactos/drivers/video/miniport/vga/vgamp.h @@ -27,7 +27,9 @@ #include #include #include -#include + +#define UNIMPLEMENTED \ + VideoPortDebugPrint(Error, "WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); void InitVGAMode(); diff --git a/reactos/drivers/video/miniport/vga/vgamp.xml b/reactos/drivers/video/miniport/vga/vgamp.xml index 650d1cf90d8..0a058bee0fa 100644 --- a/reactos/drivers/video/miniport/vga/vgamp.xml +++ b/reactos/drivers/video/miniport/vga/vgamp.xml @@ -1,9 +1,6 @@ . - include - ntoskrnl - hal videoprt initvga.c vgamp.c diff --git a/reactos/drivers/video/videoprt/videoprt.c b/reactos/drivers/video/videoprt/videoprt.c index 19f10f96555..a958b79620a 100644 --- a/reactos/drivers/video/videoprt/videoprt.c +++ b/reactos/drivers/video/videoprt/videoprt.c @@ -658,7 +658,7 @@ VideoPortDebugPrint( vsprintf(Buffer, DebugMessage, ap); va_end(ap); - DbgPrint(Buffer); + DbgPrintEx(DPFLTR_IHVVIDEO_ID, DebugPrintLevel, Buffer); } /* diff --git a/reactos/drivers/video/videoprt/videoprt.h b/reactos/drivers/video/videoprt/videoprt.h index a21f752612c..73d214d8b5b 100644 --- a/reactos/drivers/video/videoprt/videoprt.h +++ b/reactos/drivers/video/videoprt/videoprt.h @@ -39,6 +39,8 @@ #define TAG_VIDEO_PORT TAG('V', 'I', 'D', 'P') +#define DPFLTR_IHVVIDEO_ID 0 /* FIXME */ + typedef struct _VIDEO_PORT_ADDRESS_MAPPING { LIST_ENTRY List; -- 2.17.1