Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[sir_richard] 47672: [HAL]: Implement system bus (and ISA) vector/interrupt translation.

by sir_richard＠svn.reactos.org

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 */

14 years, 3 months

[sir_richard] 47671: [HAL]: Use Bus Handler support for HalSetBusDataByOffset. Please report any problems.

by sir_richard＠svn.reactos.org

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; } /*

14 years, 3 months

[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

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(

14 years, 3 months

[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

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

14 years, 3 months

[sir_richard] 47668: [HAL]: I don't like to swear, but F*CK this MiniHAL bullsh*t!

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Mon Jun 7 20:30:20 2010 New Revision: 47668 URL: http://svn.reactos.org/svn/reactos?rev=47668&view=rev Log: [HAL]: I don't like to swear, but F*CK this MiniHAL bullsh*t! 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 20:30:20 2010 @@ -654,7 +654,6 @@ DPRINT("Warning: Bus addresses not being optimized!\n"); } } -#endif VOID NTAPI @@ -828,6 +827,7 @@ } } } +#endif VOID NTAPI

14 years, 3 months

[akhaldi] 47667: Sync up to trunk head (r47666)

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 7 19:15:29 2010 New Revision: 47667 URL: http://svn.reactos.org/svn/reactos?rev=47667&view=rev Log: Sync up to trunk head (r47666) Modified: branches/header-work/ (props changed) branches/header-work/ReactOS-amd64.rbuild (props changed) branches/header-work/hal/halx86/generic/legacy/bussupp.c branches/header-work/hal/halx86/include/halp.h Propchange: branches/header-work/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 7 19:15:29 2010 @@ -1,4 +1,4 @@ /branches/reactos-yarotows:46966 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805 -/trunk/reactos:45691-47658 +/trunk/reactos:45691-47666 Propchange: branches/header-work/ReactOS-amd64.rbuild ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,4 +1,0 @@ -/branches/reactos-yarotows/ReactOS-amd64.rbuild:46966 -/branches/ros-amd64-bringup/ReactOS-amd64.rbuild:36852 -/branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805 -/trunk/reactos/ReactOS-amd64.rbuild:45691-47660 Modified: branches/header-work/hal/halx86/generic/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… ============================================================================== --- branches/header-work/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] (original) +++ branches/header-work/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] Mon Jun 7 19:15:29 2010 @@ -340,10 +340,60 @@ IN UCHAR RevisionId, IN PULONG HackFlags) { - /* Not yet implemented */ - if (!WarningsGiven[0]++) DbgPrint("HAL: Not checking for PCI Chipset Hacks. Your hardware may malfunction!\n"); - *HackFlags = 0; - return STATUS_UNSUCCESSFUL; + UNICODE_STRING KeyName, ValueName; + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE KeyHandle; + WCHAR Buffer[32]; + KEY_VALUE_PARTIAL_INFORMATION PartialInfo; + ULONG ResultLength; + + /* Setup the object attributes for the key */ + RtlInitUnicodeString(&KeyName, + L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET\\" + L"Control\\HAL"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Open the key */ + Status = ZwOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) return Status; + + /* Query value */ + swprintf(Buffer, L"%04X%04X", VendorId, DeviceId); + RtlInitUnicodeString(&ValueName, Buffer); + Status = ZwQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformation, + &PartialInfo, + sizeof(PartialInfo), + &ResultLength); + if (NT_SUCCESS(Status)) + { + /* Return the flags */ + DbgPrint("\tFound HackFlags for your chipset\n"); + *HackFlags = *(PULONG)PartialInfo.Data; + DbgPrint("\t\tHack Flags: %lx (Hack Revision: %lx-Your Revision: %lx)\n", + *HackFlags, HALP_REVISION_FROM_HACK_FLAGS(*HackFlags), RevisionId); + + /* Does it apply to this revision? */ + if ((RevisionId) && (RevisionId >= (HALP_REVISION_FROM_HACK_FLAGS(*HackFlags)))) + { + /* Read the revision flags */ + *HackFlags = HALP_REVISION_HACK_FLAGS(*HackFlags); + } + + /* Throw out revision data */ + *HackFlags = HALP_HACK_FLAGS(*HackFlags); + if (!*HackFlags) DbgPrint("\tNo HackFlags for your chipset's revision!\n"); + } + + /* Close the handle and return */ + ZwClose(KeyHandle); + return Status; } BOOLEAN @@ -352,8 +402,77 @@ IN PPCI_COMMON_CONFIG PciData, IN ULONG Flags) { - /* Not yet implemented */ - if (!WarningsGiven[1]++) DbgPrint("HAL: Not checking for PCI Cards with Extended Addressing. Your hardware may malfunction!\n"); + ULONG ElementCount, i; + PPCI_CARD_DESCRIPTOR CardDescriptor; + + /* How many PCI Cards that we know about? */ + ElementCount = PciRegistryInfo->ElementCount; + if (!ElementCount) return FALSE; + + /* Loop all descriptors */ + CardDescriptor = &PciRegistryInfo->CardList[0]; + for (i = 0; i < ElementCount; i++, CardDescriptor++) + { + /* Check for flag match */ + if (CardDescriptor->Flags != Flags) continue; + + /* Check for VID-PID match */ + if ((CardDescriptor->VendorID != PciData->VendorID) || + (CardDescriptor->DeviceID != PciData->DeviceID)) + { + /* Skip */ + continue; + } + + /* Check for revision match, if requested */ + if ((CardDescriptor->Flags & HALP_CHECK_CARD_REVISION_ID) && + (CardDescriptor->RevisionID != PciData->RevisionID)) + { + /* Skip */ + continue; + } + + /* Check what kind of device this is */ + switch (PCI_CONFIGURATION_TYPE(PciData)) + { + /* CardBUS Bridge */ + case PCI_CARDBUS_BRIDGE_TYPE: + + /* This means the real device header is in the device-specific data */ + PciData = (PPCI_COMMON_CONFIG)PciData->DeviceSpecific; + + /* Normal PCI device */ + case PCI_DEVICE_TYPE: + + /* Check for subvendor match, if requested */ + if ((CardDescriptor->Flags & HALP_CHECK_CARD_SUBVENDOR_ID) && + (CardDescriptor->SubsystemVendorID != PciData->u.type0.SubVendorID)) + { + /* Skip */ + continue; + } + + /* Check for subsystem match, if requested */ + if ((CardDescriptor->Flags & HALP_CHECK_CARD_SUBSYSTEM_ID) && + (CardDescriptor->SubsystemID != PciData->u.type0.SubSystemID)) + { + /* Skip */ + continue; + } + + /* You made it! */ + return TRUE; + + /* PCI Bridge -- don't bother */ + case PCI_BRIDGE_TYPE: + default: + + /* Recognize it */ + return TRUE; + } + } + + /* This means the card isn't recognized */ return FALSE; } @@ -361,29 +480,354 @@ NTAPI HalpIsIdeDevice(IN PPCI_COMMON_CONFIG PciData) { - /* Not yet implemented */ - if (!WarningsGiven[2]++) DbgPrint("HAL: Not checking for PCI Cards that are IDE devices. Your hardware may malfunction!\n"); - return FALSE; + /* Simple test first */ + if ((PciData->BaseClass == PCI_CLASS_MASS_STORAGE_CTLR) && + (PciData->SubClass == PCI_SUBCLASS_MSC_IDE_CTLR)) + { + /* The device is nice enough to admit it */ + return TRUE; + } + + /* Symphony 82C101 */ + if (PciData->VendorID == 0x1C1C) return TRUE; + + /* ALi MS4803 or M5219 */ + if ((PciData->VendorID == 0x10B9) && + ((PciData->DeviceID == 0x5215) || (PciData->DeviceID == 0x5219))) + { + return TRUE; + } + + /* Appian Technology */ + if ((PciData->VendorID == 0x1097) && (PciData->DeviceID == 0x38)) return TRUE; + + /* Compaq Triflex Dual EIDE Controller */ + if ((PciData->VendorID == 0xE11) && (PciData->DeviceID == 0xAE33)) return TRUE; + + /* Micron PC Tech RZ1000 */ + if ((PciData->VendorID == 0x1042) && (PciData->DeviceID == 0x1000)) return TRUE; + + /* SiS 85C601 or 5513 [IDE] */ + if ((PciData->VendorID == 0x1039) && + ((PciData->DeviceID == 0x601) || (PciData->DeviceID == 0x5513))) + { + return TRUE; + } + + /* Symphony Labs W83769F */ + if ((PciData->VendorID == 0x10AD) && + ((PciData->DeviceID == 0x1) || (PciData->DeviceID == 0x150))) + { + return TRUE; + } + + /* UMC UM8673F */ + if ((PciData->VendorID == 0x1060) && (PciData->DeviceID == 0x101)) return TRUE; + + /* You've survived */ + return FALSE; } BOOLEAN NTAPI +HalpIsBridgeDevice(IN PPCI_COMMON_CONFIG PciData) +{ + /* Either this is a PCI-to-PCI Bridge, or a CardBUS Bridge */ + return (((PCI_CONFIGURATION_TYPE(PciData) == PCI_BRIDGE_TYPE) && + (PciData->BaseClass == PCI_CLASS_BRIDGE_DEV) && + (PciData->SubClass == PCI_SUBCLASS_BR_PCI_TO_PCI)) || + ((PCI_CONFIGURATION_TYPE(PciData) == PCI_CARDBUS_BRIDGE_TYPE) && + (PciData->BaseClass == PCI_CLASS_BRIDGE_DEV) && + (PciData->SubClass == PCI_SUBCLASS_BR_CARDBUS))); +} + +BOOLEAN +NTAPI HalpGetPciBridgeConfig(IN ULONG PciType, - IN PUCHAR MaxPciBus) -{ - /* Not yet implemented */ - if (!WarningsGiven[3]++) DbgPrint("HAL: Not checking for PCI-to-PCI Bridges. Your hardware may malfunction!\n"); - return FALSE; + IN PUCHAR BusCount) +{ + PCI_SLOT_NUMBER PciSlot; + ULONG i, j, k; + UCHAR DataBuffer[PCI_COMMON_HDR_LENGTH]; + PPCI_COMMON_CONFIG PciData = (PPCI_COMMON_CONFIG)DataBuffer; + PBUS_HANDLER BusHandler; + + /* Loop PCI buses */ + PciSlot.u.bits.Reserved = 0; + for (i = 0; i < *BusCount; i++) + { + /* Get the bus handler */ + BusHandler = HalHandlerForBus(PCIBus, i); + + /* Loop every device */ + for (j = 0; j < PCI_MAX_DEVICES; j++) + { + /* Loop every function */ + PciSlot.u.bits.DeviceNumber = j; + for (k = 0; k < PCI_MAX_FUNCTION; k++) + { + /* Build the final slot structure */ + PciSlot.u.bits.FunctionNumber = k; + + /* Read the configuration information */ + HalpReadPCIConfig(BusHandler, + PciSlot, + PciData, + 0, + PCI_COMMON_HDR_LENGTH); + + /* Skip if this is an invalid function */ + if (PciData->VendorID == PCI_INVALID_VENDORID) continue; + + /* Make sure that this is a PCI bridge or a cardbus bridge */ + if (!HalpIsBridgeDevice(PciData)) continue; + + /* Not supported */ + if (!WarningsGiven[2]++) DPRINT1("Your machine has a PCI-to-PCI or CardBUS Bridge. PCI devices may fail!\n"); + continue; + } + } + } + + /* If we exited the loop, then there's no bridge to worry about */ + return FALSE; } VOID NTAPI -HalpFixupPciSupportedRanges(IN ULONG MaxBuses) -{ - /* Not yet implemented */ - if (!WarningsGiven[4]++) DbgPrint("HAL: Not adjusting Bridge-to-Child PCI Address Ranges. Your hardware may malfunction!\n"); +HalpFixupPciSupportedRanges(IN ULONG BusCount) +{ + ULONG i; + PBUS_HANDLER Bus, ParentBus; + + /* Loop all buses */ + for (i = 0; i < BusCount; i++) + { + /* Get PCI bus handler */ + Bus = HalHandlerForBus(PCIBus, i); + + /* Loop all parent buses */ + ParentBus = Bus->ParentHandler; + while (ParentBus) + { + /* Should merge addresses */ + if (!WarningsGiven[0]++) DPRINT1("Found parent bus (indicating PCI Bridge). PCI devices may fail!\n"); + + /* Check the next parent */ + ParentBus = ParentBus->ParentHandler; + } + } + + /* Loop all buses again */ + for (i = 0; i < BusCount; i++) + { + /* Get PCI bus handler */ + Bus = HalHandlerForBus(PCIBus, i); + + /* Check if this is a PCI 2.2 Bus with Subtractive Decode */ + if (!((PPCIPBUSDATA)Bus->BusData)->Subtractive) + { + /* Loop all parent buses */ + ParentBus = Bus->ParentHandler; + while (ParentBus) + { + /* But check only PCI parent buses specifically */ + if (ParentBus->InterfaceType == PCIBus) + { + /* Should trim addresses */ + if (!WarningsGiven[1]++) DPRINT1("Found parent PCI Bus (indicating PCI-to-PCI Bridge). PCI devices may fail!\n"); + } + + /* Check the next parent */ + ParentBus = ParentBus->ParentHandler; + } + } + } + + /* Loop buses one last time */ + for (i = 0; i < BusCount; i++) + { + /* Get the PCI bus handler */ + Bus = HalHandlerForBus(PCIBus, i); + + /* Sort and combine (trim) bus address range information */ + DPRINT("Warning: Bus addresses not being optimized!\n"); + } } #endif + +VOID +NTAPI +ShowSize(ULONG x) +{ + if (!x) return; + DbgPrint(" [size="); + if (x < 1024) + { + DbgPrint("%d", (int) x); + } + else if (x < 1048576) + { + DbgPrint("%dK", (int)(x / 1024)); + } + else if (x < 0x80000000) + { + DbgPrint("%dM", (int)(x / 1048576)); + } + else + { + DbgPrint("%d", x); + } + DbgPrint("]\n"); +} + +VOID +NTAPI +HalpDebugPciBus(IN ULONG i, + IN ULONG j, + IN ULONG k, + IN PPCI_COMMON_CONFIG PciData) +{ + extern CHAR ClassTable[3922]; + extern CHAR VendorTable[642355]; + PCHAR p, ClassName, SubClassName, VendorName, ProductName, SubVendorName; + ULONG Length; + CHAR LookupString[16] = ""; + CHAR bSubClassName[32] = ""; + CHAR bVendorName[32] = ""; + CHAR bProductName[32] = "Unknown device"; + CHAR bSubVendorName[32] = "Unknown"; + ULONG Size, Mem, b; + + /* Isolate the class name */ + sprintf(LookupString, "C %02x", PciData->BaseClass); + ClassName = strstr(ClassTable, LookupString); + if (ClassName) + { + /* Isolate the subclass name */ + ClassName += 6; + sprintf(LookupString, "\t%02x", PciData->SubClass); + SubClassName = strstr(ClassName, LookupString); + if (SubClassName) + { + /* Copy the subclass into our buffer */ + SubClassName += 5; + p = strchr(SubClassName, '\r'); + Length = p - SubClassName; + if (Length > sizeof(bSubClassName)) Length = sizeof(bSubClassName); + strncpy(bSubClassName, SubClassName, Length); + bSubClassName[Length] = '\0'; + } + } + + /* Isolate the vendor name */ + sprintf(LookupString, "\n%04x ", PciData->VendorID); + VendorName = strstr(VendorTable, LookupString); + if (VendorName) + { + /* Copy the vendor name into our buffer */ + VendorName += 7; + p = strchr(VendorName, '\r'); + Length = p - VendorName; + if (Length > sizeof(bVendorName)) Length = sizeof(bVendorName); + strncpy(bVendorName, VendorName, Length); + bVendorName[Length ] = '\0'; + + /* Isolate the product name */ + sprintf(LookupString, "\t%04x", PciData->DeviceID); + ProductName = strstr(VendorName, LookupString); + if (ProductName) + { + /* Copy the product name into our buffer */ + ProductName += 7; + p = strchr(ProductName, '\r'); + Length = p - ProductName; + if (Length > sizeof(bProductName)) Length = sizeof(bProductName); + strncpy(bProductName, ProductName, Length); + bProductName[Length] = '\0'; + + /* Isolate the subvendor and subsystem name */ + sprintf(LookupString, + "\t\t%04x %04x ", + PciData->u.type0.SubVendorID, + PciData->u.type0.SubSystemID); + SubVendorName = strstr(ProductName, LookupString); + if (SubVendorName) + { + /* Copy the subvendor name into our buffer */ + SubVendorName += 13; + p = strchr(SubVendorName, '\r'); + Length = p - SubVendorName; + if (Length > sizeof(bSubVendorName)) Length = sizeof(bSubVendorName); + strncpy(bSubVendorName, SubVendorName, Length); + bSubVendorName[Length] = '\0'; + } + } + } + + /* Print out the data */ + DbgPrint("%02x:%02x.%x %s [%02x%02x]: %s %s [%04x:%04x] (rev %02x)\n" + "\tSubsystem: %s [%04x:%04x]\n", + i, + j, + k, + bSubClassName, + PciData->BaseClass, + PciData->SubClass, + bVendorName, + bProductName, + PciData->VendorID, + PciData->DeviceID, + PciData->RevisionID, + bSubVendorName, + PciData->u.type0.SubVendorID, + PciData->u.type0.SubSystemID); + + /* Print out and decode flags */ + DbgPrint("\tFlags:"); + if (PciData->Command & PCI_ENABLE_BUS_MASTER) DbgPrint(" bus master,"); + if (PciData->Status & PCI_STATUS_66MHZ_CAPABLE) DbgPrint(" 66MHz,"); + if ((PciData->Status & PCI_STATUS_DEVSEL) == 0x200) DbgPrint(" medium devsel,"); + if ((PciData->Status & PCI_STATUS_DEVSEL) == 0x400) DbgPrint(" fast devsel,"); + DbgPrint(" latency %d", PciData->LatencyTimer); + if (PciData->u.type0.InterruptLine) DbgPrint(", IRQ %02d", PciData->u.type0.InterruptLine); + DbgPrint("\n"); + + /* Scan addresses */ + Size = 0; + for (b = 0; b < PCI_TYPE0_ADDRESSES; b++) + { + /* Check for a BAR */ + Mem = PciData->u.type0.BaseAddresses[b]; + if (Mem) + { + /* Decode the address type */ + if (Mem & PCI_ADDRESS_IO_SPACE) + { + /* Decode the size */ + Size = 1 << 2; + while (!(Mem & Size) && (Size)) Size <<= 1; + + /* Print it out */ + DbgPrint("\tI/O ports at %04lx", Mem & PCI_ADDRESS_IO_ADDRESS_MASK); + ShowSize(Size); + } + else + { + /* Decode the size */ + Size = 1 << 8; + while (!(Mem & Size) && (Size)) Size <<= 1; + + /* Print it out */ + DbgPrint("\tMemory at %08lx (%d-bit, %sprefetchable)", + Mem & PCI_ADDRESS_MEMORY_ADDRESS_MASK, + (Mem & PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_32BIT ? 32 : 64, + (Mem & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? "" : "non-"); + ShowSize(Size); + } + } + } +} VOID NTAPI @@ -399,6 +843,7 @@ PBUS_HANDLER BusHandler; ULONG HackFlags; BOOLEAN ExtendedAddressDecoding = FALSE; + NTSTATUS Status; /* Query registry information */ PciRegistryInfo = HalpQueryPciRegistryInfo(); @@ -464,6 +909,7 @@ HalpFixupPciSupportedRanges(PciRegistryInfo->NoBuses); /* Loop every bus */ + DbgPrint("\n====== PCI BUS HARDWARE DETECTION =======\n\n"); PciSlot.u.bits.Reserved = 0; for (i = 0; i < PciRegistryInfo->NoBuses; i++) { @@ -490,11 +936,14 @@ /* Skip if this is an invalid function */ if (PciData->VendorID == PCI_INVALID_VENDORID) continue; + /* Print out the entry */ + HalpDebugPciBus(i, j, k, PciData); + /* Check if this is a Cardbus bridge */ if (PCI_CONFIGURATION_TYPE(PciData) == PCI_CARDBUS_BRIDGE_TYPE) { /* Not supported */ - DbgPrint("HAL: Your machine has a PCI Cardbus Bridge. This is not supported!\n"); + DbgPrint("\tDevice is a PCI Cardbus Bridge. It will not work!\n"); continue; } @@ -509,11 +958,10 @@ if (PciData->u.type1.InterruptLine < 16) { /* Is this an IDE device? */ - DbgPrint("HAL: Found PCI device with IRQ line\n"); if (!HalpIsIdeDevice(PciData)) { /* We'll mask out this interrupt then */ - DbgPrint("HAL: Device is not an IDE Device. Should be masking IRQ %d! This is not supported!\n", + DbgPrint("\tDevice is using IRQ %d! ISA Cards using that IRQ may fail!\n", PciData->u.type1.InterruptLine); HalpPciIrqMask |= (1 << PciData->u.type1.InterruptLine); } @@ -529,7 +977,7 @@ (PciData->RevisionID < 0x11)) { /* Skip */ - DbgPrint("HAL: Your machine has a broken Intel 82430 PCI Controller. This is not supported!\n"); + DbgPrint("\tDevice is a broken Intel 82430 PCI Controller. It will not work!\n\n"); continue; } @@ -538,7 +986,7 @@ (PciData->RevisionID <= 3)) { /* Skip */ - DbgPrint("HAL: Your machine has a broken Intel 82378 PCI-to-ISA Bridge. This is not supported!\n"); + DbgPrint("\tDevice is a broken Intel 82378 PCI-to-ISA Bridge. It will not work!\n\n"); continue; } @@ -546,7 +994,7 @@ if ((PciData->DeviceID == 0x84C4) && (PciData->RevisionID <= 4)) { - DbgPrint("HAL: Your machine has an Intel Orion 82450 PCI Bridge. This is not supported!\n"); + DbgPrint("\tDevice is a Intel Orion 82450 PCI Bridge. It will not work!\n\n"); continue; } } @@ -555,10 +1003,12 @@ if (!ExtendedAddressDecoding) { /* Check for it */ - if (HalpIsRecognizedCard(PciRegistryInfo, PciData, 1)) + if (HalpIsRecognizedCard(PciRegistryInfo, + PciData, + HALP_CARD_FEATURE_FULL_DECODE)) { /* We'll do chipset checks later */ - DbgPrint("HAL: Recognized a PCI Card with Extended Address Decoding. This is not supported!\n"); + DbgPrint("\tDevice has Extended Address Decoding. It may fail to work on older BIOSes!\n"); ExtendedAddressDecoding = TRUE; } } @@ -570,45 +1020,63 @@ /* Check if this is an OHCI controller */ if (PciData->ProgIf == 0x10) { - DbgPrint("HAL: Your machine has an OHCI (USB) PCI Expansion Card. This is not supported!\n"); + DbgPrint("\tDevice is an OHCI (USB) PCI Expansion Card. Turn off Legacy USB in your BIOS!\n\n"); continue; } /* Check for Intel UHCI controller */ if (PciData->VendorID == 0x8086) { - DbgPrint("HAL: Your machine has an Intel UHCI (USB) Controller. This is not supported!\n"); + DbgPrint("\tDevice is an Intel UHCI (USB) Controller. Turn off Legacy USB in your BIOS!\n\n"); continue; } /* Check for VIA UHCI controller */ if (PciData->VendorID == 0x1106) { - DbgPrint("HAL: Your machine has a VIA UHCI (USB) Controller. This is not supported!\n"); + DbgPrint("\tDevice is a VIA UHCI (USB) Controller. Turn off Legacy USB in your BIOS!\n\n"); continue; } } /* Now check the registry for chipset hacks */ - if (NT_SUCCESS(HalpGetChipHacks(PciData->VendorID, - PciData->DeviceID, - PciData->RevisionID, - &HackFlags))) + Status = HalpGetChipHacks(PciData->VendorID, + PciData->DeviceID, + PciData->RevisionID, + &HackFlags); + if (NT_SUCCESS(Status)) { + /* Check for broken ACPI routing */ + if (HackFlags & HAL_PCI_CHIP_HACK_DISABLE_ACPI_IRQ_ROUTING) + { + DbgPrint("This chipset has broken ACPI IRQ Routing! Be aware!\n\n"); + continue; + } + + /* Check for broken ACPI timer */ + if (HackFlags & HAL_PCI_CHIP_HACK_BROKEN_ACPI_TIMER) + { + DbgPrint("This chipset has a broken ACPI timer! Be aware!\n\n"); + continue; + } + /* Check for hibernate-disable */ if (HackFlags & HAL_PCI_CHIP_HACK_DISABLE_HIBERNATE) { - DbgPrint("HAL: Your machine has a broken PCI device which is incompatible with hibernation. This is not supported!\n"); + DbgPrint("This chipset has a broken PCI device which is incompatible with hibernation. Be aware!\n\n"); continue; } /* Check for USB controllers that generate SMIs */ if (HackFlags & HAL_PCI_CHIP_HACK_USB_SMI_DISABLE) { - DbgPrint("HAL: Your machine has a USB controller which generates SMIs. This is not supported!\n"); + DbgPrint("This chipset has a USB controller which generates SMIs. ReactOS will likely fail to boot!\n\n"); continue; } } + + /* Terminate the entry */ + DbgPrint("\n"); } } } @@ -621,7 +1089,7 @@ /* Tell PnP if this hard supports correct decoding */ HalpMarkChipsetDecode(ExtendedAddressDecoding); - DPRINT1("PCI BUS Setup complete\n"); + DbgPrint("====== PCI BUS DETECTION COMPLETE =======\n\n"); #endif } Modified: branches/header-work/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/include/… ============================================================================== --- branches/header-work/hal/halx86/include/halp.h [iso-8859-1] (original) +++ branches/header-work/hal/halx86/include/halp.h [iso-8859-1] Mon Jun 7 19:15:29 2010 @@ -486,6 +486,25 @@ ); // +// Hack Flags +// +#define HALP_REVISION_FROM_HACK_FLAGS(x) ((x) >> 24) +#define HALP_REVISION_HACK_FLAGS(x) ((x) >> 12) +#define HALP_HACK_FLAGS(x) ((x) & 0xFFF) + +// +// Feature flags +// +#define HALP_CARD_FEATURE_FULL_DECODE 0x0001 + +// +// Match Flags +// +#define HALP_CHECK_CARD_REVISION_ID 0x10000 +#define HALP_CHECK_CARD_SUBVENDOR_ID 0x20000 +#define HALP_CHECK_CARD_SUBSYSTEM_ID 0x40000 + +// // Mm PTE/PDE to Hal PTE/PDE // #define HalAddressToPde(x) (PHARDWARE_PTE)MiAddressToPde(x)

14 years, 3 months

[sir_richard] 47666: [HAL]: Plug in the data from pcidata.c that was committed months ago to display a beautiful enumeration of all PCI devices on the machine. This will allow debug logs not only to contain nearly full hardware information, but also identify the VM the tester/reporter is using (based on the device's subsystem ID). [HAL]: Display all the warning DPRINTs in-line with the PCI enumeration code, resulting in a much easier to read and comprehensive review of the machine.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Mon Jun 7 19:01:56 2010 New Revision: 47666 URL: http://svn.reactos.org/svn/reactos?rev=47666&view=rev Log: [HAL]: Plug in the data from pcidata.c that was committed months ago to display a beautiful enumeration of all PCI devices on the machine. This will allow debug logs not only to contain nearly full hardware information, but also identify the VM the tester/reporter is using (based on the device's subsystem ID). [HAL]: Display all the warning DPRINTs in-line with the PCI enumeration code, resulting in a much easier to read and comprehensive review of the machine. 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 19:01:56 2010 @@ -374,10 +374,10 @@ if (NT_SUCCESS(Status)) { /* Return the flags */ - DPRINT1("Found HackFlags for your %lx:%lx device\n", VendorId, DeviceId); + DbgPrint("\tFound HackFlags for your chipset\n"); *HackFlags = *(PULONG)PartialInfo.Data; - DPRINT1("Hack Flags: %lx (Hack Revision: %lx\tYour Revision: %lx)\n", - *HackFlags, HALP_REVISION_FROM_HACK_FLAGS(*HackFlags), RevisionId); + DbgPrint("\t\tHack Flags: %lx (Hack Revision: %lx-Your Revision: %lx)\n", + *HackFlags, HALP_REVISION_FROM_HACK_FLAGS(*HackFlags), RevisionId); /* Does it apply to this revision? */ if ((RevisionId) && (RevisionId >= (HALP_REVISION_FROM_HACK_FLAGS(*HackFlags)))) @@ -388,6 +388,7 @@ /* Throw out revision data */ *HackFlags = HALP_HACK_FLAGS(*HackFlags); + if (!*HackFlags) DbgPrint("\tNo HackFlags for your chipset's revision!\n"); } /* Close the handle and return */ @@ -654,6 +655,179 @@ } } #endif + +VOID +NTAPI +ShowSize(ULONG x) +{ + if (!x) return; + DbgPrint(" [size="); + if (x < 1024) + { + DbgPrint("%d", (int) x); + } + else if (x < 1048576) + { + DbgPrint("%dK", (int)(x / 1024)); + } + else if (x < 0x80000000) + { + DbgPrint("%dM", (int)(x / 1048576)); + } + else + { + DbgPrint("%d", x); + } + DbgPrint("]\n"); +} + +VOID +NTAPI +HalpDebugPciBus(IN ULONG i, + IN ULONG j, + IN ULONG k, + IN PPCI_COMMON_CONFIG PciData) +{ + extern CHAR ClassTable[3922]; + extern CHAR VendorTable[642355]; + PCHAR p, ClassName, SubClassName, VendorName, ProductName, SubVendorName; + ULONG Length; + CHAR LookupString[16] = ""; + CHAR bSubClassName[32] = ""; + CHAR bVendorName[32] = ""; + CHAR bProductName[32] = "Unknown device"; + CHAR bSubVendorName[32] = "Unknown"; + ULONG Size, Mem, b; + + /* Isolate the class name */ + sprintf(LookupString, "C %02x", PciData->BaseClass); + ClassName = strstr(ClassTable, LookupString); + if (ClassName) + { + /* Isolate the subclass name */ + ClassName += 6; + sprintf(LookupString, "\t%02x", PciData->SubClass); + SubClassName = strstr(ClassName, LookupString); + if (SubClassName) + { + /* Copy the subclass into our buffer */ + SubClassName += 5; + p = strchr(SubClassName, '\r'); + Length = p - SubClassName; + if (Length > sizeof(bSubClassName)) Length = sizeof(bSubClassName); + strncpy(bSubClassName, SubClassName, Length); + bSubClassName[Length] = '\0'; + } + } + + /* Isolate the vendor name */ + sprintf(LookupString, "\n%04x ", PciData->VendorID); + VendorName = strstr(VendorTable, LookupString); + if (VendorName) + { + /* Copy the vendor name into our buffer */ + VendorName += 7; + p = strchr(VendorName, '\r'); + Length = p - VendorName; + if (Length > sizeof(bVendorName)) Length = sizeof(bVendorName); + strncpy(bVendorName, VendorName, Length); + bVendorName[Length ] = '\0'; + + /* Isolate the product name */ + sprintf(LookupString, "\t%04x", PciData->DeviceID); + ProductName = strstr(VendorName, LookupString); + if (ProductName) + { + /* Copy the product name into our buffer */ + ProductName += 7; + p = strchr(ProductName, '\r'); + Length = p - ProductName; + if (Length > sizeof(bProductName)) Length = sizeof(bProductName); + strncpy(bProductName, ProductName, Length); + bProductName[Length] = '\0'; + + /* Isolate the subvendor and subsystem name */ + sprintf(LookupString, + "\t\t%04x %04x ", + PciData->u.type0.SubVendorID, + PciData->u.type0.SubSystemID); + SubVendorName = strstr(ProductName, LookupString); + if (SubVendorName) + { + /* Copy the subvendor name into our buffer */ + SubVendorName += 13; + p = strchr(SubVendorName, '\r'); + Length = p - SubVendorName; + if (Length > sizeof(bSubVendorName)) Length = sizeof(bSubVendorName); + strncpy(bSubVendorName, SubVendorName, Length); + bSubVendorName[Length] = '\0'; + } + } + } + + /* Print out the data */ + DbgPrint("%02x:%02x.%x %s [%02x%02x]: %s %s [%04x:%04x] (rev %02x)\n" + "\tSubsystem: %s [%04x:%04x]\n", + i, + j, + k, + bSubClassName, + PciData->BaseClass, + PciData->SubClass, + bVendorName, + bProductName, + PciData->VendorID, + PciData->DeviceID, + PciData->RevisionID, + bSubVendorName, + PciData->u.type0.SubVendorID, + PciData->u.type0.SubSystemID); + + /* Print out and decode flags */ + DbgPrint("\tFlags:"); + if (PciData->Command & PCI_ENABLE_BUS_MASTER) DbgPrint(" bus master,"); + if (PciData->Status & PCI_STATUS_66MHZ_CAPABLE) DbgPrint(" 66MHz,"); + if ((PciData->Status & PCI_STATUS_DEVSEL) == 0x200) DbgPrint(" medium devsel,"); + if ((PciData->Status & PCI_STATUS_DEVSEL) == 0x400) DbgPrint(" fast devsel,"); + DbgPrint(" latency %d", PciData->LatencyTimer); + if (PciData->u.type0.InterruptLine) DbgPrint(", IRQ %02d", PciData->u.type0.InterruptLine); + DbgPrint("\n"); + + /* Scan addresses */ + Size = 0; + for (b = 0; b < PCI_TYPE0_ADDRESSES; b++) + { + /* Check for a BAR */ + Mem = PciData->u.type0.BaseAddresses[b]; + if (Mem) + { + /* Decode the address type */ + if (Mem & PCI_ADDRESS_IO_SPACE) + { + /* Decode the size */ + Size = 1 << 2; + while (!(Mem & Size) && (Size)) Size <<= 1; + + /* Print it out */ + DbgPrint("\tI/O ports at %04lx", Mem & PCI_ADDRESS_IO_ADDRESS_MASK); + ShowSize(Size); + } + else + { + /* Decode the size */ + Size = 1 << 8; + while (!(Mem & Size) && (Size)) Size <<= 1; + + /* Print it out */ + DbgPrint("\tMemory at %08lx (%d-bit, %sprefetchable)", + Mem & PCI_ADDRESS_MEMORY_ADDRESS_MASK, + (Mem & PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_32BIT ? 32 : 64, + (Mem & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? "" : "non-"); + ShowSize(Size); + } + } + } +} VOID NTAPI @@ -735,6 +909,7 @@ HalpFixupPciSupportedRanges(PciRegistryInfo->NoBuses); /* Loop every bus */ + DbgPrint("\n====== PCI BUS HARDWARE DETECTION =======\n\n"); PciSlot.u.bits.Reserved = 0; for (i = 0; i < PciRegistryInfo->NoBuses; i++) { @@ -761,11 +936,14 @@ /* Skip if this is an invalid function */ if (PciData->VendorID == PCI_INVALID_VENDORID) continue; + /* Print out the entry */ + HalpDebugPciBus(i, j, k, PciData); + /* Check if this is a Cardbus bridge */ if (PCI_CONFIGURATION_TYPE(PciData) == PCI_CARDBUS_BRIDGE_TYPE) { /* Not supported */ - DPRINT1("Your machine has a PCI Cardbus Bridge. This device will not work!\n"); + DbgPrint("\tDevice is a PCI Cardbus Bridge. It will not work!\n"); continue; } @@ -783,9 +961,8 @@ if (!HalpIsIdeDevice(PciData)) { /* We'll mask out this interrupt then */ - DPRINT1("Device %lx:%lx is using IRQ %d! ISA Cards using that IRQ may fail!\n", - PciData->VendorID, PciData->DeviceID, - PciData->u.type1.InterruptLine); + DbgPrint("\tDevice is using IRQ %d! ISA Cards using that IRQ may fail!\n", + PciData->u.type1.InterruptLine); HalpPciIrqMask |= (1 << PciData->u.type1.InterruptLine); } } @@ -800,7 +977,7 @@ (PciData->RevisionID < 0x11)) { /* Skip */ - DPRINT1("Your machine has a broken Intel 82430 PCI Controller. This device will not work!\n"); + DbgPrint("\tDevice is a broken Intel 82430 PCI Controller. It will not work!\n\n"); continue; } @@ -809,7 +986,7 @@ (PciData->RevisionID <= 3)) { /* Skip */ - DPRINT1("Your machine has a broken Intel 82378 PCI-to-ISA Bridge. This device will not work!\n"); + DbgPrint("\tDevice is a broken Intel 82378 PCI-to-ISA Bridge. It will not work!\n\n"); continue; } @@ -817,7 +994,7 @@ if ((PciData->DeviceID == 0x84C4) && (PciData->RevisionID <= 4)) { - DPRINT1("Your machine has an Intel Orion 82450 PCI Bridge. This device will not work!\n"); + DbgPrint("\tDevice is a Intel Orion 82450 PCI Bridge. It will not work!\n\n"); continue; } } @@ -831,8 +1008,7 @@ HALP_CARD_FEATURE_FULL_DECODE)) { /* We'll do chipset checks later */ - DPRINT1("Your %lx:%lx PCI device has Extended Address Decoding. This device may fail to work on older BIOSes!\n", - PciData->VendorID, PciData->DeviceID); + DbgPrint("\tDevice has Extended Address Decoding. It may fail to work on older BIOSes!\n"); ExtendedAddressDecoding = TRUE; } } @@ -844,21 +1020,21 @@ /* Check if this is an OHCI controller */ if (PciData->ProgIf == 0x10) { - DPRINT1("Your machine has an OHCI (USB) PCI Expansion Card. Turn off Legacy USB in your BIOS!\n"); + DbgPrint("\tDevice is an OHCI (USB) PCI Expansion Card. Turn off Legacy USB in your BIOS!\n\n"); continue; } /* Check for Intel UHCI controller */ if (PciData->VendorID == 0x8086) { - DPRINT1("Your machine has an Intel UHCI (USB) Controller. Turn off Legacy USB in your BIOS!\n"); + DbgPrint("\tDevice is an Intel UHCI (USB) Controller. Turn off Legacy USB in your BIOS!\n\n"); continue; } /* Check for VIA UHCI controller */ if (PciData->VendorID == 0x1106) { - DPRINT1("Your machine has a VIA UHCI (USB) Controller. Turn off Legacy USB in your BIOS!\n"); + DbgPrint("\tDevice is a VIA UHCI (USB) Controller. Turn off Legacy USB in your BIOS!\n\n"); continue; } } @@ -873,31 +1049,34 @@ /* Check for broken ACPI routing */ if (HackFlags & HAL_PCI_CHIP_HACK_DISABLE_ACPI_IRQ_ROUTING) { - DPRINT1("Your hardware has broken ACPI IRQ Routing! Be aware!\n"); + DbgPrint("This chipset has broken ACPI IRQ Routing! Be aware!\n\n"); continue; } /* Check for broken ACPI timer */ if (HackFlags & HAL_PCI_CHIP_HACK_BROKEN_ACPI_TIMER) { - DPRINT1("Your hardware has a broken ACPI timer! Be aware!\n"); + DbgPrint("This chipset has a broken ACPI timer! Be aware!\n\n"); continue; } /* Check for hibernate-disable */ if (HackFlags & HAL_PCI_CHIP_HACK_DISABLE_HIBERNATE) { - DPRINT1("Your machine has a broken PCI device which is incompatible with hibernation. Be aware!\n"); + DbgPrint("This chipset has a broken PCI device which is incompatible with hibernation. Be aware!\n\n"); continue; } /* Check for USB controllers that generate SMIs */ if (HackFlags & HAL_PCI_CHIP_HACK_USB_SMI_DISABLE) { - DPRINT1("Your machine has a USB controller which generates SMIs. ReactOS will likely fail to boot!\n"); + DbgPrint("This chipset has a USB controller which generates SMIs. ReactOS will likely fail to boot!\n\n"); continue; } } + + /* Terminate the entry */ + DbgPrint("\n"); } } } @@ -910,7 +1089,7 @@ /* Tell PnP if this hard supports correct decoding */ HalpMarkChipsetDecode(ExtendedAddressDecoding); - DPRINT1("PCI BUS Setup complete\n"); + DbgPrint("====== PCI BUS DETECTION COMPLETE =======\n\n"); #endif }

