Ros-diffs September 2010

ros-diffs@reactos.org

18 participants
278 discussions

[fireball] 48750: [NTOS] - Add CmRegistryMachineSystemName to the internal header file, needed for Pierre's further work.
by fireball＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: fireball Date: Sun Sep 12 10:29:35 2010 New Revision: 48750 URL: http://svn.reactos.org/svn/reactos?rev=48750&view=rev Log: [NTOS] - Add CmRegistryMachineSystemName to the internal header file, needed for Pierre's further work. Modified: trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Sun Sep 12 10:29:35 2010 @@ -1607,6 +1607,7 @@ extern PCMHIVE CmiVolatileHive; extern LIST_ENTRY CmiKeyObjectListHead; extern BOOLEAN CmpHoldLazyFlush; +extern UNICODE_STRING CmRegistryMachineSystemName; // // Inlined functions

1 0

[fireball] 48749: [FREETYPE] - Fix FT_Get_CID_Is_Internally_CID_Keyed export name to match source code.
by fireball＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: fireball Date: Sun Sep 12 10:11:55 2010 New Revision: 48749 URL: http://svn.reactos.org/svn/reactos?rev=48749&view=rev Log: [FREETYPE] - Fix FT_Get_CID_Is_Internally_CID_Keyed export name to match source code. Modified: trunk/reactos/lib/3rdparty/freetype/freetype.def Modified: trunk/reactos/lib/3rdparty/freetype/freetype.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/free… ============================================================================== --- trunk/reactos/lib/3rdparty/freetype/freetype.def [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/freetype/freetype.def [iso-8859-1] Sun Sep 12 10:11:55 2010 @@ -49,7 +49,7 @@ FT_Get_Char_Index FT_Get_Charmap_Index FT_Get_CID_From_Glyph_Index - FT_Get_CID_Is_Internally_CID_keyed + FT_Get_CID_Is_Internally_CID_Keyed FT_Get_CID_Registry_Ordering_Supplement FT_Get_First_Char FT_Get_FSType_Flags

1 0

