Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 43683: [KDCOM] Better handling for breakin packets
by tkreuzer＠svn.reactos.org 22 Oct '09

22 Oct '09

Author: tkreuzer Date: Thu Oct 22 13:49:52 2009 New Revision: 43683 URL: http://svn.reactos.org/svn/reactos?rev=43683&view=rev Log: [KDCOM] Better handling for breakin packets Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdserial.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] Thu Oct 22 13:49:52 2009 @@ -125,7 +125,7 @@ OUT PSTRING MessageHeader, OUT PSTRING MessageData, OUT PULONG DataLength, - IN OUT PKD_CONTEXT Context) + IN OUT PKD_CONTEXT KdContext) { UCHAR Byte = 0; KDP_STATUS KdStatus; @@ -144,7 +144,11 @@ KdStatus = KdpReceivePacketLeader(&Packet.PacketLeader); if (KdStatus != KDP_PACKET_RECEIVED) { - /* Couldn't read a correct packet leader. */ + /* Check if we got a breakin */ + if (KdStatus == KDP_PACKET_RESEND) + { + KdContext->BreakInRequested = TRUE; + } return KdStatus; } Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdserial.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdserial.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdserial.c [iso-8859-1] Thu Oct 22 13:49:52 2009 @@ -67,7 +67,8 @@ * \brief Recieves a packet leadr from the KD port. * \param PacketLeader Pointer to an ULONG that receives the packet leader. * \return KDP_PACKET_RECEIVED if successful. - * KDP_PACKET_TIMEOUT if the receice timed out. + * KDP_PACKET_TIMEOUT if the receive timed out. + * KDP_PACKET_RESEND if a breakin byte was detected. */ KDP_STATUS NTAPI @@ -82,26 +83,25 @@ do { - /* Receive a single Byte */ + /* Receive a single byte */ KdStatus = KdpReceiveByte(&Byte); /* Check for timeout */ if (KdStatus == KDP_PACKET_TIMEOUT) { + /* Check if we already got a breakin byte */ + if (Buffer[0] == BREAKIN_PACKET_BYTE) + { + return KDP_PACKET_RESEND; + } + /* Report timeout */ - KdpDbgPrint("KDP_PACKET_TIMEOUT\n"); return KDP_PACKET_TIMEOUT; } /* Check if we received a byte */ if (KdStatus == KDP_PACKET_RECEIVED) { - /* Check for breakin byte */ - if (Byte == BREAKIN_PACKET_BYTE) - { - KdpDbgPrint("BREAKIN_PACKET_BYTE\n"); - } - /* Check if this is a valid packet leader byte */ if (Byte == PACKET_LEADER_BYTE || Byte == CONTROL_PACKET_LEADER_BYTE) @@ -118,6 +118,15 @@ /* Continue with next byte */ Index++; + continue; + } + + /* Check for breakin byte */ + if (Byte == BREAKIN_PACKET_BYTE) + { + KdpDbgPrint("BREAKIN_PACKET_BYTE\n"); + Index = 0; + Buffer[0] = Byte; continue; } }

1 0

[tkreuzer] 43682: Fix KD_CONTEXT member names.
by tkreuzer＠svn.reactos.org 22 Oct '09

22 Oct '09

Author: tkreuzer Date: Thu Oct 22 13:45:49 2009 New Revision: 43682 URL: http://svn.reactos.org/svn/reactos?rev=43682&view=rev Log: Fix KD_CONTEXT member names. Modified: branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdinit.c branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdlock.c Modified: branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h [iso-8859-1] Thu Oct 22 13:45:49 2009 @@ -220,8 +220,8 @@ // typedef struct _KD_CONTEXT { - ULONG KdpDefaultRetries; - BOOLEAN KdpControlCPending; + ULONG RetryCount; + BOOLEAN BreakInRequested; } KD_CONTEXT, *PKD_CONTEXT; // Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] Thu Oct 22 13:45:49 2009 @@ -284,7 +284,7 @@ if (!KdpDebuggerStructuresInitialized) { /* Set the Debug Switch Routine and Retries*/ - KdpContext.KdpDefaultRetries = 20; + KdpContext.RetryCount = 20; KiDebugSwitchRoutine = KdpSwitchProcessor; /* Initialize the Time Slip DPC */ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdlock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdlock.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdlock.c [iso-8859-1] Thu Oct 22 13:45:49 2009 @@ -40,11 +40,11 @@ if (KdDebuggerEnabled) { /* Check if a CTRL-C is in the queue */ - if (KdpContext.KdpControlCPending) + if (KdpContext.BreakInRequested) { /* Set it and prepare for break */ DoBreak = TRUE; - KdpContext.KdpControlCPending = FALSE; + KdpContext.BreakInRequested = FALSE; } else { @@ -83,12 +83,12 @@ Enable = KeDisableInterrupts(); /* Check if a CTRL-C is in the queue */ - if (KdpContext.KdpControlCPending) + if (KdpContext.BreakInRequested) { /* Set it and prepare for break */ KdpControlCPressed = TRUE; DoBreak = TRUE; - KdpContext.KdpControlCPending = FALSE; + KdpContext.BreakInRequested = FALSE; } else {

1 0

[dreimer] 43681: Fixed a bug in the CMD updater. Update changelog.
by dreimer＠svn.reactos.org 22 Oct '09

22 Oct '09

Author: dreimer Date: Thu Oct 22 09:31:33 2009 New Revision: 43681 URL: http://svn.reactos.org/svn/reactos?rev=43681&view=rev Log: Fixed a bug in the CMD updater. Update changelog. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Thu Oct 22 09:31:33 2009 @@ -49,6 +49,12 @@ - Fixed something cosmetical in the look on startup of rosbe. (Daniel Reimer) - Added a regression test for RosBE (flex/bison) (Christoph von Wittich) - Fix Bison running from folders with spaces (Christoph von Wittich, Daniel Reimer) +- Elevate Updater on Win Vista / 7 now. (Daniel Reimer, Ged Murphy) +- Add some missing headers. (Daniel Reimer) +- Fix some missing /i on some sets. (Daniel Reimer) +- Fix the Info message at the very beginning that theres no source code and how to get it. (Daniel Reimer) +- Fixed Window Flash and end of build (Daniel Reimer) +- Fixed makex only accepting one parameter in PS. (Daniel Reimer) *** Jun 29th, 2009 - RosBE 1.4.4 Released Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Thu Oct 22 09:31:33 2009 @@ -78,7 +78,7 @@ ) call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" -doskey update=elevate "%_ROSBE_BASEDIR%\update.cmd" $* +doskey update="%_ROSBE_BASEDIR%\Tools\elevate.exe" "%_ROSBE_BASEDIR%\update.cmd" $* cls echo ******************************************************************************* Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Thu Oct 22 09:31:33 2009 @@ -79,8 +79,8 @@ copy *.txt .\tmp\. 1> NUL 2> NUL call :WHILE2 del /F /Q tmp\*.* 1> NUL 2> NUL - if not "%_ROSBE_UPDATES%" == "" ( - echo Following Updates available: %_ROSBE_UPDATES% + if not "!_ROSBE_UPDATES!" == "" ( + echo Following Updates available: !_ROSBE_UPDATES! ) else ( echo RosBE is up to Date. ) @@ -166,6 +166,7 @@ :EOC cd /d "%_ROSBE_OPATH%" title ReactOS Build Environment %_ROSBE_VERSION% +endlocal pause + :OUT -endlocal & set _ROSBE_UPDATES=%_ROSBE_UPDATES% & set _ROSBE_STATCOUNT=%_ROSBE_STATCOUNT%