14 years, 3 months

[sir_richard] 47665: [HAL]: Implement HalpGetPciBridgeConfig to detect PCI-to-PCI/CardBus bridges, warn if they are found. [HAL]: Modify the debug messages to be more accurate as to what exactly is unsupported.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Mon Jun 7 18:44:12 2010 New Revision: 47665 URL: http://svn.reactos.org/svn/reactos?rev=47665&view=rev Log: [HAL]: Implement HalpGetPciBridgeConfig to detect PCI-to-PCI/CardBus bridges, warn if they are found. [HAL]: Modify the debug messages to be more accurate as to what exactly is unsupported. 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 18:44:12 2010 @@ -529,12 +529,67 @@ BOOLEAN NTAPI +HalpIsBridgeDevice(IN PPCI_COMMON_CONFIG PciData) +{ + /* Either this is a PCI-to-PCI Bridge, or a CardBUS Bridge */ + return (((PCI_CONFIGURATION_TYPE(PciData) == PCI_BRIDGE_TYPE) && + (PciData->BaseClass == PCI_CLASS_BRIDGE_DEV) && + (PciData->SubClass == PCI_SUBCLASS_BR_PCI_TO_PCI)) || + ((PCI_CONFIGURATION_TYPE(PciData) == PCI_CARDBUS_BRIDGE_TYPE) && + (PciData->BaseClass == PCI_CLASS_BRIDGE_DEV) && + (PciData->SubClass == PCI_SUBCLASS_BR_CARDBUS))); +} + +BOOLEAN +NTAPI HalpGetPciBridgeConfig(IN ULONG PciType, - IN PUCHAR MaxPciBus) -{ - /* Not yet implemented */ - if (!WarningsGiven[2]++) DbgPrint("HAL: Not checking for PCI-to-PCI Bridges. Your hardware may malfunction!\n"); - return FALSE; + IN PUCHAR BusCount) +{ + PCI_SLOT_NUMBER PciSlot; + ULONG i, j, k; + UCHAR DataBuffer[PCI_COMMON_HDR_LENGTH]; + PPCI_COMMON_CONFIG PciData = (PPCI_COMMON_CONFIG)DataBuffer; + PBUS_HANDLER BusHandler; + + /* Loop PCI buses */ + PciSlot.u.bits.Reserved = 0; + for (i = 0; i < *BusCount; i++) + { + /* Get the bus handler */ + BusHandler = HalHandlerForBus(PCIBus, i); + + /* Loop every device */ + for (j = 0; j < PCI_MAX_DEVICES; j++) + { + /* Loop every function */ + PciSlot.u.bits.DeviceNumber = j; + for (k = 0; k < PCI_MAX_FUNCTION; k++) + { + /* Build the final slot structure */ + PciSlot.u.bits.FunctionNumber = k; + + /* Read the configuration information */ + HalpReadPCIConfig(BusHandler, + PciSlot, + PciData, + 0, + PCI_COMMON_HDR_LENGTH); + + /* Skip if this is an invalid function */ + if (PciData->VendorID == PCI_INVALID_VENDORID) continue; + + /* Make sure that this is a PCI bridge or a cardbus bridge */ + if (!HalpIsBridgeDevice(PciData)) continue; + + /* Not supported */ + if (!WarningsGiven[2]++) DPRINT1("Your machine has a PCI-to-PCI or CardBUS Bridge. PCI devices may fail!\n"); + continue; + } + } + } + + /* If we exited the loop, then there's no bridge to worry about */ + return FALSE; } VOID @@ -555,7 +610,7 @@ while (ParentBus) { /* Should merge addresses */ - if (!WarningsGiven[0]++) DPRINT1("Found parent bus (indicating PCI Bridge). This is not supported!\n"); + if (!WarningsGiven[0]++) DPRINT1("Found parent bus (indicating PCI Bridge). PCI devices may fail!\n"); /* Check the next parent */ ParentBus = ParentBus->ParentHandler; @@ -579,7 +634,7 @@ if (ParentBus->InterfaceType == PCIBus) { /* Should trim addresses */ - if (!WarningsGiven[1]++) DPRINT1("Found parent PCI Bus (indicating PCI-to-PCI Bridge). This is not supported!\n"); + if (!WarningsGiven[1]++) DPRINT1("Found parent PCI Bus (indicating PCI-to-PCI Bridge). PCI devices may fail!\n"); } /* Check the next parent */ @@ -710,7 +765,7 @@ if (PCI_CONFIGURATION_TYPE(PciData) == PCI_CARDBUS_BRIDGE_TYPE) { /* Not supported */ - DbgPrint("HAL: Your machine has a PCI Cardbus Bridge. This is not supported!\n"); + DPRINT1("Your machine has a PCI Cardbus Bridge. This device will not work!\n"); continue; } @@ -728,7 +783,7 @@ if (!HalpIsIdeDevice(PciData)) { /* We'll mask out this interrupt then */ - DPRINT1("HAL: Device %lx:%lx is not an IDE Device. Should be masking IRQ %d! This is not supported!\n", + DPRINT1("Device %lx:%lx is using IRQ %d! ISA Cards using that IRQ may fail!\n", PciData->VendorID, PciData->DeviceID, PciData->u.type1.InterruptLine); HalpPciIrqMask |= (1 << PciData->u.type1.InterruptLine); @@ -745,7 +800,7 @@ (PciData->RevisionID < 0x11)) { /* Skip */ - DbgPrint("HAL: Your machine has a broken Intel 82430 PCI Controller. This is not supported!\n"); + DPRINT1("Your machine has a broken Intel 82430 PCI Controller. This device will not work!\n"); continue; } @@ -754,7 +809,7 @@ (PciData->RevisionID <= 3)) { /* Skip */ - DbgPrint("HAL: Your machine has a broken Intel 82378 PCI-to-ISA Bridge. This is not supported!\n"); + DPRINT1("Your machine has a broken Intel 82378 PCI-to-ISA Bridge. This device will not work!\n"); continue; } @@ -762,7 +817,7 @@ if ((PciData->DeviceID == 0x84C4) && (PciData->RevisionID <= 4)) { - DbgPrint("HAL: Your machine has an Intel Orion 82450 PCI Bridge. This is not supported!\n"); + DPRINT1("Your machine has an Intel Orion 82450 PCI Bridge. This device will not work!\n"); continue; } } @@ -776,7 +831,7 @@ HALP_CARD_FEATURE_FULL_DECODE)) { /* We'll do chipset checks later */ - DPRINT1("Your %lx:%lx PCI device has Extended Address Decoding. This is not supported!\n", + DPRINT1("Your %lx:%lx PCI device has Extended Address Decoding. This device may fail to work on older BIOSes!\n", PciData->VendorID, PciData->DeviceID); ExtendedAddressDecoding = TRUE; } @@ -789,21 +844,21 @@ /* Check if this is an OHCI controller */ if (PciData->ProgIf == 0x10) { - DbgPrint("HAL: Your machine has an OHCI (USB) PCI Expansion Card. This is not supported!\n"); + DPRINT1("Your machine has an OHCI (USB) PCI Expansion Card. Turn off Legacy USB in your BIOS!\n"); continue; } /* Check for Intel UHCI controller */ if (PciData->VendorID == 0x8086) { - DbgPrint("HAL: Your machine has an Intel UHCI (USB) Controller. This is not supported!\n"); + DPRINT1("Your machine has an Intel UHCI (USB) Controller. Turn off Legacy USB in your BIOS!\n"); continue; } /* Check for VIA UHCI controller */ if (PciData->VendorID == 0x1106) { - DbgPrint("HAL: Your machine has a VIA UHCI (USB) Controller. This is not supported!\n"); + DPRINT1("Your machine has a VIA UHCI (USB) Controller. Turn off Legacy USB in your BIOS!\n"); continue; } } @@ -818,28 +873,28 @@ /* Check for broken ACPI routing */ if (HackFlags & HAL_PCI_CHIP_HACK_DISABLE_ACPI_IRQ_ROUTING) { - DPRINT1("Your hardware has broken ACPI IRQ Routing! This is not supported!\n"); + DPRINT1("Your hardware has broken ACPI IRQ Routing! Be aware!\n"); continue; } /* Check for broken ACPI timer */ if (HackFlags & HAL_PCI_CHIP_HACK_BROKEN_ACPI_TIMER) { - DPRINT1("Your hardware has a broken ACPI timer! This is not supported!\n"); + DPRINT1("Your hardware has a broken ACPI timer! Be aware!\n"); continue; } /* Check for hibernate-disable */ if (HackFlags & HAL_PCI_CHIP_HACK_DISABLE_HIBERNATE) { - DPRINT1("Your machine has a broken PCI device which is incompatible with hibernation. This is not supported!\n"); + DPRINT1("Your machine has a broken PCI device which is incompatible with hibernation. Be aware!\n"); continue; } /* Check for USB controllers that generate SMIs */ if (HackFlags & HAL_PCI_CHIP_HACK_USB_SMI_DISABLE) { - DPRINT1("Your machine has a USB controller which generates SMIs. This is not supported!\n"); + DPRINT1("Your machine has a USB controller which generates SMIs. ReactOS will likely fail to boot!\n"); continue; } }