[sir_richard] 48748: - Fix the ChangeResourceSetting and the Reset configurator callback parameter names - Part support for resource change with PciComputeNewCurrentSettings... full support for Pci...
by sir_richard＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: sir_richard Date: Sun Sep 12 06:03:12 2010 New Revision: 48748 URL: http://svn.reactos.org/svn/reactos?rev=48748&view=rev Log: - Fix the ChangeResourceSetting and the Reset configurator callback parameter names - Part support for resource change with PciComputeNewCurrentSettings... full support for PciSetResources, PciUpdateHardware, PcipUpdateHardare - IRP_MN_START_DEVICE for PDO (PciPdoIrpStartDevice) implement - PciNextPartialDescriptor, PciDebugPrintCmResList, PciDebugPrintPartialResource helpers implement - Now full PDO support almost done, PCIX driver ready for test - Thanks to cgoodman assert fix - PnP forever recursion in enumerate, must fix to finish - Goodbye sir_richard, nice to have you Modified: trunk/reactos/drivers/bus/pcix/debug.c trunk/reactos/drivers/bus/pcix/device.c trunk/reactos/drivers/bus/pcix/enum.c trunk/reactos/drivers/bus/pcix/fdo.c trunk/reactos/drivers/bus/pcix/intrface/cardbus.c trunk/reactos/drivers/bus/pcix/pci.h trunk/reactos/drivers/bus/pcix/pci/ppbridge.c trunk/reactos/drivers/bus/pcix/pdo.c trunk/reactos/drivers/bus/pcix/utils.c Modified: trunk/reactos/drivers/bus/pcix/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/debug.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/debug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/debug.c [iso-8859-1] Sun Sep 12 06:03:12 2010 @@ -341,4 +341,60 @@ DPRINT1("\n"); } +VOID +NTAPI +PciDebugPrintPartialResource(IN PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialResource) +{ + /* Dump all the data in the partial */ + DPRINT1(" Partial Resource Descriptor @0x%x\n", PartialResource); + DPRINT1(" Type = %d (%s)\n", PartialResource->Type, PciDebugCmResourceTypeToText(PartialResource->Type)); + DPRINT1(" ShareDisposition = %d\n", PartialResource->ShareDisposition); + DPRINT1(" Flags = 0x%04X\n", PartialResource->Flags); + DPRINT1(" Data[%d] = %08x %08x %08x\n", + 0, + PartialResource->u.Generic.Start.LowPart, + PartialResource->u.Generic.Start.HighPart, + PartialResource->u.Generic.Length); +} + +VOID +NTAPI +PciDebugPrintCmResList(IN PCM_RESOURCE_LIST PartialList) +{ + PCM_FULL_RESOURCE_DESCRIPTOR FullDescriptor; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; + ULONG Count, i, ListCount; + + /* Make sure there's something to dump */ + if (!PartialList) return; + + /* Get the full list count */ + ListCount = PartialList->Count; + FullDescriptor = PartialList->List; + DPRINT1(" CM_RESOURCE_LIST (PCI Bus Driver) (List Count = %d)\n", PartialList->Count); + + /* Loop full list */ + for (i = 0; i < ListCount; i++) + { + /* Loop full descriptor */ + DPRINT1(" InterfaceType %d\n", FullDescriptor->InterfaceType); + DPRINT1(" BusNumber 0x%x\n", FullDescriptor->BusNumber); + + /* Get partial count and loop partials */ + Count = FullDescriptor->PartialResourceList.Count; + for (PartialDescriptor = FullDescriptor->PartialResourceList.PartialDescriptors; + Count; + PartialDescriptor = PciNextPartialDescriptor(PartialDescriptor)) + { + /* Print each partial */ + PciDebugPrintPartialResource(PartialDescriptor); + Count--; + } + } + + /* Done printing data */ + DPRINT1("\n"); +} + + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/device.c?… ============================================================================== --- trunk/reactos/drivers/bus/pcix/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/device.c [iso-8859-1] Sun Sep 12 06:03:12 2010 @@ -267,7 +267,8 @@ VOID NTAPI -Device_ResetDevice(IN PPCI_CONFIGURATOR_CONTEXT Context) +Device_ResetDevice(IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData) { /* Not yet implemented */ UNIMPLEMENTED; @@ -276,7 +277,8 @@ VOID NTAPI -Device_ChangeResourceSettings(IN PPCI_CONFIGURATOR_CONTEXT Context) +Device_ChangeResourceSettings(IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData) { /* Not yet implemented */ UNIMPLEMENTED; Modified: trunk/reactos/drivers/bus/pcix/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/enum.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] Sun Sep 12 06:03:12 2010 @@ -48,6 +48,244 @@ }; /* FUNCTIONS ******************************************************************/ + +BOOLEAN +NTAPI +PciComputeNewCurrentSettings(IN PPCI_PDO_EXTENSION PdoExtension, + IN PCM_RESOURCE_LIST ResourceList) +{ + PCM_PARTIAL_RESOURCE_DESCRIPTOR Partial, InterruptResource; + PCM_PARTIAL_RESOURCE_DESCRIPTOR BaseResource, CurrentDescriptor; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PreviousDescriptor; + CM_PARTIAL_RESOURCE_DESCRIPTOR ResourceArray[7]; + PCM_FULL_RESOURCE_DESCRIPTOR FullList; + BOOLEAN DrainPartial, RangeChange; + ULONG i, j; + PPCI_FUNCTION_RESOURCES PciResources; + PAGED_CODE(); + + /* Make sure we have either no resources, or at least one */ + ASSERT((ResourceList == NULL) || (ResourceList->Count == 1)); + + /* Initialize no partial, interrupt descriptor, or range change */ + Partial = NULL; + InterruptResource = NULL; + RangeChange = FALSE; + + /* Check if there's not actually any resources */ + if (!(ResourceList) || !(ResourceList->Count)) + { + /* Then just return the hardware update state */ + return PdoExtension->UpdateHardware; + } + + /* Print the new specified resource list */ + PciDebugPrintCmResList(ResourceList); + + /* Clear the temporary resource array */ + for (i = 0; i < 7; i++) ResourceArray[i].Type = CmResourceTypeNull; + + /* Loop the full resource descriptor */ + FullList = ResourceList->List; + for (i = 0; i < ResourceList->Count; i++) + { + /* Initialize loop variables */ + DrainPartial = FALSE; + BaseResource = NULL; + + /* Loop the partial descriptors */ + Partial = FullList->PartialResourceList.PartialDescriptors; + for (j = 0; j < FullList->PartialResourceList.Count; j++) + { + /* Check if we were supposed to drain a partial due to device data */ + if (DrainPartial) + { + /* Draining complete, move on to the next descriptor then */ + DrainPartial--; + continue; + } + + /* Check what kind of descriptor this was */ + switch (Partial->Type) + { + /* Base BAR resources */ + case CmResourceTypePort: + case CmResourceTypeMemory: + + /* Set it as the base */ + ASSERT(BaseResource == NULL); + BaseResource = Partial; + break; + + /* Interrupt resource */ + case CmResourceTypeInterrupt: + + /* Make sure it's a compatible (and the only) PCI interrupt */ + ASSERT(InterruptResource == NULL); + ASSERT(Partial->u.Interrupt.Level == Partial->u.Interrupt.Vector); + InterruptResource = Partial; + + /* Only 255 interrupts on x86/x64 hardware */ + if (Partial->u.Interrupt.Level < 256) + { + /* Use the passed interrupt line */ + PdoExtension->AdjustedInterruptLine = Partial->u.Interrupt.Level; + } + else + { + /* Invalid vector, so ignore it */ + PdoExtension->AdjustedInterruptLine = 0; + } + + break; + + /* Check for specific device data */ + case CmResourceTypeDevicePrivate: + + /* Check what kind of data this was */ + switch (Partial->u.DevicePrivate.Data[0]) + { + /* Not used in the driver yet */ + case 1: + UNIMPLEMENTED; + while (TRUE); + break; + + /* Not used in the driver yet */ + case 2: + UNIMPLEMENTED; + while (TRUE); + break; + + /* A drain request */ + case 3: + /* Shouldn't be a base resource, this is a drain */ + ASSERT(BaseResource == NULL); + DrainPartial = Partial->u.DevicePrivate.Data[1]; + ASSERT(DrainPartial == TRUE); + break; + } + break; + } + + /* Move to the next descriptor */ + Partial = PciNextPartialDescriptor(Partial); + } + + /* We should be starting a new list now */ + ASSERT(BaseResource == NULL); + FullList = (PVOID)Partial; + } + + /* Check the current assigned PCI resources */ + PciResources = PdoExtension->Resources; + if (!PciResources) return FALSE; + + //if... // MISSING CODE + UNIMPLEMENTED; + DPRINT1("Missing sanity checking code!\n"); + + /* Loop all the PCI function resources */ + for (i = 0; i < 7; i++) + { + /* Get the current function resource descriptor, and the new one */ + CurrentDescriptor = &PciResources->Current[i]; + Partial = &ResourceArray[i]; + + /* Previous is current during the first loop iteration */ + PreviousDescriptor = &PciResources->Current[(i == 0) ? (0) : (i - 1)]; + + /* Check if this new descriptor is different than the old one */ + if (((Partial->Type != CurrentDescriptor->Type) || + (Partial->Type != CmResourceTypeNull)) && + ((Partial->u.Generic.Start.QuadPart != + CurrentDescriptor->u.Generic.Start.QuadPart) || + (Partial->u.Generic.Length != CurrentDescriptor->u.Generic.Length))) + { + /* Record a change */ + RangeChange = TRUE; + + /* Was there a range before? */ + if (CurrentDescriptor->Type != CmResourceTypeNull) + { + /* Print it */ + DbgPrint(" Old range-\n"); + PciDebugPrintPartialResource(CurrentDescriptor); + } + else + { + /* There was no range */ + DbgPrint(" Previously unset range\n"); + } + + /* Print new one */ + DbgPrint(" changed to\n"); + PciDebugPrintPartialResource(Partial); + + /* Update to new range */ + CurrentDescriptor->Type = Partial->Type; + PreviousDescriptor->u.Generic.Start = Partial->u.Generic.Start; + PreviousDescriptor->u.Generic.Length = Partial->u.Generic.Length; + CurrentDescriptor = PreviousDescriptor; + } + } + + /* Either the hardware was updated, or a resource range changed */ + return ((RangeChange) || (PdoExtension->UpdateHardware)); +} + +VOID +NTAPI +PcipUpdateHardware(IN PVOID Context, + IN PVOID Context2) +{ + PPCI_PDO_EXTENSION PdoExtension = Context; + PPCI_COMMON_HEADER PciData = Context2; + + /* Check if we're allowed to disable decodes */ + PciData->Command = PdoExtension->CommandEnables; + if (!(PdoExtension->HackFlags & PCI_HACK_PRESERVE_COMMAND)) + { + /* Disable all decodes */ + PciData->Command &= ~(PCI_ENABLE_IO_SPACE | + PCI_ENABLE_MEMORY_SPACE | + PCI_ENABLE_BUS_MASTER | + PCI_ENABLE_WRITE_AND_INVALIDATE); + } + + /* Update the device configuration */ + PciData->Status = 0; + PciWriteDeviceConfig(PdoExtension, PciData, 0, PCI_COMMON_HDR_LENGTH); + + /* Turn decodes back on */ + PciDecodeEnable(PdoExtension, TRUE, &PdoExtension->CommandEnables); +} + +VOID +NTAPI +PciUpdateHardware(IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData) +{ + PCI_IPI_CONTEXT Context; + + /* Check for critical devices and PCI Debugging devices */ + if ((PdoExtension->HackFlags & PCI_HACK_CRITICAL_DEVICE) || + (PdoExtension->OnDebugPath)) + { + /* Build the context and send an IPI */ + Context.RunCount = 1; + Context.Barrier = 1; + Context.Context = PciData; + Context.Function = PcipUpdateHardware; + Context.DeviceExtension = PdoExtension; + KeIpiGenericCall(PciExecuteCriticalSystemRoutine, (ULONG_PTR)&Context); + } + else + { + /* Just to the update inline */ + PcipUpdateHardware(PdoExtension, PciData); + } +} PIO_RESOURCE_REQUIREMENTS_LIST NTAPI @@ -666,8 +904,8 @@ * Controller to Native Mode" in the Storage section of the * Windows Driver Kit for more details. */ - PdoExtension->SwitchedIDEToNativeMode = - PciConfigureIdeController(PdoExtension, PciData, 1); + PdoExtension->IDEInNativeMode = + PciConfigureIdeController(PdoExtension, PciData, TRUE); } /* Is native mode enabled after all? */ @@ -1044,8 +1282,9 @@ VOID NTAPI PciWriteLimitsAndRestoreCurrent(IN PVOID Reserved, - IN PPCI_CONFIGURATOR_CONTEXT Context) + IN PVOID Context2) { + PPCI_CONFIGURATOR_CONTEXT Context = Context2; PPCI_COMMON_HEADER PciData, Current; PPCI_PDO_EXTENSION PdoExtension; @@ -1140,7 +1379,7 @@ /* For these devices, an IPI must be sent to force high-IRQL discovery */ IpiContext.Barrier = 1; IpiContext.RunCount = 1; - IpiContext.PdoExtension = PdoExtension; + IpiContext.DeviceExtension = PdoExtension; IpiContext.Function = PciWriteLimitsAndRestoreCurrent; IpiContext.Context = Context; KeIpiGenericCall(PciExecuteCriticalSystemRoutine, (ULONG_PTR)&IpiContext); @@ -1886,4 +2125,122 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +PciSetResources(IN PPCI_PDO_EXTENSION PdoExtension, + IN BOOLEAN DoReset, + IN BOOLEAN SomethingSomethingDarkSide) +{ + PPCI_FDO_EXTENSION FdoExtension; + UCHAR NewCacheLineSize, NewLatencyTimer; + PCI_COMMON_HEADER PciData; + BOOLEAN Native; + PPCI_CONFIGURATOR Configurator; + + /* Get the FDO and read the configuration data */ + FdoExtension = PdoExtension->ParentFdoExtension; + PciReadDeviceConfig(PdoExtension, &PciData, 0, PCI_COMMON_HDR_LENGTH); + + /* Make sure this is still the same device */ + if (!PcipIsSameDevice(PdoExtension, &PciData)) + { + /* Fail */ + ASSERTMSG(FALSE, "PCI Set resources - not same device"); + return STATUS_DEVICE_DOES_NOT_EXIST; + } + + /* Nothing to set for a host bridge */ + if ((PdoExtension->BaseClass == PCI_CLASS_BRIDGE_DEV) && + (PdoExtension->SubClass == PCI_SUBCLASS_BR_HOST)) + { + /* Fake success */ + return STATUS_SUCCESS; + } + + /* Check if an IDE controller is being reset */ + if ((DoReset) && + (PdoExtension->BaseClass == PCI_CLASS_MASS_STORAGE_CTLR) && + (PdoExtension->SubClass == PCI_SUBCLASS_MSC_IDE_CTLR)) + { + /* Turn off native mode */ + Native = PciConfigureIdeController(PdoExtension, &PciData, FALSE); + ASSERT(Native == PdoExtension->IDEInNativeMode); + } + + /* Check for update of a hotplug device, or first configuration of one */ + if ((PdoExtension->NeedsHotPlugConfiguration) && + (FdoExtension->HotPlugParameters.Acquired)) + { + /* Don't have hotplug devices to test with yet, QEMU 0.14 should */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Locate the correct resource configurator for this type of device */ + Configurator = &PciConfigurators[PdoExtension->HeaderType]; + + /* Apply the settings change */ + Configurator->ChangeResourceSettings(PdoExtension, &PciData); + + /* Assume no update needed */ + PdoExtension->UpdateHardware = FALSE; + + /* Check if a reset is needed */ + if (DoReset) + { + /* Reset resources */ + Configurator->ResetDevice(PdoExtension, &PciData); + PciData.u.type0.InterruptLine = PdoExtension->RawInterruptLine; + } + + /* Check if the latency timer changed */ + NewLatencyTimer = PdoExtension->SavedLatencyTimer; + if (PciData.LatencyTimer != NewLatencyTimer) + { + /* Debug notification */ + DPRINT1("PCI (pdox %08x) changing latency from %02x to %02x.\n", + PdoExtension, + PciData.LatencyTimer, + NewLatencyTimer); + } + + /* Check if the cache line changed */ + NewCacheLineSize = PdoExtension->SavedCacheLineSize; + if (PciData.CacheLineSize != NewCacheLineSize) + { + /* Debug notification */ + DPRINT1("PCI (pdox %08x) changing cache line size from %02x to %02x.\n", + PdoExtension, + PciData.CacheLineSize, + NewCacheLineSize); + } + + /* Inherit data from PDO extension */ + PciData.LatencyTimer = PdoExtension->SavedLatencyTimer; + PciData.CacheLineSize = PdoExtension->SavedCacheLineSize; + PciData.u.type0.InterruptLine = PdoExtension->RawInterruptLine; + + /* Apply any resource hacks required */ + PciApplyHacks(FdoExtension, + &PciData, + PdoExtension->Slot, + PCI_HACK_FIXUP_BEFORE_UPDATE, + PdoExtension); + + /* Check if I/O space was disabled by administrator or driver */ + if (PdoExtension->IoSpaceNotRequired) + { + /* Don't turn on the decode */ + PdoExtension->CommandEnables &= ~PCI_ENABLE_IO_SPACE; + } + + /* Update the device with the new settings */ + PciUpdateHardware(PdoExtension, &PciData); + + /* Update complete */ + PdoExtension->RawInterruptLine = PciData.u.type0.InterruptLine; + PdoExtension->NeedsHotPlugConfiguration = FALSE; + return STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/fdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] Sun Sep 12 06:03:12 2010 @@ -298,10 +298,10 @@ PDEVICE_CAPABILITIES Capabilities; PAGED_CODE(); ASSERT_FDO(DeviceExtension); - + /* Get the capabilities */ Capabilities = IoStackLocation->Parameters.DeviceCapabilities.Capabilities; - + /* Inherit wake levels and power mappings from the higher-up capabilities */ DeviceExtension->PowerState.SystemWakeLevel = Capabilities->SystemWake; DeviceExtension->PowerState.DeviceWakeLevel = Capabilities->DeviceWake; Modified: trunk/reactos/drivers/bus/pcix/intrface/cardbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/cardbus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/cardbus.c [iso-8859-1] Sun Sep 12 06:03:12 2010 @@ -73,7 +73,8 @@ VOID NTAPI -Cardbus_ResetDevice(IN PPCI_CONFIGURATOR_CONTEXT Context) +Cardbus_ResetDevice(IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData) { UNIMPLEMENTED; while (TRUE); @@ -81,7 +82,8 @@ VOID NTAPI -Cardbus_ChangeResourceSettings(IN PPCI_CONFIGURATOR_CONTEXT Context) +Cardbus_ChangeResourceSettings(IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData) { UNIMPLEMENTED; while (TRUE); Modified: trunk/reactos/drivers/bus/pcix/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci.h?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] Sun Sep 12 06:03:12 2010 @@ -298,10 +298,11 @@ BOOLEAN MovedDevice; BOOLEAN DisablePowerDown; BOOLEAN NeedsHotPlugConfiguration; - BOOLEAN SwitchedIDEToNativeMode; + BOOLEAN IDEInNativeMode; BOOLEAN BIOSAllowsIDESwitchToNativeMode; BOOLEAN IoSpaceUnderNativeIdeControl; BOOLEAN OnDebugPath; + BOOLEAN IoSpaceNotRequired; PCI_POWER_STATE PowerState; PCI_HEADER_TYPE_DEPENDENT Dependent; ULONGLONG HackFlags; @@ -450,7 +451,8 @@ ); typedef VOID (NTAPI *PCI_CONFIGURATOR_CHANGE_RESOURCE_SETTINGS)( - IN struct _PCI_CONFIGURATOR_CONTEXT* Context + IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData ); typedef VOID (NTAPI *PCI_CONFIGURATOR_GET_ADDITIONAL_RESOURCE_DESCRIPTORS)( @@ -460,7 +462,8 @@ ); typedef VOID (NTAPI *PCI_CONFIGURATOR_RESET_DEVICE)( - IN struct _PCI_CONFIGURATOR_CONTEXT* Context + IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData ); // @@ -496,7 +499,7 @@ // typedef VOID (NTAPI *PCI_IPI_FUNCTION)( IN PVOID Reserved, - IN PPCI_CONFIGURATOR_CONTEXT Context + IN PVOID Context ); // @@ -506,7 +509,7 @@ { LONG RunCount; ULONG Barrier; - PPCI_PDO_EXTENSION PdoExtension; + PVOID DeviceExtension; PCI_IPI_FUNCTION Function; PVOID Context; } PCI_IPI_CONTEXT, *PPCI_IPI_CONTEXT; @@ -1143,6 +1146,12 @@ IN OUT PDEVICE_CAPABILITIES DeviceCapability ); +PCM_PARTIAL_RESOURCE_DESCRIPTOR +NTAPI +PciNextPartialDescriptor( + PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDescriptor +); + // // Configuration Routines // @@ -1259,6 +1268,18 @@ NTAPI PciDebugPrintIoResReqList( IN PIO_RESOURCE_REQUIREMENTS_LIST Requirements +); + +VOID +NTAPI +PciDebugPrintCmResList( + IN PCM_RESOURCE_LIST ResourceList +); + +VOID +NTAPI +PciDebugPrintPartialResource( + IN PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialResource ); // @@ -1524,6 +1545,21 @@ IN OUT PIO_RESOURCE_REQUIREMENTS_LIST *RequirementsList ); +BOOLEAN +NTAPI +PciComputeNewCurrentSettings( + IN PPCI_PDO_EXTENSION PdoExtension, + IN PCM_RESOURCE_LIST ResourceList +); + +NTSTATUS +NTAPI +PciSetResources( + IN PPCI_PDO_EXTENSION PdoExtension, + IN BOOLEAN DoReset, + IN BOOLEAN SomethingSomethingDarkSide +); + // // Identification Functions // @@ -1589,13 +1625,15 @@ VOID NTAPI Cardbus_ResetDevice( - IN PPCI_CONFIGURATOR_CONTEXT Context + IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData ); VOID NTAPI Cardbus_ChangeResourceSettings( - IN PPCI_CONFIGURATOR_CONTEXT Context + IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData ); // @@ -1636,13 +1674,15 @@ VOID NTAPI Device_ResetDevice( - IN PPCI_CONFIGURATOR_CONTEXT Context + IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData ); VOID NTAPI Device_ChangeResourceSettings( - IN PPCI_CONFIGURATOR_CONTEXT Context + IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData ); // @@ -1683,13 +1723,15 @@ VOID NTAPI PPBridge_ResetDevice( - IN PPCI_CONFIGURATOR_CONTEXT Context + IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData ); VOID NTAPI PPBridge_ChangeResourceSettings( - IN PPCI_CONFIGURATOR_CONTEXT Context + IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData ); // Modified: trunk/reactos/drivers/bus/pcix/pci/ppbridge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/ppbri… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/ppbridge.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/ppbridge.c [iso-8859-1] Sun Sep 12 06:03:12 2010 @@ -668,7 +668,8 @@ VOID NTAPI -PPBridge_ResetDevice(IN PPCI_CONFIGURATOR_CONTEXT Context) +PPBridge_ResetDevice(IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData) { UNIMPLEMENTED; while (TRUE); @@ -676,7 +677,8 @@ VOID NTAPI -PPBridge_ChangeResourceSettings(IN PPCI_CONFIGURATOR_CONTEXT Context) +PPBridge_ChangeResourceSettings(IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData) { UNIMPLEMENTED; while (TRUE); Modified: trunk/reactos/drivers/bus/pcix/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pdo.c [iso-8859-1] Sun Sep 12 06:03:12 2010 @@ -112,9 +112,95 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_NOT_SUPPORTED; + NTSTATUS Status; + BOOLEAN Changed, DoReset; + POWER_STATE PowerState; + PAGED_CODE(); + + DoReset = FALSE; + + /* Begin entering the start phase */ + Status = PciBeginStateTransition((PVOID)DeviceExtension, PciStarted); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if this is a VGA device */ + if (((DeviceExtension->BaseClass == PCI_CLASS_PRE_20) && + (DeviceExtension->SubClass == PCI_SUBCLASS_PRE_20_VGA)) || + ((DeviceExtension->BaseClass == PCI_CLASS_DISPLAY_CTLR) && + (DeviceExtension->SubClass -= PCI_SUBCLASS_VID_VGA_CTLR))) + { + /* Always force it on */ + DeviceExtension->CommandEnables |= (PCI_ENABLE_IO_SPACE | + PCI_ENABLE_MEMORY_SPACE); + } + + /* Check if native IDE is enabled and it owns the I/O ports */ + if (DeviceExtension->IoSpaceUnderNativeIdeControl) + { + /* Then don't allow I/O access */ + DeviceExtension->CommandEnables &= ~PCI_ENABLE_IO_SPACE; + } + + /* Always enable bus mastering */ + DeviceExtension->CommandEnables |= PCI_ENABLE_BUS_MASTER; + + /* Check if the OS assigned resources differ from the PCI configuration */ + Changed = PciComputeNewCurrentSettings(DeviceExtension, + IoStackLocation->Parameters. + StartDevice.AllocatedResources); + if (Changed) + { + /* Remember this for later */ + DeviceExtension->MovedDevice = TRUE; + } + else + { + /* All good */ + DPRINT1("PCI - START not changing resource settings.\n"); + } + + /* Check if the device was sleeping */ + if (DeviceExtension->PowerState.CurrentDeviceState != PowerDeviceD0) + { + /* Power it up */ + Status = PciSetPowerManagedDevicePowerState(DeviceExtension, + PowerDeviceD0, + FALSE); + if (!NT_SUCCESS(Status)) + { + /* Powerup fail, fail the request */ + PciCancelStateTransition((PVOID)DeviceExtension, PciStarted); + return STATUS_DEVICE_POWER_FAILURE; + } + + /* Tell the power manager that the device is powered up */ + PowerState.DeviceState = PowerDeviceD0; + PoSetPowerState(DeviceExtension->PhysicalDeviceObject, + DevicePowerState, + PowerState); + + /* Update internal state */ + DeviceExtension->PowerState.CurrentDeviceState = PowerDeviceD0; + + /* This device's resources and decodes will need to be reset */ + DoReset = TRUE; + } + + /* Update resource information now that the device is powered up and active */ + Status = PciSetResources(DeviceExtension, DoReset, TRUE); + if (!NT_SUCCESS(Status)) + { + /* That failed, so cancel the transition */ + PciCancelStateTransition((PVOID)DeviceExtension, PciStarted); + } + else + { + /* Fully commit, as the device is now started up and ready to go */ + PciCommitStateTransition((PVOID)DeviceExtension, PciStarted); + } + + /* Return the result of the start request */ + return Status; } NTSTATUS Modified: trunk/reactos/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/utils.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] Sun Sep 12 06:03:12 2010 @@ -1069,7 +1069,7 @@ if (!InterlockedDecrement(&Context->RunCount)) { /* Nope, this is the first instance, so execute the IPI function */ - Context->Function(Context->PdoExtension, Context->Context); + Context->Function(Context->DeviceExtension, Context->Context); /* Notify anyone that was spinning that they can stop now */ Context->Barrier = 0; @@ -1757,4 +1757,25 @@ return Status; } +PCM_PARTIAL_RESOURCE_DESCRIPTOR +NTAPI +PciNextPartialDescriptor(PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDescriptor) +{ + PCM_PARTIAL_RESOURCE_DESCRIPTOR NextDescriptor; + + /* Assume the descriptors are the fixed size ones */ + NextDescriptor = CmDescriptor + 1; + + /* But check if this is actually a variable-sized descriptor */ + if (CmDescriptor->Type == CmResourceTypeDeviceSpecific) + { + /* Add the size of the variable section as well */ + NextDescriptor = (PVOID)((ULONG_PTR)NextDescriptor + + CmDescriptor->u.DeviceSpecificData.DataSize); + } + + /* Now the correct pointer has been computed, return it */ + return NextDescriptor; +} + /* EOF */

