Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 47678: [HAL]: Implement ISA BUS address translation.
by sir_richard＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: sir_richard Date: Mon Jun 7 22:59:46 2010 New Revision: 47678 URL: http://svn.reactos.org/svn/reactos?rev=47678&view=rev Log: [HAL]: Implement ISA BUS address translation. Modified: trunk/reactos/hal/halx86/generic/legacy/bus/isabus.c Modified: trunk/reactos/hal/halx86/generic/legacy/bus/isabus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bus/isabus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bus/isabus.c [iso-8859-1] Mon Jun 7 22:59:46 2010 @@ -24,9 +24,28 @@ IN OUT PULONG AddressSpace, OUT PPHYSICAL_ADDRESS TranslatedAddress) { - DPRINT1("ISA Translate\n"); - while (TRUE); - return FALSE; + BOOLEAN Status; + + /* Use system translation */ + Status = HalpTranslateSystemBusAddress(BusHandler, + RootHandler, + BusAddress, + AddressSpace, + TranslatedAddress); + + /* If it didn't work and it was memory address space... */ + if (!(Status) && (*AddressSpace == 0)) + { + /* Try EISA translation instead */ + Status = HalTranslateBusAddress(Eisa, + BusHandler->BusNumber, + BusAddress, + AddressSpace, + TranslatedAddress); + } + + /* Return the result */ + return Status; } /* EOF */

1 0

[sir_richard] 47677: [HAL]: Implement system bus address translation.
by sir_richard＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: sir_richard Date: Mon Jun 7 22:59:00 2010 New Revision: 47677 URL: http://svn.reactos.org/svn/reactos?rev=47677&view=rev Log: [HAL]: Implement system bus address translation. Modified: trunk/reactos/hal/halx86/generic/legacy/bus/sysbus.c Modified: trunk/reactos/hal/halx86/generic/legacy/bus/sysbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bus/sysbus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bus/sysbus.c [iso-8859-1] Mon Jun 7 22:59:00 2010 @@ -24,8 +24,89 @@ IN OUT PULONG AddressSpace, OUT PPHYSICAL_ADDRESS TranslatedAddress) { - DPRINT1("SYSTEM Translate\n"); - while (TRUE); + PSUPPORTED_RANGE Range = NULL; + + /* Check what kind of address space this is */ + switch (*AddressSpace) + { + /* Memory address */ + case 0: + + /* Loop all prefetech memory */ + for (Range = &BusHandler->BusAddresses->PrefetchMemory; + Range; + Range = Range->Next) + { + /* Check if it's in a valid range */ + if ((BusAddress.QuadPart >= Range->Base) && + (BusAddress.QuadPart <= Range->Limit)) + { + /* Get out */ + break; + } + } + + /* Check if we haven't found anything yet */ + if (!Range) + { + /* Loop all bus memory */ + for (Range = &BusHandler->BusAddresses->Memory; + Range; + Range = Range->Next) + { + /* Check if it's in a valid range */ + if ((BusAddress.QuadPart >= Range->Base) && + (BusAddress.QuadPart <= Range->Limit)) + { + /* Get out */ + break; + } + } + } + + /* Done */ + break; + + /* I/O Space */ + case 1: + + /* Loop all bus I/O memory */ + for (Range = &BusHandler->BusAddresses->IO; + Range; + Range = Range->Next) + { + /* Check if it's in a valid range */ + if ((BusAddress.QuadPart >= Range->Base) && + (BusAddress.QuadPart <= Range->Limit)) + { + /* Get out */ + break; + } + } + + /* Done */ + break; + } + + /* Check if we found a range */ + if (Range) + { + /* Do the translation and return the kind of address space this is */ + TranslatedAddress->QuadPart = BusAddress.QuadPart + Range->SystemBase; + if ((TranslatedAddress->QuadPart != BusAddress.QuadPart) || + (*AddressSpace != Range->SystemAddressSpace)) + { + /* Different than what the old HAL would do */ + DPRINT1("Translation of %I64x is %I64x %s\n", + BusAddress.QuadPart, TranslatedAddress->QuadPart, + Range->SystemAddressSpace ? "In I/O Space" : "In RAM"); + } + *AddressSpace = Range->SystemAddressSpace; + return TRUE; + } + + /* Nothing found */ + DPRINT1("Translation of %I64x failed!\n", BusAddress.QuadPart); return FALSE; }