14 years, 3 months

[sir_richard] 47664: [HAL]: Implement partly HalpFixupPciSupportedRanges to detect PCI Bridges, and PCI-to-PCI Bridges. The point is we want buses to be cramped down to the addresses supported by the parent bus/bridge. This is NOT currently done, so we warn users of these systems.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Mon Jun 7 18:15:01 2010 New Revision: 47664 URL: http://svn.reactos.org/svn/reactos?rev=47664&view=rev Log: [HAL]: Implement partly HalpFixupPciSupportedRanges to detect PCI Bridges, and PCI-to-PCI Bridges. The point is we want buses to be cramped down to the addresses supported by the parent bus/bridge. This is NOT currently done, so we warn users of these systems. 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 18:15:01 2010 @@ -533,16 +533,70 @@ IN PUCHAR MaxPciBus) { /* Not yet implemented */ - if (!WarningsGiven[3]++) DbgPrint("HAL: Not checking for PCI-to-PCI Bridges. Your hardware may malfunction!\n"); + if (!WarningsGiven[2]++) DbgPrint("HAL: Not checking for PCI-to-PCI Bridges. Your hardware may malfunction!\n"); return FALSE; } VOID NTAPI -HalpFixupPciSupportedRanges(IN ULONG MaxBuses) -{ - /* Not yet implemented */ - if (!WarningsGiven[4]++) DbgPrint("HAL: Not adjusting Bridge-to-Child PCI Address Ranges. Your hardware may malfunction!\n"); +HalpFixupPciSupportedRanges(IN ULONG BusCount) +{ + ULONG i; + PBUS_HANDLER Bus, ParentBus; + + /* Loop all buses */ + for (i = 0; i < BusCount; i++) + { + /* Get PCI bus handler */ + Bus = HalHandlerForBus(PCIBus, i); + + /* Loop all parent buses */ + ParentBus = Bus->ParentHandler; + while (ParentBus) + { + /* Should merge addresses */ + if (!WarningsGiven[0]++) DPRINT1("Found parent bus (indicating PCI Bridge). This is not supported!\n"); + + /* Check the next parent */ + ParentBus = ParentBus->ParentHandler; + } + } + + /* Loop all buses again */ + for (i = 0; i < BusCount; i++) + { + /* Get PCI bus handler */ + Bus = HalHandlerForBus(PCIBus, i); + + /* Check if this is a PCI 2.2 Bus with Subtractive Decode */ + if (!((PPCIPBUSDATA)Bus->BusData)->Subtractive) + { + /* Loop all parent buses */ + ParentBus = Bus->ParentHandler; + while (ParentBus) + { + /* But check only PCI parent buses specifically */ + if (ParentBus->InterfaceType == PCIBus) + { + /* Should trim addresses */ + if (!WarningsGiven[1]++) DPRINT1("Found parent PCI Bus (indicating PCI-to-PCI Bridge). This is not supported!\n"); + } + + /* Check the next parent */ + ParentBus = ParentBus->ParentHandler; + } + } + } + + /* Loop buses one last time */ + for (i = 0; i < BusCount; i++) + { + /* Get the PCI bus handler */ + Bus = HalHandlerForBus(PCIBus, i); + + /* Sort and combine (trim) bus address range information */ + DPRINT("Warning: Bus addresses not being optimized!\n"); + } } #endif @@ -671,12 +725,12 @@ if (PciData->u.type1.InterruptLine < 16) { /* Is this an IDE device? */ - DbgPrint("HAL: Found PCI device with IRQ line\n"); if (!HalpIsIdeDevice(PciData)) { /* We'll mask out this interrupt then */ - DbgPrint("HAL: Device is not an IDE Device. Should be masking IRQ %d! This is not supported!\n", - PciData->u.type1.InterruptLine); + DPRINT1("HAL: Device %lx:%lx is not an IDE Device. Should be masking IRQ %d! This is not supported!\n", + PciData->VendorID, PciData->DeviceID, + PciData->u.type1.InterruptLine); HalpPciIrqMask |= (1 << PciData->u.type1.InterruptLine); } } @@ -722,7 +776,8 @@ HALP_CARD_FEATURE_FULL_DECODE)) { /* We'll do chipset checks later */ - DbgPrint("HAL: Recognized a PCI Card with Extended Address Decoding. This is not supported!\n"); + DPRINT1("Your %lx:%lx PCI device has Extended Address Decoding. This is not supported!\n", + PciData->VendorID, PciData->DeviceID); ExtendedAddressDecoding = TRUE; } }