1 0

[cgutman] 48747: [USETUP] - Update the Polish translation - Patch by Olaf Siejka
by cgutman＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: cgutman Date: Sun Sep 12 00:47:07 2010 New Revision: 48747 URL: http://svn.reactos.org/svn/reactos?rev=48747&view=rev Log: [USETUP] - Update the Polish translation - Patch by Olaf Siejka Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sun Sep 12 00:47:07 2010 @@ -994,13 +994,13 @@ { 8, 12, - "Install bootloader on the harddisk (MBR and VBR).", + "Wgraj bootloader na dysk twardy (MBR i VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on the harddisk (VBR only).", + "Wgraj bootloader na dysk twardy (tylko VBR).", TEXT_STYLE_NORMAL }, {

1 0

[fireball] 48746: [WINLOGON] - Fix comments copypasta.
by fireball＠svn.reactos.org 11 Sep '10

11 Sep '10

Author: fireball Date: Sat Sep 11 21:16:41 2010 New Revision: 48746 URL: http://svn.reactos.org/svn/reactos?rev=48746&view=rev Log: [WINLOGON] - Fix comments copypasta. Modified: trunk/reactos/base/system/winlogon/winlogon.c Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sat Sep 11 21:16:41 2010 @@ -167,7 +167,7 @@ LPCWSTR ServiceString = L"lsass.exe"; BOOL res; - /* Start the service control manager (services.exe) */ + /* Start the local security authority subsystem (lsass.exe) */ ZeroMemory(&StartupInfo, sizeof(STARTUPINFOW)); StartupInfo.cb = sizeof(StartupInfo); StartupInfo.lpReserved = NULL;