1 0

[dreimer] 43680: Fixed a bug with makex only accepting one parameter in PS. Now is passes ALL of them. Fix elevated updater. Works now.
by dreimer＠svn.reactos.org 22 Oct '09

22 Oct '09

Author: dreimer Date: Thu Oct 22 09:00:46 2009 New Revision: 43680 URL: http://svn.reactos.org/svn/reactos?rev=43680&view=rev Log: Fixed a bug with makex only accepting one parameter in PS. Now is passes ALL of them. Fix elevated updater. Works now. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Thu Oct 22 09:00:46 2009 @@ -104,7 +104,7 @@ set-alias HELP "$_ROSBE_BASEDIR\Help.ps1" -scope Global set-alias MAKE "$_ROSBE_BASEDIR\Build.ps1" -scope Global - function global:MAKEX($xargs) {IEX "&'$_ROSBE_BASEDIR\Build.ps1' multi $($xargs)"} + function global:MAKEX {IEX "&'$_ROSBE_BASEDIR\Build.ps1' multi $args}"} if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { set-alias RADDR2LINE "$_ROSBE_BASEDIR\reladdr2line.ps1" -scope Global @@ -118,7 +118,7 @@ set-alias SSVN "$_ROSBE_BASEDIR\sSVN.ps1" -scope Global set-alias SVN "$_ROSBE_BASEDIR\Tools\svn.exe" -scope Global } - function global:UPDATE($xargs) {IEX "&'$_ROSBE_BASEDIR\Tools\Elevate.exe' '$pshome\powershell.exe' -noexit {&'$_ROSBE_BASEDIR\update.ps1' '$_ROSBE_VERSION' '$_ROSBE_BASEDIR' $($xargs)}"} + function global:UPDATE {IEX "&'$_ROSBE_BASEDIR\Tools\Elevate.exe' '$pshome\powershell.exe' -noexit {&'$_ROSBE_BASEDIR\update.ps1' $_ROSBE_VERSION '$_ROSBE_BASEDIR' $args}"} set-alias VERSION "$_ROSBE_BASEDIR\version.ps1" -scope Global

1 0

[ahill] 43679: [shell32] - hKey is already properly closed, don't close it again.
by ahill＠svn.reactos.org 22 Oct '09

22 Oct '09

Author: ahill Date: Thu Oct 22 04:29:01 2009 New Revision: 43679 URL: http://svn.reactos.org/svn/reactos?rev=43679&view=rev Log: [shell32] - hKey is already properly closed, don't close it again. Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] Thu Oct 22 04:29:01 2009 @@ -277,7 +277,6 @@ RegCloseKey(hKey); } } - RegCloseKey(hKey); } static

1 0

[cgutman] 43678: - Send DHCP discover after loading the configuration so we have valid options - Fixes erratic behavior with certain DHCP servers
by cgutman＠svn.reactos.org 22 Oct '09

22 Oct '09

Author: cgutman Date: Thu Oct 22 02:55:45 2009 New Revision: 43678 URL: http://svn.reactos.org/svn/reactos?rev=43678&view=rev Log: - Send DHCP discover after loading the configuration so we have valid options - Fixes erratic behavior with certain DHCP servers Modified: trunk/reactos/base/services/dhcp/adapter.c Modified: trunk/reactos/base/services/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/adapter… ============================================================================== --- trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] Thu Oct 22 02:55:45 2009 @@ -199,9 +199,7 @@ Adapter->DhclientInfo.name, Adapter->BindStatus)); - add_protocol(Adapter->DhclientInfo.name, Adapter->DhclientInfo.rfdesc, got_one, &Adapter->DhclientInfo); Adapter->DhclientInfo.client->state = S_INIT; - state_reboot(&Adapter->DhclientInfo); } if( IPAddress ) free( IPAddress ); @@ -331,6 +329,15 @@ read_client_conf(&Adapter->DhclientInfo); + if (Adapter->DhclientInfo.client->state == S_INIT) + { + add_protocol(Adapter->DhclientInfo.name, + Adapter->DhclientInfo.rfdesc, + got_one, &Adapter->DhclientInfo); + + state_init(&Adapter->DhclientInfo); + } + InsertTailList( &AdapterList, &Adapter->ListEntry ); } else { free( Adapter ); Adapter = 0; } } else { free( Adapter ); Adapter = 0; }

1 0

[tkreuzer] 43677: [NTOSKRNL] - Comment out some instructions in KiRestoreProcessorControlState for now - move the FreeLdr debugprint hack - Don't increment RIP on an int3 - improve debugprint for KiInvalidOpcodeFault
by tkreuzer＠svn.reactos.org 21 Oct '09

21 Oct '09

Author: tkreuzer Date: Thu Oct 22 01:22:46 2009 New Revision: 43677 URL: http://svn.reactos.org/svn/reactos?rev=43677&view=rev Log: [NTOSKRNL] - Comment out some instructions in KiRestoreProcessorControlState for now - move the FreeLdr debugprint hack - Don't increment RIP on an int3 - improve debugprint for KiInvalidOpcodeFault Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Thu Oct 22 01:22:46 2009 @@ -468,8 +468,8 @@ /* Restore GDT, IDT, LDT and TSS */ __lgdt(&ProcessorState->SpecialRegisters.Gdtr.Limit); - __lldt(&ProcessorState->SpecialRegisters.Ldtr); - __ltr(&ProcessorState->SpecialRegisters.Tr); +// __lldt(&ProcessorState->SpecialRegisters.Ldtr); +// __ltr(&ProcessorState->SpecialRegisters.Tr); __lidt(&ProcessorState->SpecialRegisters.Idtr.Limit); __ldmxcsr(&ProcessorState->SpecialRegisters.MxCsr); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Thu Oct 22 01:22:46 2009 @@ -701,14 +701,14 @@ /* Setup the IDT */ KeInitExceptions(); + /* HACK: misuse this function to pass a function pointer to kdcom */ + KdDebuggerInitialize1((PVOID)FrLdrDbgPrint); + /* Initialize debugging system */ KdInitSystem(0, KeLoaderBlock); /* Check for break-in */ // if (KdPollBreakIn()) DbgBreakPointWithStatus(1); - - /* HACK: misuse this function to pass a function pointer to kdcom */ - KdDebuggerInitialize1((PVOID)FrLdrDbgPrint); /* Hack! Wait for the debugger! */ while (!KdPollBreakIn()); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Thu Oct 22 01:22:46 2009 @@ -29,6 +29,9 @@ _MsgUnexpectedInterrupt: .ascii "UnexpectedInterrupt\n\0" + +_MsgInvalidOpcodeFault: +.ascii "General protection fault at %p!\n\0" /* Helper Macros *************************************************************/ @@ -267,9 +270,6 @@ mov rdx, rbp call _FrLdrDbgPrint[rip] - /* Increase Rip to skip the int3 */ - inc qword ptr [rbp + KTRAP_FRAME_Rip] - DISPATCH_EXCEPTION STATUS_BREAKPOINT, 3, 0, 0, 0 /* Return */ @@ -310,9 +310,18 @@ push 0 .allocstack 0x8 - UNIMPLEMENTED KiInvalidOpcodeFault - - jmp $ + ENTER_TRAP_FRAME (SIZE_EXCEPTION_RECORD + 0x28), 0 + +// DISPATCH_EXCEPTION STATUS_BREAKPOINT, 3, 0, 0, 0 + + mov rdx, [rbp + KTRAP_FRAME_Rip] + lea rcx, _MsgInvalidOpcodeFault[rip] + call _FrLdrDbgPrint[rip] + jmp $ + + /* Return */ + LEAVE_TRAP_FRAME + iretq .endproc .proc KiNpxNotAvailableFault