1 0

[sir_richard] 47676: [HAL]: Implement Bus Handler support for HalGetInterruptVector too. The new functionality now includes support for checking against reserved HAL vectors instead of blindling assining IRQLs/Vectors to callers. A warning is printed on the debug log when the old HAL would've returned different values. Please test. If you have issues, the problem is in the DRIVERS, not this code.
by sir_richard＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: sir_richard Date: Mon Jun 7 22:39:11 2010 New Revision: 47676 URL: http://svn.reactos.org/svn/reactos?rev=47676&view=rev Log: [HAL]: Implement Bus Handler support for HalGetInterruptVector too. The new functionality now includes support for checking against reserved HAL vectors instead of blindling assining IRQLs/Vectors to callers. A warning is printed on the debug log when the old HAL would've returned different values. Please test. If you have issues, the problem is in the DRIVERS, not this code. Modified: trunk/reactos/hal/halx86/generic/legacy/bussupp.c Modified: trunk/reactos/hal/halx86/generic/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] Mon Jun 7 22:39:11 2010 @@ -1163,10 +1163,10 @@ ULONG NTAPI HalpGetSystemInterruptVector_Acpi(IN ULONG BusNumber, - IN ULONG BusInterruptLevel, - IN ULONG BusInterruptVector, - OUT PKIRQL Irql, - OUT PKAFFINITY Affinity) + IN ULONG BusInterruptLevel, + IN ULONG BusInterruptVector, + OUT PKIRQL Irql, + OUT PKAFFINITY Affinity) { ULONG Vector = IRQ2VECTOR(BusInterruptLevel); *Irql = (KIRQL)VECTOR2IRQL(Vector); @@ -1314,12 +1314,38 @@ OUT PKIRQL Irql, OUT PKAFFINITY Affinity) { - /* Call the system bus translator */ - return HalpGetSystemInterruptVector_Acpi(BusNumber, - BusInterruptLevel, - BusInterruptVector, - Irql, - Affinity); + PBUS_HANDLER Handler; + ULONG Vector; + PAGED_CODE(); + + /* Defaults */ + *Irql = 0; + *Affinity = 0; + + /* Find the handler */ + Handler = HalReferenceHandlerForBus(InterfaceType, BusNumber); + if (!Handler) return 0; + + /* Do the assignment */ + Vector = Handler->GetInterruptVector(Handler, + Handler, + BusInterruptLevel, + BusInterruptVector, + Irql, + Affinity); + if ((Vector != IRQ2VECTOR(BusInterruptLevel)) || + (*Irql != VECTOR2IRQL(IRQ2VECTOR(BusInterruptLevel)))) + { + DPRINT1("Returning IRQL %lx, Vector %lx for Level/Vector: %lx/%lx\n", + *Irql, Vector, BusInterruptLevel, BusInterruptVector); + DPRINT1("Old HAL would've returned IRQL %lx and Vector %lx\n", + VECTOR2IRQL(IRQ2VECTOR(BusInterruptLevel)), + IRQ2VECTOR(BusInterruptLevel)); + } + + /* Dereference the handler and return */ + HalDereferenceBusHandler(Handler); + return Vector; } /*

1 0

[sir_richard] 47675: [HAL]: Implement PCI Vector/IRQL translation too.
by sir_richard＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: sir_richard Date: Mon Jun 7 22:37:45 2010 New Revision: 47675 URL: http://svn.reactos.org/svn/reactos?rev=47675&view=rev Log: [HAL]: Implement PCI Vector/IRQL translation too. Modified: trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c Modified: trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c [iso-8859-1] Mon Jun 7 22:37:45 2010 @@ -516,9 +516,16 @@ OUT PKIRQL Irql, OUT PKAFFINITY Affinity) { - UNIMPLEMENTED; - while (TRUE); - return 0; + /* Validate the level first */ + if (BusInterruptLevel < 1) return 0; + + /* PCI has its IRQs on top of ISA IRQs, so pass it on to the ISA handler */ + return HalGetInterruptVector(Isa, + 0, + BusInterruptLevel, + 0, + Irql, + Affinity); } VOID