1 0

[fireball] 48745: [NTOS] - Daniel Zimmermann: Fix POPF bugs in VDM mode, namely truncation of the stackpointer to 16 bit and setting proper flags in the trapframe eflags register. This fixes proble...
by fireball＠svn.reactos.org 11 Sep '10

11 Sep '10

Author: fireball Date: Sat Sep 11 09:20:26 2010 New Revision: 48745 URL: http://svn.reactos.org/svn/reactos?rev=48745&view=rev Log: [NTOS] - Daniel Zimmermann: Fix POPF bugs in VDM mode, namely truncation of the stackpointer to 16 bit and setting proper flags in the trapframe eflags register. This fixes problems with videocards calling int 0x10 VESA BIOS extension. See issue #5608 for more details. Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Sat Sep 11 09:20:26 2010 @@ -70,17 +70,17 @@ /* Build flat ESP */ Esp = (TrapFrame->HardwareSegSs << 4) + (USHORT)TrapFrame->HardwareEsp; - Esp -= 2; /* Check for OPER32 */ if (KiVdmGetPrefixFlags(Flags) & PFX_FLAG_OPER32) { /* Save EFlags */ + Esp -= 4; + *(PULONG)(Esp - 2) = V86EFlags; + } + else + { Esp -= 2; - *(PULONG)(Esp - 2) = V86EFlags; - } - else - { /* Save EFLags */ *(PUSHORT)Esp = (USHORT)V86EFlags; } @@ -103,20 +103,24 @@ /* Build flat ESP */ Esp = (TrapFrame->HardwareSegSs << 4) + (USHORT)TrapFrame->HardwareEsp; - /* Read EFlags */ - EFlags = *(PULONG)Esp; - Esp += 4; - /* Check for OPER32 */ - if (!(KiVdmGetPrefixFlags(Flags) & PFX_FLAG_OPER32)) - { + if (KiVdmGetPrefixFlags(Flags) & PFX_FLAG_OPER32) + { + /* Read EFlags */ + EFlags = *(PULONG)Esp; + Esp += 4; + } + else + { + /* Read EFlags */ + EFlags = *(PUSHORT)Esp; + Esp += 2; /* Read correct flags and use correct stack address */ - Esp -= 2; EFlags &= 0xFFFF; } /* Set new ESP */ - TrapFrame->HardwareEsp = Esp; + TrapFrame->HardwareEsp = (USHORT)Esp; /* Mask out IOPL from the flags */ EFlags &= ~EFLAGS_IOPL; @@ -137,7 +141,7 @@ V86EFlags |= EFLAGS_V86_MASK | EFLAGS_INTERRUPT_MASK; /* Update EFlags in trap frame */ - TrapFrame->EFlags |= V86EFlags; + TrapFrame->EFlags = V86EFlags; /* Check if ESP0 needs to be fixed up */ if (TrapEFlags & EFLAGS_V86_MASK) Ki386AdjustEsp0(TrapFrame); @@ -311,6 +315,7 @@ else { /* FIXME: Check for VDM interrupts */ + DPRINT("FIXME: Check for VDM interrupts\n"); } /* We're done */