1 0

[tkreuzer] 43676: [KDCOM] - send a PACKET_TYPE_KD_RESEND in some more failure cases - return DataLength in KdReceivePacket - check the trailing byte - move some code out of the loop in KdSendPacket - add a few debugprints, remove some others
by tkreuzer＠svn.reactos.org 21 Oct '09

21 Oct '09

Author: tkreuzer Date: Wed Oct 21 23:58:30 2009 New Revision: 43676 URL: http://svn.reactos.org/svn/reactos?rev=43676&view=rev Log: [KDCOM] - send a PACKET_TYPE_KD_RESEND in some more failure cases - return DataLength in KdReceivePacket - check the trailing byte - move some code out of the loop in KdSendPacket - add a few debugprints, remove some others Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdserial.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] Wed Oct 21 23:58:30 2009 @@ -10,7 +10,7 @@ /* GLOBALS ********************************************************************/ -ULONG CurrentPacketId = INITIAL_PACKET_ID; +ULONG CurrentPacketId = INITIAL_PACKET_ID | SYNC_PACKET_ID; // HACK!!! DBGRNT KdpDbgPrint = 0; @@ -194,7 +194,9 @@ switch (Packet.PacketType) { case PACKET_TYPE_KD_ACKNOWLEDGE: - if (PacketType == PACKET_TYPE_KD_ACKNOWLEDGE) + /* Are we waiting for an ACK packet? */ + if (PacketType == PACKET_TYPE_KD_ACKNOWLEDGE && + Packet.PacketId == (CurrentPacketId & ~SYNC_PACKET_ID)) { /* Remote acknowledges the last packet */ CurrentPacketId ^= 1; @@ -210,6 +212,7 @@ /* Fall through */ case PACKET_TYPE_KD_RESEND: + KdpDbgPrint("KdReceivePacket - got PACKET_TYPE_KD_RESEND\n"); /* Remote wants us to resend the last packet */ return KDP_PACKET_RESEND; @@ -223,13 +226,18 @@ if (PacketType == PACKET_TYPE_KD_ACKNOWLEDGE) { /* We received something different, start over */ - continue; +// continue; + KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); + CurrentPacketId ^= 1; + return KDP_PACKET_RECEIVED; } /* Did we get the right packet type? */ if (PacketType != Packet.PacketType) { /* We received something different, start over */ + KdpDbgPrint("KdReceivePacket - wrong PacketType\n"); + KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); continue; } @@ -270,8 +278,9 @@ MessageHeader->Length); if (KdStatus != KDP_PACKET_RECEIVED) { - /* Didn't receive data. Start over. */ - KdpDbgPrint("KdReceivePacket - Didn't receive message header data. Start over\n"); + /* Didn't receive data. Packet needs to be resent. */ + KdpDbgPrint("KdReceivePacket - Didn't receive message header data.\n"); + KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); continue; } @@ -281,11 +290,14 @@ Checksum = KdpCalculateChecksum(MessageHeader->Buffer, MessageHeader->Length); + /* Calculate the length of the message data */ + *DataLength = Packet.ByteCount - MessageHeader->Length; + /* Shall we receive messsage data? */ if (MessageData) { - /* Calculate the length of the message data */ - MessageData->Length = Packet.ByteCount - MessageHeader->Length; + /* Set the length of the message data */ + MessageData->Length = *DataLength; /* Do we have data? */ if (MessageData->Length) @@ -298,7 +310,8 @@ if (KdStatus != KDP_PACKET_RECEIVED) { /* Didn't receive data. Start over. */ - KdpDbgPrint("KdReceivePacket - Didn't receive message data. Start over\n"); + KdpDbgPrint("KdReceivePacket - Didn't receive message data.\n"); + KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); continue; } @@ -311,14 +324,20 @@ /* Compare checksum */ if (Packet.Checksum != Checksum) { - KdpSendControlPacket(PACKET_TYPE_KD_RESEND, CurrentPacketId); KdpDbgPrint("KdReceivePacket - wrong cheksum, got %x, calculated %x\n", Packet.Checksum, Checksum); + KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); continue; } /* We must receive a PACKET_TRAILING_BYTE now */ KdStatus = KdpReceiveBuffer(&Byte, sizeof(UCHAR)); + if (KdStatus != KDP_PACKET_RECEIVED || Byte != PACKET_TRAILING_BYTE) + { + KdpDbgPrint("KdReceivePacket - wrong trailing byte (0x%x), status 0x%x\n", Byte, KdStatus); + KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); + continue; + } /* Acknowledge the received packet */ KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE, Packet.PacketId); @@ -343,23 +362,23 @@ KD_PACKET Packet; KDP_STATUS KdStatus; + /* Initialize a KD_PACKET */ + Packet.PacketLeader = PACKET_LEADER; + Packet.PacketType = PacketType; + Packet.ByteCount = MessageHeader->Length; + Packet.Checksum = KdpCalculateChecksum(MessageHeader->Buffer, + MessageHeader->Length); + + /* If we have message data, add it to the packet */ + if (MessageData) + { + Packet.ByteCount += MessageData->Length; + Packet.Checksum += KdpCalculateChecksum(MessageData->Buffer, + MessageData->Length); + } + for (;;) { - /* Initialize a KD_PACKET */ - Packet.PacketLeader = PACKET_LEADER; - Packet.PacketType = PacketType; - Packet.ByteCount = MessageHeader->Length; - Packet.Checksum = KdpCalculateChecksum(MessageHeader->Buffer, - MessageHeader->Length); - - /* If we have message data, add it to the packet */ - if (MessageData) - { - Packet.ByteCount += MessageData->Length; - Packet.Checksum += KdpCalculateChecksum(MessageData->Buffer, - MessageData->Length); - } - /* Set the packet id */ Packet.PacketId = CurrentPacketId; @@ -396,7 +415,7 @@ if (PacketType == PACKET_TYPE_KD_DEBUG_IO) { /* No response, silently fail. */ -// return; + return; } /* Packet timed out, send it again */ Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdserial.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdserial.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdserial.c [iso-8859-1] Wed Oct 21 23:58:30 2009 @@ -80,8 +80,6 @@ /* Set first character to 0 */ Buffer[0] = 0; -KdpDbgPrint("KdpReceivePacketLeader\n" ); - do { /* Receive a single Byte */ @@ -108,7 +106,6 @@ if (Byte == PACKET_LEADER_BYTE || Byte == CONTROL_PACKET_LEADER_BYTE) { - KdpDbgPrint("received byte 0x%x, Index = %d\n", Byte, Index); /* Check if we match the first byte */ if (Byte != Buffer[0]) { @@ -138,8 +135,6 @@ /* Return the received packet leader */ *PacketLeader = *(PULONG)Buffer; -KdpDbgPrint("KDP_PACKET_RECEIVED\n"); - return KDP_PACKET_RECEIVED; }