1 0

[sir_richard] 47674: [HALMP]: MP HAL should have HalpDefaultInterruptAffinity too.
by sir_richard＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: sir_richard Date: Mon Jun 7 22:37:19 2010 New Revision: 47674 URL: http://svn.reactos.org/svn/reactos?rev=47674&view=rev Log: [HALMP]: MP HAL should have HalpDefaultInterruptAffinity too. Modified: trunk/reactos/hal/halx86/mp/processor_mp.c Modified: trunk/reactos/hal/halx86/mp/processor_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/processor_mp… ============================================================================== --- trunk/reactos/hal/halx86/mp/processor_mp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/processor_mp.c [iso-8859-1] Mon Jun 7 22:37:19 2010 @@ -18,7 +18,7 @@ #define NDEBUG #include <debug.h> -KAFFINITY HalpActiveProcessors; +KAFFINITY HalpActiveProcessors, HalpDefaultInterruptAffinity; /* PRIVATE FUNCTIONS *********************************************************/

1 0

[sir_richard] 47673: [HAL]: Forgot file.
by sir_richard＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: sir_richard Date: Mon Jun 7 22:35:02 2010 New Revision: 47673 URL: http://svn.reactos.org/svn/reactos?rev=47673&view=rev Log: [HAL]: Forgot file. Modified: trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Mon Jun 7 22:35:02 2010 @@ -816,3 +816,8 @@ extern BOOLEAN HalDisableFirmwareMapper; extern PWCHAR HalHardwareIdString; extern PWCHAR HalName; + +extern KAFFINITY HalpDefaultInterruptAffinity; + +extern IDTUsageFlags HalpIDTUsageFlags[MAXIMUM_IDTVECTOR]; +

1 0

[sir_richard] 47672: [HAL]: Implement system bus (and ISA) vector/interrupt translation.
by sir_richard＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: sir_richard Date: Mon Jun 7 22:34:41 2010 New Revision: 47672 URL: http://svn.reactos.org/svn/reactos?rev=47672&view=rev Log: [HAL]: Implement system bus (and ISA) vector/interrupt translation. Modified: trunk/reactos/hal/halx86/generic/legacy/bus/sysbus.c Modified: trunk/reactos/hal/halx86/generic/legacy/bus/sysbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bus/sysbus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bus/sysbus.c [iso-8859-1] Mon Jun 7 22:34:41 2010 @@ -31,6 +31,35 @@ ULONG NTAPI +HalpGetRootInterruptVector(IN ULONG BusInterruptLevel, + IN ULONG BusInterruptVector, + OUT PKIRQL Irql, + OUT PKAFFINITY Affinity) +{ + ULONG SystemVector; + + /* Get the system vector */ + SystemVector = PRIMARY_VECTOR_BASE + BusInterruptLevel; + + /* Validate it */ + if ((SystemVector < PRIMARY_VECTOR_BASE) || (SystemVector > PRIMARY_VECTOR_BASE + 27)) + { + /* Invalid vector */ + DPRINT1("Vector %lx is too low or too high!\n", SystemVector); + return 0; + } + + /* Return the IRQL and affinity */ + *Irql = (PRIMARY_VECTOR_BASE + 27) - SystemVector; + *Affinity = HalpDefaultInterruptAffinity; + ASSERT(HalpDefaultInterruptAffinity); + + /* Return the vector */ + return SystemVector; +} + +ULONG +NTAPI HalpGetSystemInterruptVector(IN PBUS_HANDLER BusHandler, IN PBUS_HANDLER RootHandler, IN ULONG BusInterruptLevel, @@ -38,10 +67,17 @@ OUT PKIRQL Irql, OUT PKAFFINITY Affinity) { + ULONG Vector; + /* Get the root vector */ - DPRINT1("SYSTEM GetVector\n"); - while (TRUE); - return 0; + Vector = HalpGetRootInterruptVector(BusInterruptLevel, + BusInterruptVector, + Irql, + Affinity); + + /* Check if the vector is owned by the HAL and fail if it is */ + if (HalpIDTUsageFlags[Vector].Flags & IDT_REGISTERED) DPRINT1("Vector %lx is ALREADY IN USE!\n", Vector); + return (HalpIDTUsageFlags[Vector].Flags & IDT_REGISTERED) ? 0 : Vector; } /* EOF */