1 0

[fireball] 48744: - Fix build, sorry.
by fireball＠svn.reactos.org 11 Sep '10

11 Sep '10

Author: fireball Date: Sat Sep 11 09:01:58 2010 New Revision: 48744 URL: http://svn.reactos.org/svn/reactos?rev=48744&view=rev Log: - Fix build, sorry. 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] Sat Sep 11 09:01:58 2010 @@ -804,7 +804,10 @@ VOID NTAPI HalpDebugPciDumpBus( - VOID + IN ULONG i, + IN ULONG j, + IN ULONG k, + IN PPCI_COMMON_CONFIG PciData ); #ifdef _M_AMD64

1 0

[fireball] 48743: [HAL] - Don't include PCI IDs database into mini-HAL.
by fireball＠svn.reactos.org 10 Sep '10

10 Sep '10

Author: fireball Date: Fri Sep 10 21:57:46 2010 New Revision: 48743 URL: http://svn.reactos.org/svn/reactos?rev=48743&view=rev Log: [HAL] - Don't include PCI IDs database into mini-HAL. Modified: trunk/reactos/hal/halx86/hal_mini.rbuild Modified: trunk/reactos/hal/halx86/hal_mini.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_mini.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/hal_mini.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_mini.rbuild [iso-8859-1] Fri Sep 10 21:57:46 2010 @@ -15,7 +15,6 @@ <file>cmosbus.c</file> <file>isabus.c</file> <file>pcibus.c</file> - <file>pcidata.c</file> <file>sysbus.c</file> </directory> <file>bussupp.c</file>

