Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOSKRNL]

Browse source 
- Do not repeat messages into serial port even when using other debug methods.
- Allow to specify debug log file name.
- When using the "Screen" method, show blue screen when entering KDB.
- Disable the repetition of previous KDB command with long many-page output.

[USETUP]
- Add "ReactOS (Screen)" entry to boot menu.

svn path=/trunk/; revision=54468
This commit is contained in:
Dmitry Gorbachev 2011-11-21 05:28:08 +00:00
parent 34f3db310e
commit b7f9a4b528
9 changed files with 153 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/base/setup/usetup/bootsup.c
View file

@ -486,6 +486,12 @@ CreateFreeLoaderIniForReactos(
L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL");
#endif
/* ReactOS_Screen */
CreateFreeLoaderEntry(IniCache, IniSection,
L"ReactOS_Screen", L"\"ReactOS (Screen)\"",
L"Windows2003", ArcPath,
L"/DEBUG /DEBUGPORT=SCREEN /SOS");
/* ReactOS_LogFile */
CreateFreeLoaderEntry(IniCache, IniSection,
L"ReactOS_LogFile", L"\"ReactOS (Log file)\"",

7
reactos/boot/bootdata/autorun.inf
View file

@ -1,4 +1,3 @@
[autorun]
open=reactos\welcome.exe
icon=icon.ico
[autorun]
open=reactos\welcome.exe
icon=icon.ico

63
reactos/boot/bootdata/bootcd.ini
View file

@ -1,32 +1,31 @@
[FREELOADER]
DefaultOS=Setup
Timeout=0
[Display]
TitleText=ReactOS Setup
StatusBarColor=Cyan
StatusBarTextColor=Black
BackdropTextColor=White
BackdropColor=Blue
BackdropFillStyle=Medium
TitleBoxTextColor=White
TitleBoxColor=Red
MessageBoxTextColor=White
MessageBoxColor=Blue
MenuTextColor=Gray
MenuColor=Black
TextColor=Gray
SelectedTextColor=Black
SelectedColor=Gray
ShowTime=No
MenuBox=No
CenterMenu=No
MinimalUI=Yes
TimeText=Seconds until highlighted choice will be started automatically:
[Operating Systems]
Setup="Setup"
[Setup]
BootType=ReactOSSetup
[FREELOADER]
DefaultOS=Setup
TimeOut=0
[Display]
TitleText=ReactOS Setup
StatusBarColor=Cyan
StatusBarTextColor=Black
BackdropTextColor=White
BackdropColor=Blue
BackdropFillStyle=Medium
TitleBoxTextColor=White
TitleBoxColor=Red
MessageBoxTextColor=White
MessageBoxColor=Blue
MenuTextColor=Gray
MenuColor=Black
TextColor=Gray
SelectedTextColor=Black
SelectedColor=Gray
ShowTime=No
MenuBox=No
CenterMenu=No
MinimalUI=Yes
TimeText=Seconds until highlighted choice will be started automatically:
[Operating Systems]
Setup="Setup"
[Setup]
BootType=ReactOSSetup

79
reactos/boot/bootdata/livecd.ini
View file

@ -1,28 +1,51 @@
[FREELOADER]
DefaultOS=ReactOS
Timeout=1
[Display]
TitleText=ReactOS Boot Manager
StatusBarColor=Cyan
StatusBarTextColor=Black
BackdropTextColor=White
BackdropColor=Blue
BackdropFillStyle=Medium
TitleBoxTextColor=White
TitleBoxColor=Red
MessageBoxTextColor=White
MessageBoxColor=Blue
MenuTextColor=White
MenuColor=Blue
TextColor=Yellow
SelectedTextColor=Black
SelectedColor=Gray
[Operating Systems]
ReactOS="ReactOS"
[ReactOS]
BootType=Windows2003
SystemPath=LiveCD\reactos
Options=/DEBUGPORT=COM1 /SOS /MININT
[FREELOADER]
DefaultOS=LiveCD_Debug
TimeOut=3
[Display]
TitleText=ReactOS LiveCD
StatusBarColor=Cyan
StatusBarTextColor=Black
BackdropTextColor=White
BackdropColor=Blue
BackdropFillStyle=Medium
TitleBoxTextColor=White
TitleBoxColor=Red
MessageBoxTextColor=White
MessageBoxColor=Blue
MenuTextColor=Gray
MenuColor=Black
TextColor=Gray
SelectedTextColor=Black
SelectedColor=Gray
ShowTime=No
MenuBox=No
CenterMenu=No
MinimalUI=Yes
TimeText=Seconds until highlighted choice will be started automatically:
[Operating Systems]
LiveCD="LiveCD"
LiveCD_Debug="LiveCD (Debug)"
LiveCD_Screen="LiveCD (Screen)"
LiveCD_LogFile="LiveCD (Log file)"
[LiveCD]
BootType=Windows2003
SystemPath=LiveCD\reactos
Options=/MININT
[LiveCD_Debug]
BootType=Windows2003
SystemPath=LiveCD\reactos
Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT
[LiveCD_Screen]
BootType=Windows2003
SystemPath=LiveCD\reactos
Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT
[LiveCD_LogFile]
BootType=Windows2003
SystemPath=LiveCD\reactos
Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /MININT

27
reactos/media/drivers/etc/KDBinit
View file

@ -1,14 +1,13 @@
# Example KDB.init file
#
#
# Set the disassembly flavor to "intel" (default is "at&t")
set syntax intel
# Change the condition to enter KDB on INT3 to "always" (default is "kmode")
# set condition INT3 first always
# This is a special command available only in the KDBinit file - it breaks into
# KDB when it is interpreting the init file at startup.
#break
# Example KDB.init file
#
# Set the disassembly flavor to "intel" (default is "at&t")
set syntax intel
# Change the condition to enter KDB on INT3 to "always" (default is "kmode")
#set condition INT3 first always
# This is a special command available only in the KDBinit file - it breaks into
# KDB when it is interpreting the init file at startup.
#break

21
reactos/ntoskrnl/kd/kdinit.c
View file

@ -40,6 +40,8 @@ PKDP_INIT_ROUTINE InitRoutines[KdMax] = {KdpScreenInit,
KdpBochsInit,
KdpKdbgInit};
extern ANSI_STRING KdpLogFileName;
/* PRIVATE FUNCTIONS *********************************************************/
PCHAR
@ -47,7 +49,7 @@ NTAPI
INIT_FUNCTION
KdpGetDebugMode(PCHAR Currentp2)
{
PCHAR p2 = Currentp2;
PCHAR p1, p2 = Currentp2;
ULONG Value;
/* Check for Screen Debugging */
@ -73,12 +75,21 @@ KdpGetDebugMode(PCHAR Currentp2)
KdpPort = Value;
}
}
/* Check for Debug Log Debugging */
else if (!_strnicmp(p2, "FILE", 4))
{
/* Enable It */
p2 += 4;
KdpDebugMode.File = TRUE;
if (*p2 == ':')
{
p2++;
p1 = p2;
while (*p2 != '\0' && *p2 != ' ') p2++;
KdpLogFileName.MaximumLength = KdpLogFileName.Length = p2 - p1;
KdpLogFileName.Buffer = p1;
}
}
/* Check for BOCHS Debugging */
@ -171,11 +182,9 @@ KdInitSystem(ULONG BootPhase,
else if (strstr(CommandLine, "CRASHDEBUG")) KdDebuggerEnabled = FALSE;
else if (strstr(CommandLine, "DEBUG"))
{
/* Enable on the serial port */
/* Enable the kernel debugger */
KdDebuggerEnabled = TRUE;
KdDebuggerNotPresent = FALSE;
KdpDebugMode.Serial = TRUE;
#ifdef KDBG
/* Get the KDBG Settings */
KdbpGetCommandLineSettings(LoaderBlock->LoadOptions);
@ -202,6 +211,10 @@ KdInitSystem(ULONG BootPhase,
Port = strstr(Port, "DEBUGPORT");
}
/* Use serial port then */
if (KdDebuggerEnabled && KdpDebugMode.Value == 0)
KdpDebugMode.Serial = TRUE;
/* Check if we got a baud rate */
if (BaudRate)
{

7
reactos/ntoskrnl/kd/kdio.c
View file

@ -23,6 +23,7 @@ volatile ULONG KdpFreeBytes = 0;
KSPIN_LOCK KdpDebugLogSpinLock;
KEVENT KdpLoggerThreadEvent;
HANDLE KdpLogFileHandle;
ANSI_STRING KdpLogFileName = RTL_CONSTANT_STRING("\\SystemRoot\\debug.log");
KSPIN_LOCK KdpSerialSpinLock;
KD_PORT_INFORMATION SerialPortInfo = { DEFAULT_DEBUG_PORT, DEFAULT_DEBUG_BAUD_RATE, 0 };
@ -201,7 +202,9 @@ KdpInitDebugLog(PKD_DISPATCH_TABLE DispatchTable,
else if (BootPhase == 3)
{
/* Setup the log name */
RtlInitUnicodeString(&FileName, L"\\SystemRoot\\debug.log");
Status = RtlAnsiStringToUnicodeString(&FileName, &KdpLogFileName, TRUE);
if (!NT_SUCCESS(Status)) return;
InitializeObjectAttributes(&ObjectAttributes,
&FileName,
0,
@ -221,6 +224,8 @@ KdpInitDebugLog(PKD_DISPATCH_TABLE DispatchTable,
NULL,
0);
RtlFreeUnicodeString(&FileName);
if (!NT_SUCCESS(Status)) return;
KeInitializeEvent(&KdpLoggerThreadEvent, SynchronizationEvent, TRUE);

20
reactos/ntoskrnl/kdbg/kdb.c
View file

@ -127,12 +127,6 @@ KiEspToTrapFrame(
IN PKTRAP_FRAME TrapFrame,
IN ULONG Esp);
/* ROS Internal. Please deprecate */
NTHALAPI
VOID
NTAPI
HalReleaseDisplayOwnership();
/* FUNCTIONS *****************************************************************/
static VOID
@ -1247,9 +1241,21 @@ KdbpInternalEnter()
ULONG SavedStackLimit;
KbdDisableMouse();
if (KdpDebugMode.Screen)
if (KdpDebugMode.Screen &&
InbvIsBootDriverInstalled() &&
!InbvCheckDisplayOwnership())
{
/* Acquire ownership and reset the display */
InbvAcquireDisplayOwnership();
InbvResetDisplay();
/* Display blue screen */
InbvSolidColorFill(0, 0, 639, 479, 6);
InbvSetTextColor(15);
InbvInstallDisplayStringFilter(NULL);
InbvEnableDisplayString(TRUE);
InbvSetScrollRegion(0, 0, 639, 479);
}
/* Call the interface's main loop on a different stack */

20
reactos/ntoskrnl/kdbg/kdb_cli.c
View file

@ -107,6 +107,7 @@ static LONG KdbCommandHistoryIndex = 0;
static ULONG KdbNumberOfRowsPrinted = 0;
static ULONG KdbNumberOfColsPrinted = 0;
static BOOLEAN KdbOutputAborted = FALSE;
static BOOLEAN KdbRepeatLastCommand = FALSE;
static LONG KdbNumberOfRowsTerminal = -1;
static LONG KdbNumberOfColsTerminal = -1;
@ -2469,6 +2470,8 @@ KdbpPrint(
if (KdbNumberOfRowsTerminal > 0 &&
(LONG)(KdbNumberOfRowsPrinted + RowsPrintedByTerminal) >= KdbNumberOfRowsTerminal)
{
KdbRepeatLastCommand = FALSE;
if (KdbNumberOfColsPrinted > 0)
DbgPrint("\n");
@ -2789,6 +2792,8 @@ KdbpPager(
if (KdbNumberOfRowsTerminal > 0 &&
(LONG)(KdbNumberOfRowsPrinted + RowsPrintedByTerminal) >= KdbNumberOfRowsTerminal)
{
KdbRepeatLastCommand = FALSE;
if (KdbNumberOfColsPrinted > 0)
DbgPrint("\n");
@ -2987,7 +2992,7 @@ KdbpReadCommand(
PCHAR Orig = Buffer;
ULONG ScanCode = 0;
BOOLEAN EchoOn;
static CHAR LastCommand[1024] = "";
static CHAR LastCommand[1024];
static CHAR NextKey = '\0';
INT CmdHistIndex = -1;
INT i;
@ -3059,15 +3064,16 @@ KdbpReadCommand(
* Repeat the last command if the user presses enter. Reduces the
* risk of RSI when single-stepping.
*/
if (Buffer == Orig)
if (Buffer != Orig)
{
RtlStringCbCopyA(Buffer, Size, LastCommand);
}
else
{
*Buffer = '\0';
KdbRepeatLastCommand = TRUE;
RtlStringCbCopyA(LastCommand, sizeof(LastCommand), Orig);
*Buffer = '\0';
}
else if (KdbRepeatLastCommand)
RtlStringCbCopyA(Buffer, Size, LastCommand);
else
*Buffer = '\0';
return;
}