1 0

[sir_richard] 47671: [HAL]: Use Bus Handler support for HalSetBusDataByOffset. Please report any problems.
by sir_richard＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: sir_richard Date: Mon Jun 7 22:13:05 2010 New Revision: 47671 URL: http://svn.reactos.org/svn/reactos?rev=47671&view=rev Log: [HAL]: Use Bus Handler support for HalSetBusDataByOffset. Please report any problems. Modified: trunk/reactos/hal/halx86/generic/legacy/bussupp.c Modified: trunk/reactos/hal/halx86/generic/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] Mon Jun 7 22:13:05 2010 @@ -1354,31 +1354,24 @@ IN ULONG Offset, IN ULONG Length) { - BUS_HANDLER BusHandler; - - /* Look as the bus type */ - if (BusDataType == Cmos) - { - /* Call CMOS Function */ - return HalpSetCmosData(0, SlotNumber, Buffer, Length); - } - else if ((BusDataType == PCIConfiguration) && (HalpPCIConfigInitialized)) - { - /* Setup fake PCI Bus handler */ - RtlCopyMemory(&BusHandler, &HalpFakePciBusHandler, sizeof(BUS_HANDLER)); - BusHandler.BusNumber = BusNumber; - - /* Call PCI function */ - return HalpSetPCIData(&BusHandler, - &BusHandler, - *(PPCI_SLOT_NUMBER)&SlotNumber, - Buffer, - Offset, - Length); - } - - /* Invalid bus */ - return 0; + PBUS_HANDLER Handler; + ULONG Status; + + /* Find the handler */ + Handler = HaliReferenceHandlerForConfigSpace(BusDataType, BusNumber); + if (!Handler) return 0; + + /* Do the assignment */ + Status = Handler->SetBusData(Handler, + Handler, + SlotNumber, + Buffer, + Offset, + Length); + + /* Dereference the handler and return */ + HalDereferenceBusHandler(Handler); + return Status; } /*

1 0

[sir_richard] 47670: [HAL]: First use of bus handler support: HalGetBusDataByOffset now uses bus handlers. Please report any problems.
by sir_richard＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: sir_richard Date: Mon Jun 7 22:10:53 2010 New Revision: 47670 URL: http://svn.reactos.org/svn/reactos?rev=47670&view=rev Log: [HAL]: First use of bus handler support: HalGetBusDataByOffset now uses bus handlers. Please report any problems. Modified: trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c trunk/reactos/hal/halx86/generic/legacy/bussupp.c trunk/reactos/hal/halx86/include/bus.h Modified: trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c [iso-8859-1] Mon Jun 7 22:10:53 2010 @@ -262,7 +262,7 @@ ConfigBusNumberArray = HalpAllocateArray(BusNumber); /* Only proceed if all allocations succeeded */ - if (InterfaceArray && InterfaceBusNumberArray && ConfigArray && ConfigBusNumberArray) + if ((InterfaceArray) && (InterfaceBusNumberArray) && (ConfigArray) && (ConfigBusNumberArray)) { /* Find the parent handler if any */ ParentHandler = HaliReferenceHandlerForBus(ParentBusType, ParentBusNumber); Modified: trunk/reactos/hal/halx86/generic/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] Mon Jun 7 22:10:53 2010 @@ -82,7 +82,6 @@ InterfaceTypeUndefined, 0, 0); - DPRINT1("Registering Internal Bus: %p\n", Bus); if (Bus) { /* Set it up */ @@ -97,7 +96,6 @@ InterfaceTypeUndefined, 0, 0); - DPRINT1("Registering CMOS Bus: %p\n", Bus); if (Bus) { /* Set it up */ @@ -112,7 +110,6 @@ InterfaceTypeUndefined, 0, 0); - DPRINT1("Registering CMOS Bus: %p\n", Bus); if (Bus) { /* Set it up */ @@ -127,7 +124,6 @@ Internal, 0, 0); - DPRINT1("Registering ISA Bus: %p\n", Bus); if (Bus) { /* Set it up */ @@ -1286,38 +1282,24 @@ IN ULONG Offset, IN ULONG Length) { - BUS_HANDLER BusHandler; - - /* Look as the bus type */ - if (BusDataType == Cmos) - { - /* Call CMOS Function */ - return HalpGetCmosData(0, SlotNumber, Buffer, Length); - } - else if (BusDataType == EisaConfiguration) - { - /* FIXME: TODO */ - ASSERT(FALSE); - } - else if ((BusDataType == PCIConfiguration) && - (HalpPCIConfigInitialized) && - ((BusNumber >= HalpMinPciBus) && (BusNumber <= HalpMaxPciBus))) - { - /* Setup fake PCI Bus handler */ - RtlCopyMemory(&BusHandler, &HalpFakePciBusHandler, sizeof(BUS_HANDLER)); - BusHandler.BusNumber = BusNumber; - - /* Call PCI function */ - return HalpGetPCIData(&BusHandler, - &BusHandler, - *(PPCI_SLOT_NUMBER)&SlotNumber, - Buffer, - Offset, - Length); - } - - /* Invalid bus */ - return 0; + PBUS_HANDLER Handler; + ULONG Status; + + /* Find the handler */ + Handler = HaliReferenceHandlerForConfigSpace(BusDataType, BusNumber); + if (!Handler) return 0; + + /* Do the assignment */ + Status = Handler->GetBusData(Handler, + Handler, + SlotNumber, + Buffer, + Offset, + Length); + + /* Dereference the handler and return */ + HalDereferenceBusHandler(Handler); + return Status; } /* Modified: trunk/reactos/hal/halx86/include/bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/bus.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] Mon Jun 7 22:10:53 2010 @@ -449,6 +449,13 @@ VOID ); +PBUS_HANDLER +FASTCALL +HaliReferenceHandlerForConfigSpace( + IN BUS_DATA_TYPE ConfigType, + IN ULONG BusNumber +); + ULONG NTAPI HalpNoBusData(