1 0

[ekohl] 48742: [DESK.CPL] Fix client font in the advanced appearance dialog. Patch by Katayama Hirofumi. See issue #5552 for more details.
by ekohl＠svn.reactos.org 10 Sep '10

10 Sep '10

Author: ekohl Date: Fri Sep 10 21:57:36 2010 New Revision: 48742 URL: http://svn.reactos.org/svn/reactos?rev=48742&view=rev Log: [DESK.CPL] Fix client font in the advanced appearance dialog. Patch by Katayama Hirofumi. See issue #5552 for more details. Modified: trunk/reactos/dll/cpl/desk/preview.c Modified: trunk/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/preview.c [iso-8859-1] Fri Sep 10 21:57:36 2010 @@ -63,6 +63,7 @@ HFONT hCaptionFont; HFONT hMenuFont; HFONT hMessageFont; + HFONT hClientFont; HMENU hMenu; @@ -112,6 +113,8 @@ { THEME *theme; + pPreviewData->hClientFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT); + /* Load and modify the menu */ pPreviewData->hMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDR_PREVIEW_MENU)); EnableMenuItem(pPreviewData->hMenu, @@ -289,7 +292,7 @@ rc.left += 4; rc.top += 2; SetTextColor(hdc, theme->crColor[COLOR_WINDOWTEXT]); - hOldFont = SelectObject(hdc, pPreviewData->hCaptionFont); /* FIXME: client text is not caption text */ + hOldFont = SelectObject(hdc, pPreviewData->hClientFont); DrawText(hdc, pPreviewData->lpWinTxt, -1, &rc, DT_LEFT); SelectObject(hdc, hOldFont);