1 0

[dreimer] 43675: Add Elevation Tool into the PS Port, too. With some luck it works.
by dreimer＠svn.reactos.org 21 Oct '09

21 Oct '09

Author: dreimer Date: Wed Oct 21 23:19:05 2009 New Revision: 43675 URL: http://svn.reactos.org/svn/reactos?rev=43675&view=rev Log: Add Elevation Tool into the PS Port, too. With some luck it works. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Wed Oct 21 23:19:05 2009 @@ -78,19 +78,6 @@ New-PInvoke user32.dll "public static extern void FlashWindow(IntPtr hwnd, bool bInvert);" -# Web Downloader in a function. - -function global:Get-WebFile { - param( - $url = $null, - $file = $null - ) - $local:ErrorActionPreference = "SilentlyContinue" - $clnt = new-object System.Net.WebClient - $clnt.DownloadFile($url,$file) - $local:ErrorActionPreference = "Continue" -} - # Load the doskey macros and delete any macros for components # that are not actually present. function LoadAliases { @@ -131,10 +118,7 @@ set-alias SSVN "$_ROSBE_BASEDIR\sSVN.ps1" -scope Global set-alias SVN "$_ROSBE_BASEDIR\Tools\svn.exe" -scope Global } - - if (Test-Path "$_ROSBE_BASEDIR\update.ps1") { - set-alias UPDATE "$_ROSBE_BASEDIR\update.ps1" -scope Global - } + function global:UPDATE($xargs) {IEX "&'$_ROSBE_BASEDIR\Tools\Elevate.exe' '$pshome\powershell.exe' -noexit {&'$_ROSBE_BASEDIR\update.ps1' '$_ROSBE_VERSION' '$_ROSBE_BASEDIR' $($xargs)}"} set-alias VERSION "$_ROSBE_BASEDIR\version.ps1" -scope Global Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Wed Oct 21 23:19:05 2009 @@ -8,6 +8,22 @@ # $host.ui.RawUI.WindowTitle = "Updating..." + +$_ROSBE_VERSION = "$($args[0])" +$_ROSBE_BASEDIR = "$($args[1])" + +# Web Downloader in a function. + +function global:Get-WebFile { + param( + $url = $null, + $file = $null + ) + $local:ErrorActionPreference = "SilentlyContinue" + $clnt = new-object System.Net.WebClient + $clnt.DownloadFile($url,$file) + $local:ErrorActionPreference = "Continue" +} function EOC { set-location "$_ROSBE_OPATH" @@ -89,25 +105,25 @@ if (!(Test-Path "$ENV:APPDATA\RosBE\Updates")) {New-Item -path "$ENV:APPDATA\RosBE" -name "Updates" -type directory} set-location "$ENV:APPDATA\RosBE\Updates" -if ("$args" -eq "") { +if ("$($args[2])" -eq "") { $_ROSBE_MULTIUPD = 1 $_ROSBE_STATCOUNT = 1 while ($_ROSBE_STATCOUNT -lt 10) { UPDCHECK $_ROSBE_STATCOUNT += 1 } -} elseif ("$args" -eq "reset") { +} elseif ("$($args[2])" -eq "reset") { remove-item "$ENV:APPDATA\RosBE\Updates\*.*" -force -recurse -EA SilentlyContinue remove-item "$ENV:APPDATA\RosBE\Updates\tmp\*.*" -force -recurse -EA SilentlyContinue -} elseif ("$($args[0])" -eq "nr") { - $_ROSBE_STATCOUNT = $($args[1]) +} elseif ("$($args[2])" -eq "nr") { + $_ROSBE_STATCOUNT = $($args[3]) UPDCHECK -} elseif ("$($args[0])" -eq "delete") { - $_ROSBE_STATCOUNT = $($args[1]) +} elseif ("$($args[2])" -eq "delete") { + $_ROSBE_STATCOUNT = $($args[3]) remove-item "$ENV:APPDATA\RosBE\Updates\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.*" -force -recurse -EA SilentlyContinue remove-item "$ENV:APPDATA\RosBE\Updates\tmp\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.*" -force -recurse -EA SilentlyContinue -} elseif ("$($args[0])" -eq "info") { - $_ROSBE_STATCOUNT = $($args[1]) +} elseif ("$($args[2])" -eq "info") { + $_ROSBE_STATCOUNT = $($args[3]) set-location tmp if (!(Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { get-webfile $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt $PWD\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt @@ -119,7 +135,7 @@ } set-location .. remove-item "tmp\*.*" -force -EA SilentlyContinue -} elseif ("$args" -eq "status") { +} elseif ("$($args[2])" -eq "status") { $_ROSBE_STATCOUNT = 1 if (!(test-path "tmp")) {New-Item -name "tmp" -type directory} copy-item *.txt .\tmp\.

1 0

[tkreuzer] 43674: Rework kdcom, try to make it "portable", now in kddll folder, where other versions like kdusb and kd1394 can have a warm place, too. It still has issues.
by tkreuzer＠svn.reactos.org 21 Oct '09

21 Oct '09