1 0

[fireball] 47669: [SYSREG] - Initial commit of a Windows-based sysreg tool by popular demand. Platform is .NET, and the only supported virtual machine is VirtualBox. WIP.
by fireball＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: fireball Date: Mon Jun 7 22:04:18 2010 New Revision: 47669 URL: http://svn.reactos.org/svn/reactos?rev=47669&view=rev Log: [SYSREG] - Initial commit of a Windows-based sysreg tool by popular demand. Platform is .NET, and the only supported virtual machine is VirtualBox. WIP. Added: trunk/tools/sysreg3/ (with props) trunk/tools/sysreg3/Program.cs trunk/tools/sysreg3/Properties/ (with props) trunk/tools/sysreg3/Properties/AssemblyInfo.cs (with props) trunk/tools/sysreg3/sysreg3.csproj (with props) trunk/tools/sysreg3/sysreg3.sln (with props) Propchange: trunk/tools/sysreg3/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jun 7 22:04:18 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/tools/sysreg3/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/tools/sysreg3/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/tools/sysreg3/Program.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg3/Program.cs?rev=47669… ============================================================================== --- trunk/tools/sysreg3/Program.cs (added) +++ trunk/tools/sysreg3/Program.cs [iso-8859-1] Mon Jun 7 22:04:18 2010 @@ -1,0 +1,252 @@ +ï»¿/* + * PROJECT: ReactOS System Regression Testing Utility, Windows/VirtualBox version + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Processing the incoming debugging data + * COPYRIGHT: Copyright Aleksey Bragin <aleksey(a)reactos.org>. Based around ideas and code from + * sysreg created by Christoph von Wittich <christoph_vw(a)reactos.org> and + * Colin Finck <colin(a)reactos.org> + */ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.IO; +using VirtualBox; + +namespace sysreg3 +{ + class RegTester + { + string machineName = "ReactOS"; + int maxRetries = 3; + int numStages = 3; + int vmTimeout = 5 * 1000; // 120 secs + + IMachine rosVM; + IVirtualBox vBox; + + enum ContinueType + { + EXIT_CHECKPOINT_REACHED, + EXIT_CONTINUE, + EXIT_DONT_CONTINUE + } + + const String stageCheckpoint = "SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE"; + + public RegTester() + { + /* Create VBox instance */ + vBox = new VirtualBox.VirtualBox(); + } + + private ContinueType ProcessDebugOutput(ISession vmSession, int stage) + { + ContinueType Result = ContinueType.EXIT_DONT_CONTINUE; + + /* Get the serial port */ + ISerialPort dbgPort = vmSession.Machine.GetSerialPort(0); + + Stream stream = new FileStream(dbgPort.Path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); + StreamReader sr = new StreamReader(stream); + + try + { + string line; + int kdbgHit = 0; + bool quitLoop = false; + + while (!quitLoop) + { + /* Poll the stream every 1 sec */ + int waitingTime = 0; + while (sr.EndOfStream) + { + waitingTime += 1000; + Thread.Sleep(1000); + + /* Peek a byte to update the EndOfStream value */ + sr.Peek(); + + if (waitingTime >= vmTimeout) + { + /* We hit the timeout, quit */ + Console.WriteLine("[SYSREG] Timeout"); + Result = ContinueType.EXIT_CONTINUE; + quitLoop = true; + break; + } + } + + while ((line = sr.ReadLine()) != null) + { + Console.WriteLine(line); + + /* Check for magic sequences */ + if (line == "kdb:> ") + { + kdbgHit++; + + if (kdbgHit == 1) + { + /* It happened for the first time, backtrace */ + vmSession.Console.Keyboard.PutScancode(0x30); // b make + vmSession.Console.Keyboard.PutScancode(0xb0); // b release + vmSession.Console.Keyboard.PutScancode(0x14); // t make + vmSession.Console.Keyboard.PutScancode(0x94); // t release + vmSession.Console.Keyboard.PutScancode(0x1c); // Enter make + vmSession.Console.Keyboard.PutScancode(0x9c); // Enter release + + continue; + } + else + { + /* It happened once again, no reason to continue */ + Console.WriteLine(); + Result = ContinueType.EXIT_CONTINUE; + quitLoop = true; + break; + } + } + else if (line.Contains("--- Press q")) + { + /* Send Return to get more data from Kdbg */ + vmSession.Console.Keyboard.PutScancode(0x1c); // Enter make + vmSession.Console.Keyboard.PutScancode(0x9c); // Enter release + continue; + } + else if (line.Contains("SYSREG_ROSAUTOTEST_FAILURE")) + { + quitLoop = true; + break; + } + else if (stage == 2 && line.Contains(stageCheckpoint)) + { + Result = ContinueType.EXIT_CHECKPOINT_REACHED; + quitLoop = true; + break; + } + } + } + } + catch (Exception e) + { + // Let the user know what went wrong. + Console.WriteLine("The file could not be read:"); + Console.WriteLine(e.Message); + } + finally + { + sr.Close(); + } + + return Result; + } + + public void RunTests() + { + IProgress vmProgress; + + // TODO: Load settings + + /* Open the testing machine */ + Session vmSession = new Session(); + + try + { + rosVM = vBox.FindMachine(machineName); + } + catch (Exception exc) + { + /* Opening failed. Probably we need to create it */ + Console.WriteLine("Opening the vm failed " + exc.ToString()); + return; + } + + vBox.OpenSession(vmSession, rosVM.Id); + //vmProgress.WaitForCompletion(-1); + + // TODO: Empty the HDD, prepare for the first run + + /* Empty the debug log file */ + try + { + ISerialPort dbgPort = vmSession.Machine.GetSerialPort(0); + FileStream dbgFile = File.Open(dbgPort.Path, FileMode.Truncate); + dbgFile.Close(); + } + catch + { + /* Don't care about the exceptions here */ + } + + /* Close VM session */ + vmSession.Close(); + + /* Start main testing loop */ + for (int stage = 0; stage < numStages; stage++) + { + for (int retries = 0; retries < maxRetries; retries++) + { + /* Start the VM */ + try + { + vmProgress = vBox.OpenRemoteSession(vmSession, rosVM.Id, "gui", null); + vmProgress.WaitForCompletion(-1); + + if (vmProgress.ResultCode != 0) + { + /* Print out error's text */ + Console.WriteLine("Error starting VM: " + vmProgress.ErrorInfo.Text); + + /* Close VM session */ + vmSession.Close(); + break; + } + + Console.WriteLine(); Console.WriteLine(); Console.WriteLine(); + Console.WriteLine("[SYSREG] Running stage {0}...", stage + 1); + Console.WriteLine("[SYSREG] Domain {0} started.\n", rosVM.Name); + + ContinueType Ret = ProcessDebugOutput(vmSession, stage); + + /* Kill the VM */ + vmProgress = vmSession.Console.PowerDown(); + vmProgress.WaitForCompletion(-1); + + /* If we have a checkpoint to reach for success, assume that + the application used for running the tests (probably "rosautotest") + continues with the next test after a VM restart. */ + if (stage == 2 && Ret == ContinueType.EXIT_CONTINUE) + Console.WriteLine("[SYSREG] Rebooting VM (retry {0})", retries + 1); + else + break; + + /* Close VM session */ + vmSession.Close(); + } + catch (Exception exc) + { + Console.WriteLine("Running the VM failed with exception: " + exc.ToString()); + break; + } + + break; + } + + break; + } + } + } + + class Program + { + static void Main(string[] args) + { + RegTester regTester = new RegTester(); + regTester.RunTests(); + } + } +} Propchange: trunk/tools/sysreg3/Properties/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jun 7 22:04:18 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/tools/sysreg3/Properties/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/tools/sysreg3/Properties/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/tools/sysreg3/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg3/Properties/AssemblyI… ============================================================================== --- trunk/tools/sysreg3/Properties/AssemblyInfo.cs (added) +++ trunk/tools/sysreg3/Properties/AssemblyInfo.cs [iso-8859-1] Mon Jun 7 22:04:18 2010 @@ -1,0 +1,36 @@ +ï»¿using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("sysreg3")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("sysreg3")] +[assembly: AssemblyCopyright("Copyright Â© 2010")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("6ce8d24a-bfa0-4d06-ab41-c87ce939d6a6")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] Propchange: trunk/tools/sysreg3/Properties/AssemblyInfo.cs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/sysreg3/sysreg3.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg3/sysreg3.csproj?rev=4… ============================================================================== --- trunk/tools/sysreg3/sysreg3.csproj (added) +++ trunk/tools/sysreg3/sysreg3.csproj [iso-8859-1] Mon Jun 7 22:04:18 2010 @@ -1,0 +1,69 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">x86</Platform> + <ProductVersion>8.0.30703</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{734E3803-E7D3-430A-947C-E44754CAD00F}</ProjectGuid> + <OutputType>Exe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>sysreg3</RootNamespace> + <AssemblyName>sysreg3</AssemblyName> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> + <TargetFrameworkProfile>Client</TargetFrameworkProfile> + <FileAlignment>512</FileAlignment> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <PlatformTarget>x86</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <UseVSHostingProcess>true</UseVSHostingProcess> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <PlatformTarget>x86</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="Program.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <COMReference Include="VirtualBox"> + <Guid>{46137EEC-703B-4FE5-AFD4-7C9BBBBA0259}</Guid> + <VersionMajor>1</VersionMajor> + <VersionMinor>3</VersionMinor> + <Lcid>0</Lcid> + <WrapperTool>tlbimp</WrapperTool> + <Isolated>False</Isolated> + <EmbedInteropTypes>True</EmbedInteropTypes> + </COMReference> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> +  +</Project> Propchange: trunk/tools/sysreg3/sysreg3.csproj ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/sysreg3/sysreg3.sln URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg3/sysreg3.sln?rev=4766… ============================================================================== --- trunk/tools/sysreg3/sysreg3.sln (added) +++ trunk/tools/sysreg3/sysreg3.sln [iso-8859-1] Mon Jun 7 22:04:18 2010 @@ -1,0 +1,20 @@ +ï»¿ +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sysreg3", "sysreg3.csproj", "{734E3803-E7D3-430A-947C-E44754CAD00F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {734E3803-E7D3-430A-947C-E44754CAD00F}.Debug|x86.ActiveCfg = Debug|x86 + {734E3803-E7D3-430A-947C-E44754CAD00F}.Debug|x86.Build.0 = Debug|x86 + {734E3803-E7D3-430A-947C-E44754CAD00F}.Release|x86.ActiveCfg = Release|x86 + {734E3803-E7D3-430A-947C-E44754CAD00F}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Propchange: trunk/tools/sysreg3/sysreg3.sln ------------------------------------------------------------------------------ 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