1 0

[fireball] 48741: [FORMATTING] - Fix indentation.
by fireball＠svn.reactos.org 10 Sep '10

10 Sep '10

Author: fireball Date: Fri Sep 10 21:51:32 2010 New Revision: 48741 URL: http://svn.reactos.org/svn/reactos?rev=48741&view=rev Log: [FORMATTING] - Fix indentation. Modified: trunk/reactos/hal/halx86/hal_mini.rbuild Modified: trunk/reactos/hal/halx86/hal_mini.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_mini.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/hal_mini.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_mini.rbuild [iso-8859-1] Fri Sep 10 21:51:32 2010 @@ -9,16 +9,16 @@ <define name="_BLDR_" /> <define name="_MINIHAL_" /> <directory name="generic"> - <directory name="legacy"> - <directory name="bus"> - <file>bushndlr.c</file> - <file>cmosbus.c</file> - <file>isabus.c</file> - <file>pcibus.c</file> - <file>pcidata.c</file> - <file>sysbus.c</file> - </directory> - <file>bussupp.c</file> + <directory name="legacy"> + <directory name="bus"> + <file>bushndlr.c</file> + <file>cmosbus.c</file> + <file>isabus.c</file> + <file>pcibus.c</file> + <file>pcidata.c</file> + <file>sysbus.c</file> + </directory> + <file>bussupp.c</file> </directory> <file>beep.c</file> <file>bios.c</file>

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2010