Author: tkreuzer Date: Wed Oct 21 22:03:27 2009 New Revision: 43674 URL: http://svn.reactos.org/svn/reactos?rev=43674&view=rev Log: Rework kdcom, try to make it "portable", now in kddll folder, where other versions like kdusb and kd1394 can have a warm place, too. It still has issues. Added: branches/ros-amd64-bringup/reactos/drivers/base/kddll/ (with props) branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdcom.c (with props) branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdcom.h (with props) branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c (with props) branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h (with props) branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.rbuild (with props) branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.spec (with props) branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdserial.c (with props) Modified: branches/ros-amd64-bringup/reactos/drivers/base/directory.rbuild Modified: branches/ros-amd64-bringup/reactos/drivers/base/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/directory.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/directory.rbuild [iso-8859-1] Wed Oct 21 22:03:27 2009 @@ -7,8 +7,11 @@ <directory name="bootvid"> <xi:include href="bootvid/bootvid.rbuild" /> </directory> -<directory name="kdcom"> + +<directory name="kddll"> + <xi:include href="kddll/kddll.rbuild" /> </directory> <directory name="null"> <xi:include href="null/null.rbuild" /> Propchange: branches/ros-amd64-bringup/reactos/drivers/base/kddll/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Oct 21 22:03:27 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-amd64-bringup/reactos/drivers/base/kddll/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-amd64-bringup/reactos/drivers/base/kddll/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-amd64-bringup/reactos/drivers/base/kddll/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdcom.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdcom.c (added) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] Wed Oct 21 22:03:27 2009 @@ -1,0 +1,294 @@ +/* + * COPYRIGHT: GPL, see COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/base/kddll/kdcom.c + * PURPOSE: COM port functions for the kernel debugger. + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)ewactos.org) + */ + +#include "kddll.h" +#include "kdcom.h" + +/* Define wait timeout value. */ +#define REPEAT_COUNT (1000 * 1000) + +/* serial debug connection */ +#define DEFAULT_DEBUG_PORT 2 /* COM2 */ +#define DEFAULT_DEBUG_COM1_IRQ 4 /* COM1 IRQ */ +#define DEFAULT_DEBUG_COM2_IRQ 3 /* COM2 IRQ */ +#define DEFAULT_DEBUG_BAUD_RATE 115200 /* 115200 Baud */ + +#define DEFAULT_BAUD_RATE 19200 + + +#if defined(_M_IX86) || defined(_M_AMD64) +const ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; +#elif defined(_M_PPC) +const ULONG BaseArray[2] = {0, 0x800003f8}; +#elif defined(_M_MIPS) +const ULONG BaseArray[3] = {0, 0x80006000, 0x80007000}; +#elif defined(_M_ARM) +const ULONG BaseArray[2] = {0, 0xF1012000}; +#else +#error Unknown architecture +#endif + +/* GLOBALS ********************************************************************/ + +PUCHAR ComPortBase; +ULONG ComPortNumber = DEFAULT_DEBUG_PORT; +ULONG ComPortBaudRate = DEFAULT_DEBUG_BAUD_RATE; +ULONG ComPortIrq = 0; + + +NTSTATUS +NTAPI +KdpPortInitialize() +{ + ULONG Mode; + +KdpDbgPrint("KdpPortInitialize\n"); + + /* Enable loop mode (set Bit 4 of the MCR) */ + WRITE_PORT_UCHAR(ComPortBase + COM_MCR, MCR_LOOP); + + /* Clear all modem output bits */ + WRITE_PORT_UCHAR(ComPortBase + COM_MCR, MCR_LOOP); + + /* The upper nibble of the MSR (modem output bits) must be + * equal to the lower nibble of the MCR (modem input bits) */ + if ((READ_PORT_UCHAR(ComPortBase + COM_MSR) & 0xF0) != 0x00) + { + return STATUS_INVALID_PARAMETER; + } + + /* Set all modem output bits */ + WRITE_PORT_UCHAR(ComPortBase + COM_MCR, MCR_ALL); + + /* The upper nibble of the MSR (modem output bits) must be + * equal to the lower nibble of the MCR (modem input bits) */ + if ((READ_PORT_UCHAR(ComPortBase + COM_MSR) & 0xF0) != 0xF0) + { + return STATUS_INVALID_PARAMETER; + } + + /* Enable FIFO */ + WRITE_PORT_UCHAR(ComPortBase + COM_FCR, + FCR_ENABLE_FIFO | FCR_CLEAR_RCVR | FCR_CLEAR_XMIT); + + /* Disable interrupts */ + WRITE_PORT_UCHAR(ComPortBase + COM_LCR, 0); + WRITE_PORT_UCHAR(ComPortBase + COM_IEN, 0); + + /* Enable on DTR and RTS */ + WRITE_PORT_UCHAR(ComPortBase + COM_MCR, MCR_DTR | MCR_RTS); + + /* Set DLAB */ + WRITE_PORT_UCHAR(ComPortBase + COM_LCR, LCR_DLAB); + + /* Set baud rate */ + Mode = 115200 / ComPortBaudRate; + WRITE_PORT_UCHAR(ComPortBase + COM_DLL, (UCHAR)(Mode & 0xff)); + WRITE_PORT_UCHAR(ComPortBase + COM_DLM, (UCHAR)((Mode >> 8) & 0xff)); + + /* Reset DLAB and set 8 data bits, 1 stop bit, no parity, no break */ + WRITE_PORT_UCHAR(ComPortBase + COM_LCR, LCR_CS8 | LCR_ST1 | LCR_PNO); + + /* Check for 16450/16550 scratch register */ + WRITE_PORT_UCHAR(ComPortBase + COM_SCR, 0xff); + if (READ_PORT_UCHAR(ComPortBase + COM_SCR) != 0xff) + { + return STATUS_INVALID_PARAMETER; + } + WRITE_PORT_UCHAR(ComPortBase + COM_SCR, 0x00); + if (READ_PORT_UCHAR(ComPortBase + COM_SCR) != 0x00) + { + return STATUS_INVALID_PARAMETER; + } + + return STATUS_SUCCESS; +} + +/****************************************************************************** + * \name KdDebuggerInitialize0 + * \brief Phase 0 initialization. + * \param [opt] LoaderBlock Pointer to the Loader parameter block. Can be NULL. + * \return Status + */ +NTSTATUS +NTAPI +KdDebuggerInitialize0( + IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) +{ + PCHAR CommandLine, PortString, BaudString, IrqString; + ULONG Value; + + /* Check if e have a LoaderBlock */ + if (LoaderBlock) + { + /* Get the Command Line */ + CommandLine = LoaderBlock->LoadOptions; + + /* Upcase it */ + _strupr(CommandLine); + + /* Get the port and baud rate */ + PortString = strstr(CommandLine, "DEBUGPORT"); + BaudString = strstr(CommandLine, "BAUDRATE"); + IrqString = strstr(CommandLine, "IRQ"); + + /* Check if we got the /DEBUGPORT parameter */ + if (PortString) + { + /* Move past the actual string, to reach the port*/ + PortString += strlen("DEBUGPORT"); + + /* Now get past any spaces and skip the equal sign */ + while (*PortString == ' ') PortString++; + PortString++; + + /* Do we have a serial port? */ + if (strncmp(PortString, "COM", 3) != 0) + { + return STATUS_INVALID_PARAMETER; + } + + /* Gheck for a valid Serial Port */ + PortString += 3; + Value = atol(PortString); + if (Value > 4) + { + return STATUS_INVALID_PARAMETER; + } + + /* Set the port to use */ + ComPortNumber = Value; + } + + /* Check if we got a baud rate */ + if (BaudString) + { + /* Move past the actual string, to reach the rate */ + BaudString += strlen("BAUDRATE"); + + /* Now get past any spaces */ + while (*BaudString == ' ') BaudString++; + + /* And make sure we have a rate */ + if (*BaudString) + { + /* Read and set it */ + Value = atol(BaudString + 1); + if (Value) ComPortBaudRate = Value; + } + } + + /* Check Serial Port Settings [IRQ] */ + if (IrqString) + { + /* Move past the actual string, to reach the rate */ + IrqString += strlen("IRQ"); + + /* Now get past any spaces */ + while (*IrqString == ' ') IrqString++; + + /* And make sure we have an IRQ */ + if (*IrqString) + { + /* Read and set it */ + Value = atol(IrqString + 1); + if (Value) ComPortIrq = Value; + } + } + } + + // HACK use com1 for FrLdrDbg, com2 for WinDbg + ComPortNumber = 2; + + /* Get base address */ + ComPortBase = UlongToPtr(BaseArray[ComPortNumber]); + + /* Initialize the port */ + return KdpPortInitialize(); +} + +VOID +NTAPI +KdpSendByte(IN BYTE Byte) +{ + /* Wait for the port to be ready */ + while ((READ_PORT_UCHAR(ComPortBase + COM_LSR) & LSR_TBE) == 0); + + /* Send the byte */ + WRITE_PORT_UCHAR(ComPortBase + COM_DAT, Byte); +} + +KDP_STATUS +NTAPI +KdpPollByte(OUT PBYTE OutByte) +{ + /* Check if data is available */ + if ((READ_PORT_UCHAR(ComPortBase + COM_LSR) & LSR_DR)) + { + /* Yes, return the byte */ + *OutByte = READ_PORT_UCHAR(ComPortBase + COM_DAT); + return KDP_PACKET_RECEIVED; + } + + /* Timed out */ + return KDP_PACKET_TIMEOUT; +} + +KDP_STATUS +NTAPI +KdpReceiveByte(OUT PBYTE OutByte) +{ + ULONG Repeats = REPEAT_COUNT; + + while (Repeats--) + { + /* Check if data is available */ + if (KdpPollByte(OutByte) == KDP_PACKET_RECEIVED) + { + /* We successfully got a byte */ + return KDP_PACKET_RECEIVED; + } + } + + /* Timed out */ + return KDP_PACKET_TIMEOUT; +} + +KDP_STATUS +NTAPI +KdpPollBreakIn() +{ + UCHAR Byte; + if (KdpPollByte(&Byte) == KDP_PACKET_RECEIVED) + { + if (Byte == BREAKIN_PACKET_BYTE) + { + return KDP_PACKET_RECEIVED; + } + } + return KDP_PACKET_TIMEOUT; +} + +NTSTATUS +NTAPI +KdSave( + IN BOOLEAN SleepTransition) +{ + /* Nothing to do on COM ports */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdRestore( + IN BOOLEAN SleepTransition) +{ + /* Nothing to do on COM ports */ + return STATUS_SUCCESS; +} + Propchange: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdcom.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdcom.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdcom.h (added) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdcom.h [iso-8859-1] Wed Oct 21 22:03:27 2009 @@ -1,0 +1,53 @@ +/* + * COPYRIGHT: GPL, see COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/base/kddll/kdcom.h + * PURPOSE: COM port definitions for the kernel debugger. + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)ewactos.org) + */ + +#define COM_DAT 0x00 +#define COM_IEN 0x01 // interrupt enable register +#define COM_FCR 0x02 // FIFO Control Register +#define COM_LCR 0x03 // line control registers +#define COM_MCR 0x04 // modem control reg +#define COM_LSR 0x05 // line status register +#define COM_MSR 0x06 // modem status register +#define COM_SCR 0x07 // scratch register +#define COM_DLL 0x00 // divisor latch least sig +#define COM_DLM 0x01 // divisor latch most sig + +#define IEN_ERDA 0x01 +#define IEN_ETHRE 0x02 +#define IEN_ERLSI 0x04 +#define IEN_EMS 0x08 +#define IEN_ALL 0x0F +#define FCR_ENABLE_FIFO 0x01 +#define FCR_CLEAR_RCVR 0x02 +#define FCR_CLEAR_XMIT 0x04 +#define LCR_CS5 0x00 +#define LCR_CS6 0x01 +#define LCR_CS7 0x02 +#define LCR_CS8 0x03 +#define LCR_ST1 0x00 +#define LCR_ST2 0x04 +#define LCR_PNO 0x00 +#define LCR_POD 0x08 +#define LCR_PEV 0x18 +#define LCR_PMK 0x28 +#define LCR_PSP 0x38 +#define LCR_BRK 0x40 +#define LCR_DLAB 0x80 +#define MCR_DTR 0x01 +#define MCR_RTS 0x02 +#define MCR_OUT1 0x04 // general purpose output. +#define MCR_OUT2 0x08 +#define MCR_LOOP 0x10 // enables loopback testing mode +#define MCR_ALL (MCR_DTR | MCR_RTS | MCR_OUT1 | MCR_OUT2 | MCR_LOOP) +#define LSR_DR 0x01 +#define LSR_TBE 0x20 +#define MSR_CTS 0x10 // (complemented) state of clear to send (CTS). +#define MSR_DSR 0x20 // (complemented) state of data set ready (DSR). +#define MSR_RI 0x40 // (complemented) state of ring indicator (RI). +#define MSR_DCD 0x80 // (complemented) state of data carrier detect (DCD). + Propchange: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdcom.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c (added) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] Wed Oct 21 22:03:27 2009 @@ -1,0 +1,407 @@ +/* + * COPYRIGHT: GPL, see COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/base/kddll/kddll.c + * PURPOSE: Base functions for the kernel debugger. + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)ewactos.org) + */ + +#include "kddll.h" + +/* GLOBALS ********************************************************************/ + +ULONG CurrentPacketId = INITIAL_PACKET_ID; + +// HACK!!! +DBGRNT KdpDbgPrint = 0; + + +/****************************************************************************** + * \name KdpCalculateChecksum + * \brief Calculates the checksum for the packet data. + * \param Buffer Pointer to the packet data. + * \param Length Length of data in bytes. + * \return The calculated checksum. + * \sa http://www.vista-xp.co.uk/forums/technical-reference-library/2540-basics-de… + */ +ULONG +NTAPI +KdpCalculateChecksum( + IN PVOID Buffer, + IN ULONG Length) +{ + ULONG i, Checksum = 0; + + for (i = 0; i < Length; i++) + { + Checksum += ((PUCHAR)Buffer)[i]; + } + + return Checksum; +} + +VOID +NTAPI +KdpSendControlPacket( + IN USHORT PacketType, + IN ULONG PacketId OPTIONAL) +{ + KD_PACKET Packet; + + Packet.PacketLeader = CONTROL_PACKET_LEADER; + Packet.PacketId = PacketId; + Packet.ByteCount = 0; + Packet.Checksum = 0; + Packet.PacketType = PacketType; + + KdpSendBuffer(&Packet, sizeof(KD_PACKET)); +} + + +/** Public exported functions *************************************************/ + +NTSTATUS +NTAPI +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdD0Transition(VOID) +{ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdD3Transition(VOID) +{ + return STATUS_SUCCESS; +} + + +/****************************************************************************** + * \name KdDebuggerInitialize1 + * \brief Phase 1 initialization. + * \param [opt] LoaderBlock Pointer to the Loader parameter block. Can be NULL. + * \return Status + */ +NTSTATUS +NTAPI +KdDebuggerInitialize1( + IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) +{ + // HACK: misuse this function to get a pointer to FrLdrDbgPrint + KdpDbgPrint = (PVOID)LoaderBlock; + KdpDbgPrint("KdDebuggerInitialize1\n"); + + return STATUS_NOT_IMPLEMENTED; +} + + +/****************************************************************************** + * \name KdReceivePacket + * \brief Receive a packet from the KD port. + * \param [in] PacketType Describes the type of the packet to receive. + * This can be one of the PACKET_TYPE_ constants. + * \param [out] MessageHeader Pointer to a STRING structure for the header. + * \param [out] MessageData Pointer to a STRING structure for the data. + * \return KdPacketReceived if successful, KdPacketTimedOut if the receive + * timed out, KdPacketNeedsResend to signal that the last packet needs + * to be sent again. + * \note If PacketType is PACKET_TYPE_KD_POLL_BREAKIN, the function doesn't + * wait for any data, but returns KdPacketTimedOut instantly if no breakin + * packet byte is received. + * \sa http://www.nynaeve.net/?p=169 + */ +KDP_STATUS +NTAPI +KdReceivePacket( + IN ULONG PacketType, + OUT PSTRING MessageHeader, + OUT PSTRING MessageData, + OUT PULONG DataLength, + IN OUT PKD_CONTEXT Context) +{ + UCHAR Byte = 0; + KDP_STATUS KdStatus; + KD_PACKET Packet; + ULONG Checksum; + + /* Special handling for breakin packet */ + if(PacketType == PACKET_TYPE_KD_POLL_BREAKIN) + { + return KdpPollBreakIn(); + } + + for (;;) + { + /* Step 1 - Read PacketLeader */ + KdStatus = KdpReceivePacketLeader(&Packet.PacketLeader); + if (KdStatus != KDP_PACKET_RECEIVED) + { + /* Couldn't read a correct packet leader. */ + return KdStatus; + } + + /* Step 2 - Read PacketType */ + KdStatus = KdpReceiveBuffer(&Packet.PacketType, sizeof(USHORT)); + if (KdStatus != KDP_PACKET_RECEIVED) + { + /* Didn't receive a PacketType or PacketType is bad. Start over. */ + continue; + } + + /* Step 3 - Read ByteCount */ + KdStatus = KdpReceiveBuffer(&Packet.ByteCount, sizeof(USHORT)); + if (KdStatus != KDP_PACKET_RECEIVED || Packet.ByteCount > PACKET_MAX_SIZE) + { + /* Didn't receive ByteCount or it's too big. Start over. */ + continue; + } + + /* Step 4 - Read PacketId */ + KdStatus = KdpReceiveBuffer(&Packet.PacketId, sizeof(ULONG)); + if (KdStatus != KDP_PACKET_RECEIVED) + { + /* Didn't receive PacketId. Start over. */ + continue; + } + +/* + if (Packet.PacketId != ExpectedPacketId) + { + // Ask for a resend! + continue; + } +*/ + + /* Step 5 - Read Checksum */ + KdStatus = KdpReceiveBuffer(&Packet.Checksum, sizeof(ULONG)); + if (KdStatus != KDP_PACKET_RECEIVED) + { + /* Didn't receive Checksum. Start over. */ + continue; + } + + /* Step 6 - Handle control packets */ + if (Packet.PacketLeader == CONTROL_PACKET_LEADER) + { + switch (Packet.PacketType) + { + case PACKET_TYPE_KD_ACKNOWLEDGE: + if (PacketType == PACKET_TYPE_KD_ACKNOWLEDGE) + { + /* Remote acknowledges the last packet */ + CurrentPacketId ^= 1; + return KDP_PACKET_RECEIVED; + } + /* That's not what we were waiting for, start over. */ + continue; + + case PACKET_TYPE_KD_RESET: + KdpDbgPrint("KdReceivePacket - got a reset packet\n"); + KdpSendControlPacket(PACKET_TYPE_KD_RESET, 0); + CurrentPacketId = INITIAL_PACKET_ID; + /* Fall through */ + + case PACKET_TYPE_KD_RESEND: + /* Remote wants us to resend the last packet */ + return KDP_PACKET_RESEND; + + default: + KdpDbgPrint("KdReceivePacket - got unknown control packet\n"); + return KDP_PACKET_RESEND; + } + } + + /* Did we wait for an ack packet? */ + if (PacketType == PACKET_TYPE_KD_ACKNOWLEDGE) + { + /* We received something different, start over */ + continue; + } + + /* Did we get the right packet type? */ + if (PacketType != Packet.PacketType) + { + /* We received something different, start over */ + continue; + } + + /* Get size of the message header */ + switch (Packet.PacketType) + { + case PACKET_TYPE_KD_STATE_CHANGE64: + MessageHeader->Length = sizeof(DBGKD_WAIT_STATE_CHANGE64); + break; + + case PACKET_TYPE_KD_STATE_MANIPULATE: + MessageHeader->Length = sizeof(DBGKD_MANIPULATE_STATE64); + break; + + case PACKET_TYPE_KD_DEBUG_IO: + MessageHeader->Length = sizeof(DBGKD_DEBUG_IO); + break; + + default: + KdpDbgPrint("KdReceivePacket - unknown PacketType\n"); + return KDP_PACKET_RESEND; + } + +//KdpDbgPrint("KdReceivePacket - got normal PacketType\n"); + + /* Packet smaller than expected? */ + if (MessageHeader->Length > Packet.ByteCount) + { + KdpDbgPrint("KdReceivePacket - too few data (%d) for type %d\n", + Packet.ByteCount, MessageHeader->Length); + MessageHeader->Length = Packet.ByteCount; + } + +//KdpDbgPrint("KdReceivePacket - got normal PacketType, Buffer = %p\n", MessageHeader->Buffer); + + /* Receive the message header data */ + KdStatus = KdpReceiveBuffer(MessageHeader->Buffer, + MessageHeader->Length); + if (KdStatus != KDP_PACKET_RECEIVED) + { + /* Didn't receive data. Start over. */ + KdpDbgPrint("KdReceivePacket - Didn't receive message header data. Start over\n"); + continue; + } + +//KdpDbgPrint("KdReceivePacket - got normal PacketType 3\n"); + + /* Calculate checksum for the header data */ + Checksum = KdpCalculateChecksum(MessageHeader->Buffer, + MessageHeader->Length); + + /* Shall we receive messsage data? */ + if (MessageData) + { + /* Calculate the length of the message data */ + MessageData->Length = Packet.ByteCount - MessageHeader->Length; + + /* Do we have data? */ + if (MessageData->Length) + { + KdpDbgPrint("KdReceivePacket - got data\n"); + + /* Receive the message data */ + KdStatus = KdpReceiveBuffer(MessageData->Buffer, + MessageData->Length); + if (KdStatus != KDP_PACKET_RECEIVED) + { + /* Didn't receive data. Start over. */ + KdpDbgPrint("KdReceivePacket - Didn't receive message data. Start over\n"); + continue; + } + + /* Add cheksum for message data */ + Checksum += KdpCalculateChecksum(MessageData->Buffer, + MessageData->Length); + } + } + + /* Compare checksum */ + if (Packet.Checksum != Checksum) + { + KdpSendControlPacket(PACKET_TYPE_KD_RESEND, CurrentPacketId); + KdpDbgPrint("KdReceivePacket - wrong cheksum, got %x, calculated %x\n", + Packet.Checksum, Checksum); + continue; + } + + /* We must receive a PACKET_TRAILING_BYTE now */ + KdStatus = KdpReceiveBuffer(&Byte, sizeof(UCHAR)); + + /* Acknowledge the received packet */ + KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE, Packet.PacketId); + +//KdpDbgPrint("KdReceivePacket - all ok\n"); + + return KDP_PACKET_RECEIVED; + } + + return KDP_PACKET_RECEIVED; +} + + +VOID +NTAPI +KdSendPacket( + IN ULONG PacketType, + IN PSTRING MessageHeader, + IN PSTRING MessageData, + IN OUT PKD_CONTEXT Context) +{ + KD_PACKET Packet; + KDP_STATUS KdStatus; + + for (;;) + { + /* Initialize a KD_PACKET */ + Packet.PacketLeader = PACKET_LEADER; + Packet.PacketType = PacketType; + Packet.ByteCount = MessageHeader->Length; + Packet.Checksum = KdpCalculateChecksum(MessageHeader->Buffer, + MessageHeader->Length); + + /* If we have message data, add it to the packet */ + if (MessageData) + { + Packet.ByteCount += MessageData->Length; + Packet.Checksum += KdpCalculateChecksum(MessageData->Buffer, + MessageData->Length); + } + + /* Set the packet id */ + Packet.PacketId = CurrentPacketId; + + /* Send the packet header to the KD port */ + KdpSendBuffer(&Packet, sizeof(KD_PACKET)); + + /* Send the message header */ + KdpSendBuffer(MessageHeader->Buffer, MessageHeader->Length); + + /* If we have meesage data, also send it */ + if (MessageData) + { + KdpSendBuffer(MessageData->Buffer, MessageData->Length); + } + + /* Finalize with a trailing byte */ + KdpSendByte(PACKET_TRAILING_BYTE); + + /* Wait for acknowledge */ + KdStatus = KdReceivePacket(PACKET_TYPE_KD_ACKNOWLEDGE, + NULL, + NULL, + 0, + NULL); + + /* Did we succeed? */ + if (KdStatus == KDP_PACKET_RECEIVED) + { + CurrentPacketId &= ~SYNC_PACKET_ID; + break; + } + + /* PACKET_TYPE_KD_DEBUG_IO is allowed to instantly timeout */ + if (PacketType == PACKET_TYPE_KD_DEBUG_IO) + { + /* No response, silently fail. */ +// return; + } + + /* Packet timed out, send it again */ + } + + return; +} + Propchange: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h (added) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h [iso-8859-1] Wed Oct 21 22:03:27 2009 @@ -1,0 +1,33 @@ +/* + * COPYRIGHT: GPL, see COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/base/kddll/kddll.h + * PURPOSE: Base definitions for the kernel debugger. + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)ewactos.org) + */ + +#define NOEXTAPI +#include <ntddk.h> +#define NDEBUG +#include <halfuncs.h> +#include <stdio.h> +#include <stdlib.h> +#include <debug.h> +#include "arc/arc.h" +#include "windbgkd.h" + +#include <wdbgexts.h> +#include <ioaccess.h> /* port intrinsics */ + +typedef UCHAR BYTE, *PBYTE; + +typedef ULONG (*DBGRNT)(const char *Format, ...); +extern DBGRNT KdpDbgPrint; + +typedef enum +{ + KDP_PACKET_RECEIVED = 0, + KDP_PACKET_TIMEOUT = 1, + KDP_PACKET_RESEND = 2 +} KDP_STATUS; + Propchange: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.rbuild (added) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.rbuild [iso-8859-1] Wed Oct 21 22:03:27 2009 @@ -1,0 +1,23 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> + +<module name="kdlib" type="staticlibrary"> + <include base="kdlib">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>kddll.c</file> +</module> + +<module name="kdserial" type="staticlibrary"> + <include base="kdserial">.</include> + <file>kdserial.c</file> +</module> + +<module name="kdcom" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kdcom.dll"> + <importlibrary definition="kddll.spec"></importlibrary> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" /> + <include base="kdcom">.</include> + <library>kdlib</library> + <library>kdserial</library> + <file>kdcom.c</file> +</module> Propchange: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.spec (added) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.spec [iso-8859-1] Wed Oct 21 22:03:27 2009 @@ -1,0 +1,8 @@ +@ stdcall KdD0Transition() +@ stdcall KdD3Transition() +@ stdcall KdDebuggerInitialize0(ptr) +@ stdcall KdDebuggerInitialize1(ptr) +@ stdcall KdReceivePacket(long ptr ptr ptr ptr) +@ stdcall KdRestore(long) +@ stdcall KdSave(long) +@ stdcall KdSendPacket(long ptr ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdserial.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdserial.c (added) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdserial.c [iso-8859-1] Wed Oct 21 22:03:27 2009 @@ -1,0 +1,145 @@ +/* + * COPYRIGHT: GPL, see COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/base/kddll/kdserial.c + * PURPOSE: Serial communication functions for the kernel debugger. + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)ewactos.org) + */ + +#include "kddll.h" + + + +/****************************************************************************** + * \name KdpSendBuffer + * \brief Sends a buffer of data to the serial KD port. + * \param Buffer Pointer to the data. + * \param Size Size of data in bytes. + */ +VOID +NTAPI +KdpSendBuffer( + IN PVOID Buffer, + IN ULONG Size) +{ + INT i; + for (i = 0; i < Size; i++) + { + KdpSendByte(((PUCHAR)Buffer)[i]); + } +} + +/****************************************************************************** + * \name KdpReceiveBuffer + * \brief Recieves data from the KD port and fills a buffer. + * \param Buffer Pointer to a buffer that receives the data. + * \param Size Size of data to receive in bytes. + * \return KDP_PACKET_RECEIVED if successful. + * KDP_PACKET_TIMEOUT if the receice timed out. + */ +KDP_STATUS +NTAPI +KdpReceiveBuffer( + OUT PVOID Buffer, + IN ULONG Size) +{ + ULONG i; + PUCHAR ByteBuffer = Buffer; + KDP_STATUS Status; + + for (i = 0; i < Size; i++) + { + /* Try to get a byte from the port */ + Status = KdpReceiveByte(&ByteBuffer[i]); + + if (Status != KDP_PACKET_RECEIVED) + { + return Status; + } + } + + return KDP_PACKET_RECEIVED; +} + + +/****************************************************************************** + * \name KdpReceivePacketLeader + * \brief Recieves a packet leadr from the KD port. + * \param PacketLeader Pointer to an ULONG that receives the packet leader. + * \return KDP_PACKET_RECEIVED if successful. + * KDP_PACKET_TIMEOUT if the receice timed out. + */ +KDP_STATUS +NTAPI +KdpReceivePacketLeader( + OUT PULONG PacketLeader) +{ + UCHAR Index = 0, Byte, Buffer[4]; + KDP_STATUS KdStatus; + + /* Set first character to 0 */ + Buffer[0] = 0; + +KdpDbgPrint("KdpReceivePacketLeader\n" ); + + do + { + /* Receive a single Byte */ + KdStatus = KdpReceiveByte(&Byte); + + /* Check for timeout */ + if (KdStatus == KDP_PACKET_TIMEOUT) + { + /* Report timeout */ + KdpDbgPrint("KDP_PACKET_TIMEOUT\n"); + return KDP_PACKET_TIMEOUT; + } + + /* Check if we received a byte */ + if (KdStatus == KDP_PACKET_RECEIVED) + { + /* Check for breakin byte */ + if (Byte == BREAKIN_PACKET_BYTE) + { + KdpDbgPrint("BREAKIN_PACKET_BYTE\n"); + } + + /* Check if this is a valid packet leader byte */ + if (Byte == PACKET_LEADER_BYTE || + Byte == CONTROL_PACKET_LEADER_BYTE) + { + KdpDbgPrint("received byte 0x%x, Index = %d\n", Byte, Index); + /* Check if we match the first byte */ + if (Byte != Buffer[0]) + { + /* No, this is the new byte 0! */ + Index = 0; + } + + /* Store the byte in the buffer */ + Buffer[Index] = Byte; + + /* Continue with next byte */ + Index++; + continue; + } + } + + /* Restart */ + Index = 0; + Buffer[0] = 0; + } + while (Index < 4); + + /* Enable the debugger */ +// KdDebuggerNotPresent = FALSE; + SharedUserData->KdDebuggerEnabled |= 0x00000002; + + /* Return the received packet leader */ + *PacketLeader = *(PULONG)Buffer; + +KdpDbgPrint("KDP_PACKET_RECEIVED\n"); + + return KDP_PACKET_RECEIVED; +} + Propchange: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kdserial.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs