Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-27 19:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

[freeldr] Add SCSIPORT category to debug messages

Browse source 
Add missing PELOADER entry + fix one debug message

svn path=/trunk/; revision=45994
This commit is contained in:
Hervé Poussineau 2010-03-07 20:12:28 +00:00
parent fa403d4bf1
commit 19b65ab3fe
3 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
reactos/boot/freeldr/freeldr/debug.c
View file

@ -173,6 +173,12 @@ VOID DebugPrintHeader(ULONG Mask)
case DPRINT_HWDETECT: case DPRINT_HWDETECT:
DbgPrint("HWDETECT: "); DbgPrint("HWDETECT: ");
break; break;
case DPRINT_PELOADER:
DbgPrint("PELOADER: ");
break;
case DPRINT_SCSIPORT:
DbgPrint("SCSIPORT: ");
break;
default: default:
DbgPrint("UNKNOWN: "); DbgPrint("UNKNOWN: ");
break; break;
@ -194,6 +200,12 @@ VOID DbgPrintMask(ULONG Mask, char *format, ...)
return; return;
} }
// Disable file/line for scsiport messages
if (Mask & DPRINT_SCSIPORT)
{
DebugStartOfLine = FALSE;
}
// Print the header if we have started a new line // Print the header if we have started a new line
if (DebugStartOfLine) if (DebugStartOfLine)
{ {

1
reactos/boot/freeldr/freeldr/include/debug.h
View file

@ -35,6 +35,7 @@
#define DPRINT_HWDETECT 0x00000400 // OR this with DebugPrintMask to enable hardware detection messages #define DPRINT_HWDETECT 0x00000400 // OR this with DebugPrintMask to enable hardware detection messages
#define DPRINT_WINDOWS 0x00000800 // OR this with DebugPrintMask to enable messages from Windows loader #define DPRINT_WINDOWS 0x00000800 // OR this with DebugPrintMask to enable messages from Windows loader
#define DPRINT_PELOADER 0x00001000 // OR this with DebugPrintMask to enable messages from PE images loader #define DPRINT_PELOADER 0x00001000 // OR this with DebugPrintMask to enable messages from PE images loader
#define DPRINT_SCSIPORT 0x00002000 // OR this with DebugPrintMask to enable messages from SCSI miniport
extern char* g_file; extern char* g_file;
extern int g_line; extern int g_line;

2
reactos/boot/freeldr/freeldr/windows/peloader.c
View file

@ -56,7 +56,7 @@ WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock,
PLDR_DATA_TABLE_ENTRY DataTableEntry; PLDR_DATA_TABLE_ENTRY DataTableEntry;
LIST_ENTRY *ModuleEntry; LIST_ENTRY *ModuleEntry;
DPRINTM(DPRINT_PELOADER, "WinLdrCheckForLoadedDll: DllName %X, LoadedEntry: %X\n", DPRINTM(DPRINT_PELOADER, "WinLdrCheckForLoadedDll: DllName %s, LoadedEntry: %X\n",
DllName, LoadedEntry); DllName, LoadedEntry);
/* Just go through each entry in the LoadOrderList and compare loaded module's /* Just go through each entry in the LoadOrderList and compare loaded module's