14 years, 3 months

[tkreuzer] 47663: [WIN32K] Introduce GreCreateBitmapEx, which has the extended functionality needed by some callers, GreCreateBitmap calls GreCreateBitmapEx to keep the simple syntax. Use it in DIB_CreateDIBSection to fix build. Also pass the size of the image (still ignored), which is needed for compressed bitmaps (we currently assume that RLEs take as much space as an uncompressed bitmap)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jun 7 17:55:03 2010 New Revision: 47663 URL: http://svn.reactos.org/svn/reactos?rev=47663&view=rev Log: [WIN32K] Introduce GreCreateBitmapEx, which has the extended functionality needed by some callers, GreCreateBitmap calls GreCreateBitmapEx to keep the simple syntax. Use it in DIB_CreateDIBSection to fix build. Also pass the size of the image (still ignored), which is needed for compressed bitmaps (we currently assume that RLEs take as much space as an uncompressed bitmap) Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Mon Jun 7 17:55:03 2010 @@ -11,7 +11,6 @@ UINT FASTCALL BITMAP_GetRealBitsPixel(UINT nBitsPixel); INT FASTCALL BITMAP_GetWidthBytes (INT bmWidth, INT bpp); - HBITMAP APIENTRY GreCreateBitmap( @@ -20,3 +19,15 @@ IN UINT cPlanes, IN UINT cBitsPixel, IN OPTIONAL PVOID pvBits); + +HBITMAP +APIENTRY +GreCreateBitmapEx( + IN INT nWidth, + IN INT nHeight, + IN ULONG cjWidthBytes, + IN ULONG iFormat, + IN USHORT fjBitmap, + IN ULONG cjBits, + IN OPTIONAL PVOID pvBits); + Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Mon Jun 7 17:55:03 2010 @@ -69,6 +69,74 @@ HBITMAP APIENTRY +GreCreateBitmapEx( + IN INT nWidth, + IN INT nHeight, + IN ULONG cjWidthBytes, + IN ULONG iFormat, + IN USHORT fjBitmap, + IN ULONG cjSizeImage, + IN OPTIONAL PVOID pvBits) +{ + PSURFACE psurf; + SURFOBJ *pso; + HBITMAP hbmp; + PVOID pvCompressedBits; + SIZEL sizl; + FLONG fl = 0; + + /* Verify format */ + if (iFormat < BMF_1BPP || iFormat > BMF_PNG) return NULL; + + /* Allocate a surface */ + psurf = SURFACE_AllocSurface(STYPE_BITMAP, nWidth, nHeight, iFormat); + if (!psurf) + { + DPRINT1("SURFACE_AllocSurface failed.\n"); + return NULL; + } + + /* Get the handle for the bitmap and the surfobj */ + hbmp = (HBITMAP)psurf->SurfObj.hsurf; + pso = &psurf->SurfObj; + + /* The infamous RLE hack */ + if (iFormat == BMF_4RLE) + { + sizl.cx = nWidth; sizl.cy = nHeight; + pvCompressedBits = pvBits; + pvBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); + Decompress4bpp(sizl, pvCompressedBits, pvBits, pso->lDelta); + fl |= BMF_RLE_HACK; + } + else if (iFormat == BMF_8RLE) + { + sizl.cx = nWidth; sizl.cy = nHeight; + pvCompressedBits = pvBits; + pvBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); + Decompress8bpp(sizl, pvCompressedBits, pvBits, pso->lDelta); + fl |= BMF_RLE_HACK; + } + + /* Set the bitmap bits */ + if (!SURFACE_bSetBitmapBits(psurf, fjBitmap, cjWidthBytes, pvBits)) + { + /* Bail out if that failed */ + DPRINT1("SURFACE_bSetBitmapBits failed.\n"); + SURFACE_FreeSurfaceByHandle(hbmp); + return NULL; + } + + /* Mark as API bitmap */ + psurf->flags |= API_BITMAP; + + /* Unlock the surface and return */ + SURFACE_UnlockSurface(psurf); + return hbmp; +} + +HBITMAP +APIENTRY GreCreateBitmap( IN INT nWidth, IN INT nHeight, @@ -76,65 +144,14 @@ IN UINT cBitsPixel, IN OPTIONAL PVOID pvBits) { - PSURFACE psurf; - SURFOBJ *pso; - HBITMAP hbmp; - PVOID pvCompressedBits; - SIZEL sizl; - FLONG fl = 0; - ULONG iFormat; - - /* Calculate bitmap format */ - iFormat = BitmapFormat(cBitsPixel * cPlanes, BI_RGB); - - /* Verify format */ - if (iFormat < BMF_1BPP || iFormat > BMF_PNG) return NULL; - - /* Allocate a surface */ - psurf = SURFACE_AllocSurface(STYPE_BITMAP, nWidth, nHeight, iFormat); - if (!psurf) - { - DPRINT1("SURFACE_AllocSurface failed.\n"); - return NULL; - } - - /* Get the handle for the bitmap and the surfobj */ - hbmp = (HBITMAP)psurf->SurfObj.hsurf; - pso = &psurf->SurfObj; - - /* The infamous RLE hack */ - if (iFormat == BMF_4RLE) - { - sizl.cx = nWidth; sizl.cy = nHeight; - pvCompressedBits = pvBits; - pvBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); - Decompress4bpp(sizl, pvCompressedBits, pvBits, pso->lDelta); - fl |= BMF_RLE_HACK; - } - else if (iFormat == BMF_8RLE) - { - sizl.cx = nWidth; sizl.cy = nHeight; - pvCompressedBits = pvBits; - pvBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); - Decompress8bpp(sizl, pvCompressedBits, pvBits, pso->lDelta); - fl |= BMF_RLE_HACK; - } - - /* Set the bitmap bits */ - if (!SURFACE_bSetBitmapBits(psurf, fl, 0, pvBits)) - { - /* Bail out if that failed */ - DPRINT1("SURFACE_bSetBitmapBits failed.\n"); - SURFACE_FreeSurfaceByHandle(hbmp); - return NULL; - } - - /* Mark as API bitmap */ - psurf->flags |= API_BITMAP; - - /* Unlock the surface and return */ - SURFACE_UnlockSurface(psurf); - return hbmp; + /* Call the extended function */ + return GreCreateBitmapEx(nWidth, + nHeight, + 0, /* auto width */ + BitmapFormat(cBitsPixel * cPlanes, BI_RGB), + 0, /* no bitmap flags */ + 0, /* auto size */ + pvBits); } HBITMAP Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Mon Jun 7 17:55:03 2010 @@ -1492,12 +1492,14 @@ // Create Device Dependent Bitmap and add DIB pointer Size.cx = bm.bmWidth; Size.cy = abs(bm.bmHeight); - res = IntCreateBitmap(Size, - bm.bmWidthBytes, - BitmapFormat(bi->biBitCount * bi->biPlanes, bi->biCompression), - BMF_DONTCACHE | BMF_USERMEM | BMF_NOZEROINIT | - (bi->biHeight < 0 ? BMF_TOPDOWN : 0), - bm.bmBits); + res = GreCreateBitmapEx(bm.bmWidth, + abs(bm.bmHeight), + bm.bmWidthBytes, + BitmapFormat(bi->biBitCount * bi->biPlanes, bi->biCompression), + BMF_DONTCACHE | BMF_USERMEM | BMF_NOZEROINIT | + (bi->biHeight < 0 ? BMF_TOPDOWN : 0), + bi->biSizeImage, + bm.bmBits); if (!res) { if (lpRGB != bmi->bmiColors)

14 years, 3 months

← Newer
1
...
22
23
24
25
26
27
28
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2010