Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[sir_richard] 48116: Joint patch By sir_richard: [PCIX]: - Implement PciIsSlotPresentInParentMethod for ACPI query, and PcoDecodeEnable utility function. - Implement PciConfigureIdeController based on WDHC Whitepaper "How Windows Switches a Controller to Native Mode". Check for PciEanbleNativeModeATA in registry, InitSafeBootMode, and call the ACPI driver to evaluate if NATA is present on the slot. Only configure the controller if both channels support native mode, as this is a Windows restricti
by sir_richard＠svn.reactos.org 19 Jul '10

19 Jul '10

Author: sir_richard Date: Mon Jul 19 15:15:39 2010 New Revision: 48116 URL: http://svn.reactos.org/svn/reactos?rev=48116&view=rev Log: Joint patch By sir_richard: [PCIX]: - Implement PciIsSlotPresentInParentMethod for ACPI query, and PcoDecodeEnable utility function. - Implement PciConfigureIdeController based on WDHC Whitepaper "How Windows Switches a Controller to Native Mode". Check for PciEanbleNativeModeATA in registry, InitSafeBootMode, and call the ACPI driver to evaluate if NATA is present on the slot. Only configure the controller if both channels support native mode, as this is a Windows restriction. - Implement PciApplyHacks for enumeration and resource update cases. In the first case, we handle legacy DEC Alpha Intel i82375 and i82378 PCI-to-(E)ISA bridges with invalid class codes. In the second, we configure IDE controllers for Native mode, except the OPTi Viper-M, which is known to cause issues. We also support cards with legacy VGA decodes by telling the arbiter to enable full access to the rangesm and finally we completely disable the decodes on Compaq PCI Hotplug Controllers (Revision 17) on PAE systems, as they have bugs handling 64-bit addresses. Finally, on resource updates, we apply a vendor-specific errata to the IBM 20H2999 PCI Docking Bridge (Hotplug) used on Thinkpad 600 Series laptops, and we attempt to avoid issues that can happen on certain devices that are plugged into an ICH1/2/3/4 Intel Hub when it has been configured to do subtractive decode. Full information on these workarounds can be seen in the comments. Finally, we also enable CardBUS devices for ACPI-compliant mode, by crossing out the LegacyBaseAddress in the CardBUS Type 2 PCI Configuration Header. - Miscelleaneous code cleanups. By eVb: More PciScanBus support, for debug PCI caps that driver use are dump, and detect nonBIOS configure device (spec is said that CacheLineSize != 0, LatencyTimer != 0 (on PCI-X, != 64)), if found NeedsHotPlugConfiguration to be set By eVb: Support PCI_HACK_VIDEO_LEGACY_DECODE (call ario_ApplyBrokenVideoHack, but no arb support to do work) Modified: trunk/reactos/drivers/bus/pcix/arb/ar_memio.c trunk/reactos/drivers/bus/pcix/enum.c trunk/reactos/drivers/bus/pcix/pci.h trunk/reactos/drivers/bus/pcix/utils.c Modified: trunk/reactos/drivers/bus/pcix/arb/ar_memio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/arb/ar_me… ============================================================================== --- trunk/reactos/drivers/bus/pcix/arb/ar_memio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/arb/ar_memio.c [iso-8859-1] Mon Jul 19 15:15:39 2010 @@ -91,6 +91,46 @@ return Status; } +VOID +NTAPI +ario_ApplyBrokenVideoHack(IN PPCI_FDO_EXTENSION FdoExtension) +{ + PPCI_ARBITER_INSTANCE PciArbiter; + //PARBITER_INSTANCE CommonInstance; + NTSTATUS Status; + + /* Only valid for root FDOs who are being applied the hack for the first time */ + ASSERT(!FdoExtension->BrokenVideoHackApplied); + ASSERT(PCI_IS_ROOT_FDO(FdoExtension)); + + /* Find the I/O arbiter */ + PciArbiter = (PVOID)PciFindNextSecondaryExtension(FdoExtension-> + SecondaryExtension.Next, + PciArb_Io); + ASSERT(PciArbiter); +#if 0 // when arb exist + /* Get the Arb instance */ + CommonInstance = &PciArbiter->CommonInstance; + + /* Free the two lists, enabling full VGA access */ + ArbFreeOrderingList(&CommonInstance->OrderingList); + ArbFreeOrderingList(&CommonInstance->ReservedList); + + /* Build the ordering for broken video PCI access */ + Status = ArbBuildAssignmentOrdering(CommonInstance, + L"Pci", + L"BrokenVideo", + NULL); + ASSERT(NT_SUCCESS(Status)); +#else + Status = STATUS_SUCCESS; + UNIMPLEMENTED; + while (TRUE); +#endif + /* Now the hack has been applied */ + FdoExtension->BrokenVideoHackApplied = TRUE; +} + NTSTATUS NTAPI armem_Initializer(IN PVOID Instance) 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] Mon Jul 19 15:15:39 2010 @@ -15,6 +15,429 @@ /* GLOBALS ********************************************************************/ /* FUNCTIONS ******************************************************************/ + +/* + * 7. The IO/MEM/Busmaster decodes are disabled for the device. + * 8. The PCI bus driver sets the operating mode bits of the Programming + * Interface byte to switch the controller to native mode. + * + * Important: When the controller is set to native mode, it must quiet itself + * and must not decode I/O resources or generate interrupts until the operating + * system has enabled the ports in the PCI configuration header. + * The IO/MEM/BusMaster bits will be disabled before the mode change, but it + * is not possible to disable interrupts on the device. The device must not + * generate interrupts (either legacy or native mode) while the decodes are + * disabled in the command register. + * + * This operation is expected to be instantaneous and the operating system does + * not stall afterward. It is also expected that the interrupt pin register in + * the PCI Configuration space for this device is accurate. The operating system + * re-reads this data after previously ignoring it. + */ +BOOLEAN +NTAPI +PciConfigureIdeController(IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData, + IN BOOLEAN Initial) +{ + UCHAR MasterMode, SlaveMode, MasterFixed, SlaveFixed, ProgIf, NewProgIf; + BOOLEAN Switched; + USHORT Command; + + /* Assume it won't work */ + Switched = FALSE; + + /* Get master and slave current settings, and programmability flag */ + ProgIf = PciData->ProgIf; + MasterMode = (ProgIf & 1) == 1; + MasterFixed = (ProgIf & 2) == 0; + SlaveMode = (ProgIf & 4) == 4; + SlaveFixed = (ProgIf & 8) == 0; + + /* + * [..] In order for Windows XP SP1 and Windows Server 2003 to switch an ATA + * ATA controller from compatible mode to native mode, the following must be + * true: + * + * - The controller must indicate in its programming interface that both channels + * can be switched to native mode. Windows XP SP1 and Windows Server 2003 do + * not support switching only one IDE channel to native mode. See the PCI IDE + * Controller Specification Revision 1.0 for details. + */ + if ((MasterMode != SlaveMode) || (MasterFixed != SlaveFixed)) + { + /* Windows does not support this configuration, fail */ + DPRINT1("PCI: Warning unsupported IDE controller configuration for VEN_%04x&DEV_%04x!", + PdoExtension->VendorId, + PdoExtension->DeviceId); + return Switched; + } + + /* Check if the controller is already in native mode */ + if ((MasterMode) && (SlaveMode)) + { + /* Check if I/O decodes should be disabled */ + if ((Initial) || (PdoExtension->IoSpaceUnderNativeIdeControl)) + { + /* Read the current command */ + PciReadDeviceConfig(PdoExtension, + &Command, + FIELD_OFFSET(PCI_COMMON_HEADER, Command), + sizeof(USHORT)); + + /* Disable I/O space decode */ + Command &= ~PCI_ENABLE_IO_SPACE; + + /* Update new command in PCI IDE controller */ + PciWriteDeviceConfig(PdoExtension, + &Command, + FIELD_OFFSET(PCI_COMMON_HEADER, Command), + sizeof(USHORT)); + + /* Save updated command value */ + PciData->Command = Command; + } + + /* The controller is now in native mode */ + Switched = TRUE; + } + else if (!(MasterFixed) && + !(SlaveFixed) && + (PdoExtension->BIOSAllowsIDESwitchToNativeMode) && + !(PdoExtension->HackFlags & PCI_HACK_DISABLE_IDE_NATIVE_MODE)) + { + /* Turn off decodes */ + PciDecodeEnable(PdoExtension, FALSE, NULL); + + /* Update the current command */ + PciReadDeviceConfig(PdoExtension, + &PciData->Command, + FIELD_OFFSET(PCI_COMMON_HEADER, Command), + sizeof(USHORT)); + + /* Enable native mode */ + ProgIf = PciData->ProgIf | 5; + PciWriteDeviceConfig(PdoExtension, + &ProgIf, + FIELD_OFFSET(PCI_COMMON_HEADER, ProgIf), + sizeof(UCHAR)); + + /* Verify the setting "stuck" */ + PciReadDeviceConfig(PdoExtension, + &NewProgIf, + FIELD_OFFSET(PCI_COMMON_HEADER, ProgIf), + sizeof(UCHAR)); + if (NewProgIf == ProgIf) + { + /* Update the header and PDO data with the new programming mode */ + PciData->ProgIf = ProgIf; + PdoExtension->ProgIf = NewProgIf; + + /* Clear the first four BARs to reset current BAR setttings */ + PciData->u.type0.BaseAddresses[0] = 0; + PciData->u.type0.BaseAddresses[1] = 0; + PciData->u.type0.BaseAddresses[2] = 0; + PciData->u.type0.BaseAddresses[3] = 0; + PciWriteDeviceConfig(PdoExtension, + PciData->u.type0.BaseAddresses, + FIELD_OFFSET(PCI_COMMON_HEADER, + u.type0.BaseAddresses), + 4 * sizeof(ULONG)); + + /* Re-read the BARs to have the latest data for native mode IDE */ + PciReadDeviceConfig(PdoExtension, + PciData->u.type0.BaseAddresses, + FIELD_OFFSET(PCI_COMMON_HEADER, + u.type0.BaseAddresses), + 4 * sizeof(ULONG)); + + /* Re-read the interrupt pin used for native mode IDE */ + PciReadDeviceConfig(PdoExtension, + &PciData->u.type0.InterruptPin, + FIELD_OFFSET(PCI_COMMON_HEADER, + u.type0.InterruptPin), + sizeof(UCHAR)); + + /* The IDE Controller is now in native mode */ + Switched = TRUE; + } + else + { + /* Settings did not work, fail */ + DPRINT1("PCI: Warning failed switch to native mode for IDE controller VEN_%04x&DEV_%04x!", + PciData->VendorID, + PciData->DeviceID); + } + } + + /* Return whether or not native mode was enabled on the IDE controller */ + return Switched; +} + +VOID +NTAPI +PciApplyHacks(IN PPCI_FDO_EXTENSION DeviceExtension, + IN PPCI_COMMON_HEADER PciData, + IN PCI_SLOT_NUMBER SlotNumber, + IN ULONG OperationType, + PPCI_PDO_EXTENSION PdoExtension) +{ + ULONG LegacyBaseAddress; + USHORT Command; + UCHAR RegValue; + + /* There should always be a PDO extension passed in */ + ASSERT(PdoExtension); + + /* Check what kind of hack operation this is */ + switch (OperationType) + { + /* + * This is mostly concerned with fixing up incorrect class data that can + * exist on certain PCI hardware before the 2.0 spec was ratified. + */ + case PCI_HACK_FIXUP_BEFORE_CONFIGURATION: + + /* Note that the i82375 PCI/EISA and the i82378 PCI/ISA bridges that + * are present on certain DEC/NT Alpha machines are pre-PCI 2.0 devices + * and appear as non-classified, so their correct class/subclass data + * is written here instead. + */ + if ((PciData->VendorID == 0x8086) && + ((PciData->DeviceID == 0x482) || (PciData->DeviceID == 0x484))) + { + /* Note that 0x482 is the i82375 (EISA), 0x484 is the i82378 (ISA) */ + PciData->SubClass = PciData->DeviceID == 0x482 ? + PCI_SUBCLASS_BR_EISA : PCI_SUBCLASS_BR_ISA; + PciData->BaseClass = PCI_CLASS_BRIDGE_DEV; + + /* + * Because the software is modifying the actual header data from + * the BIOS, this flag tells the driver to ignore failures when + * comparing the original BIOS data with the PCI data. + */ + if (PdoExtension) PdoExtension->ExpectedWritebackFailure = TRUE; + } + + /* Note that in this case, an immediate return is issued */ + return; + + /* + * This is concerned with setting up interrupts correctly for native IDE + * mode, but will also handle broken VGA decoding on older bridges as + * well as a PAE-specific hack for certain Compaq Hot-Plug Controllers. + */ + case PCI_HACK_FIXUP_AFTER_CONFIGURATION: + + /* + * On the OPTi Viper-M IDE controller, Linux doesn't support IDE-DMA + * and FreeBSD bug reports indicate that the system crashes when the + * feature is enabled (so it's disabled on that OS as well). In the + * NT PCI Bus Driver, it seems Microsoft too, completely disables + * Native IDE functionality on this controller, so it would seem OPTi + * simply frelled up this controller. + */ + if ((PciData->VendorID == 0x1045) && (PciData->DeviceID != 0xC621)) + { + /* Disable native mode */ + PciData->ProgIf &= ~5; + PciData->u.type0.InterruptPin = 0; + + /* + * Because the software is modifying the actual header data from + * the BIOS, this flag tells the driver to ignore failures when + * comparing the original BIOS data with the PCI data. + */ + PdoExtension->ExpectedWritebackFailure = TRUE; + } + else if ((PciData->BaseClass == PCI_CLASS_MASS_STORAGE_CTLR) && + (PciData->SubClass == PCI_SUBCLASS_MSC_IDE_CTLR)) + { + /* For other IDE controllers, start out in compatible mode */ + PdoExtension->BIOSAllowsIDESwitchToNativeMode = FALSE; + + /* + * Registry must have enabled native mode (typically as a result + * of an INF file directive part of the IDE controller's driver) + * and the system must not be booted in Safe Mode. If that checks + * out, then evaluate the ACPI NATA method to see if the platform + * supports this. See the section "BIOS and Platform Prerequisites + * for Switching a Native-Mode-Capable Controller" in the Storage + * section of the Windows Driver Kit for more details: + * + * 5. For each ATA controller enumerated, the PCI bus driver checks + * the Programming Interface register of the IDE controller to + * see if it supports switching both channels to native mode. + * 6. The PCI bus driver checks whether the BIOS/platform supports + * switching the controller by checking the NATA method described + * earlier in this article. + * + * If an ATA controller does not indicate that it is native + * mode-capable, or if the BIOS NATA control method is missing + * or does not list that device, the PCI bus driver does not + * switch the controller and it is assigned legacy resources. + * + * If both the controller and the BIOS indicate that the controller + * can be switched, the process of switching the controller begins + * with the next step. + */ + if ((PciEnableNativeModeATA) && + !(InitSafeBootMode) && + (PciIsSlotPresentInParentMethod(PdoExtension, 'ATAN'))) + { + /* The platform supports it, remember that */ + PdoExtension->BIOSAllowsIDESwitchToNativeMode = TRUE; + + /* + * Now switch the controller into native mode if both channels + * support native IDE mode. See "How Windows Switches an ATA + * Controller to Native Mode" in the Storage section of the + * Windows Driver Kit for more details. + */ + PdoExtension->SwitchedIDEToNativeMode = + PciConfigureIdeController(PdoExtension, PciData, 1); + } + + /* Is native mode enabled after all? */ + if ((PciData->ProgIf & 5) != 5) + { + /* Compatible mode, so force ISA-style IRQ14 and IRQ 15 */ + PciData->u.type0.InterruptPin = 0; + } + } + + /* Is this a PCI device with legacy VGA card decodes on the root bus? */ + if ((PdoExtension->HackFlags & PCI_HACK_VIDEO_LEGACY_DECODE) && + (PCI_IS_ROOT_FDO(DeviceExtension)) && + !(DeviceExtension->BrokenVideoHackApplied)) + { + /* Tell the arbiter to apply a hack for these older devices */ + ario_ApplyBrokenVideoHack(DeviceExtension); + } + + /* Is this a Compaq PCI Hotplug Controller (r17) on a PAE system ? */ + if ((PciData->VendorID == 0xE11) && + (PciData->DeviceID == 0xA0F7) && + (PciData->RevisionID == 17) && + (ExIsProcessorFeaturePresent(PF_PAE_ENABLED))) + { + /* Turn off the decodes immediately */ + PciData->Command &= ~(PCI_ENABLE_IO_SPACE | + PCI_ENABLE_MEMORY_SPACE | + PCI_ENABLE_BUS_MASTER); + PciWriteDeviceConfig(PdoExtension, + &PciData->Command, + FIELD_OFFSET(PCI_COMMON_HEADER, Command), + sizeof(USHORT)); + + /* Do not EVER turn them on again, this will blow up the system */ + PdoExtension->CommandEnables &= ~(PCI_ENABLE_IO_SPACE | + PCI_ENABLE_MEMORY_SPACE | + PCI_ENABLE_BUS_MASTER); + PdoExtension->HackFlags |= PCI_HACK_PRESERVE_COMMAND; + } + break; + + /* + * This is called whenever resources are changed and hardware needs to be + * updated. It is concerned with two highly specific erratas on an IBM + * hot-plug docking bridge used on the Thinkpad 600 Series and on Intel's + * ICH PCI Bridges. + */ + case PCI_HACK_FIXUP_BEFORE_UPDATE: + + /* Is this an IBM 20H2999 PCI Docking Bridge, used on Thinkpads? */ + if ((PdoExtension->VendorId == 0x1014) && + (PdoExtension->DeviceId == 0x95)) + { + /* Read the current command */ + PciReadDeviceConfig(PdoExtension, + &Command, + FIELD_OFFSET(PCI_COMMON_HEADER, Command), + sizeof(USHORT)); + + /* Turn off the decodes */ + PciDecodeEnable(PdoExtension, FALSE, &Command); + + /* Apply the required IBM workaround */ + PciReadDeviceConfig(PdoExtension, &RegValue, 0xE0, sizeof(UCHAR)); + RegValue &= ~2; + RegValue |= 1; + PciWriteDeviceConfig(PdoExtension, &RegValue, 0xE0, sizeof(UCHAR)); + + /* Restore the command to its original value */ + PciWriteDeviceConfig(PdoExtension, + &Command, + FIELD_OFFSET(PCI_COMMON_HEADER, Command), + sizeof(USHORT)); + + } + + /* + * Check for Intel ICH PCI-to-PCI (i82801) bridges (used on the i810, + * i820, i840, i845 Chipsets) that have subtractive decode enabled, + * and whose hack flags do not specifiy that this support is broken. + */ + if ((PdoExtension->HeaderType == PCI_BRIDGE_TYPE) && + (PdoExtension->Dependent.type1.SubtractiveDecode) && + ((PdoExtension->VendorId == 0x8086) && + ((PdoExtension->DeviceId == 0x2418) || + (PdoExtension->DeviceId == 0x2428) || + (PdoExtension->DeviceId == 0x244E) || + (PdoExtension->DeviceId == 0x2448))) && + !(PdoExtension->HackFlags & PCI_HACK_BROKEN_SUBTRACTIVE_DECODE)) + { + /* + * The positive decode window shouldn't be used, these values are + * normally all read-only or initialized to 0 by the BIOS, but + * it appears Intel doesn't do this, so the PCI Bus Driver will + * do it in software instead. Note that this is used to prevent + * certain non-compliant PCI devices from breaking down due to the + * fact that these ICH bridges have a known "quirk" (which Intel + * documents as a known "erratum", although it's not not really + * an ICH bug since the PCI specification does allow for it) in + * that they will sometimes send non-zero addresses during special + * cycles (ie: non-zero data during the address phase). These + * broken PCI cards will mistakenly attempt to claim the special + * cycle and corrupt their I/O and RAM ranges. Again, in Intel's + * defense, the PCI specification only requires stable data, not + * necessarily zero data, during the address phase. + */ + PciData->u.type1.MemoryBase = 0xFFFF; + PciData->u.type1.PrefetchBase = 0xFFFF; + PciData->u.type1.IOBase = 0xFF; + PciData->u.type1.IOLimit = 0; + PciData->u.type1.MemoryLimit = 0; + PciData->u.type1.PrefetchLimit = 0; + PciData->u.type1.PrefetchBaseUpper32 = 0; + PciData->u.type1.PrefetchLimitUpper32 = 0; + PciData->u.type1.IOBaseUpper16 = 0; + PciData->u.type1.IOLimitUpper16 = 0; + } + break; + + default: + return; + } + + /* Finally, also check if this is this a CardBUS device? */ + if (PCI_CONFIGURATION_TYPE(PciData) == PCI_CARDBUS_BRIDGE_TYPE) + { + /* + * At offset 44h the LegacyBaseAddress is stored, which is cleared by + * ACPI-aware versions of Windows, to disable legacy-mode I/O access to + * CardBus controllers. For more information, see "Supporting CardBus + * Controllers under ACPI" in the "CardBus Controllers and Windows" + * Whitepaper on WHDC. + */ + LegacyBaseAddress = 0; + PciWriteDeviceConfig(PdoExtension, + &LegacyBaseAddress, + sizeof(PCI_COMMON_HEADER) + sizeof(ULONG), + sizeof(ULONG)); + } +} + BOOLEAN NTAPI @@ -250,7 +673,8 @@ { ULONG MaxDevice = PCI_MAX_DEVICES; BOOLEAN ProcessFlag = FALSE; - ULONG i, j, k; + ULONG i, j, k, Size; + USHORT CapOffset, TempOffset; LONGLONG HackFlags; PDEVICE_OBJECT DeviceObject; UCHAR Buffer[PCI_COMMON_HDR_LENGTH]; @@ -258,11 +682,13 @@ PPCI_COMMON_HEADER PciData = (PVOID)Buffer; PPCI_COMMON_HEADER BiosData = (PVOID)BiosBuffer; PCI_SLOT_NUMBER PciSlot; + PCHAR Name; NTSTATUS Status; PPCI_PDO_EXTENSION PdoExtension, NewExtension; PPCI_PDO_EXTENSION* BridgeExtension; PWCHAR DescriptionText; USHORT SubVendorId, SubSystemId; + PCI_CAPABILITIES_HEADER CapHeader, PcixCapHeader; DPRINT1("PCI Scan Bus: FDO Extension @ 0x%x, Base Bus = 0x%x\n", DeviceExtension, DeviceExtension->BaseBus); @@ -302,6 +728,13 @@ &PciData->DeviceID, sizeof(USHORT), PCI_COMMON_HDR_LENGTH - sizeof(USHORT)); + + /* Apply any hacks before even analyzing the configuration header */ + PciApplyHacks(DeviceExtension, + PciData, + PciSlot, + PCI_HACK_FIXUP_BEFORE_CONFIGURATION, + NULL); /* Dump device that was found */ DPRINT1("Scan Found Device 0x%x (b=0x%x, d=0x%x, f=0x%x)\n", @@ -373,8 +806,15 @@ HackFlags |= PCI_HACK_CRITICAL_DEVICE; } - /* Also skip devices that should not be enumerated */ - if (PciSkipThisFunction(PciData, PciSlot, 1, HackFlags)) continue; + /* Check if the device should be skipped for whatever reason */ + if (PciSkipThisFunction(PciData, + PciSlot, + PCI_SKIP_DEVICE_ENUMERATION, + HackFlags)) + { + /* Skip this device */ + continue; + } /* Check if a PDO has already been created for this device */ PdoExtension = PciFindPdoByFunction(DeviceExtension, @@ -500,6 +940,13 @@ /* Power up the device */ PciSetPowerManagedDevicePowerState(NewExtension, PowerDeviceD0, FALSE); + /* Apply any device hacks required for enumeration */ + PciApplyHacks(DeviceExtension, + PciData, + PciSlot, + PCI_HACK_FIXUP_AFTER_CONFIGURATION, + NewExtension); + /* Save interrupt pin */ NewExtension->InterruptPin = PciData->u.type0.InterruptPin; @@ -520,6 +967,81 @@ /* Set the subsystem information to zero instead */ NewExtension->SubsystemVendorId = 0; NewExtension->SubsystemId = 0; + } + + /* Scan all capabilities */ + CapOffset = NewExtension->CapabilitiesPtr; + while (CapOffset) + { + /* Read this header */ + TempOffset = PciReadDeviceCapability(NewExtension, + CapOffset, + 0, + &CapHeader, + sizeof(PCI_CAPABILITIES_HEADER)); + if (TempOffset != CapOffset) + { + /* This is a strange issue that shouldn't happen normally */ + DPRINT1("PCI - Failed to read PCI capability at offset 0x%02x\n", + CapOffset); + ASSERT(TempOffset == CapOffset); + } + + /* Check for capabilities that this driver cares about */ + switch (CapHeader.CapabilityID) + { + /* Power management capability is heavily used by the bus */ + case PCI_CAPABILITY_ID_POWER_MANAGEMENT: + + /* Dump the capability */ + Name = "POWER"; + Size = sizeof(PCI_PM_CAPABILITY); + break; + + /* AGP capability is required for AGP bus functionality */ + case PCI_CAPABILITY_ID_AGP: + + /* Dump the capability */ + Name = "AGP"; + Size = sizeof(PCI_AGP_CAPABILITY); + break; + + /* This driver doesn't really use anything other than that */ + default: + + /* Windows prints this, we could do a translation later */ + Name = "UNKNOWN CAPABILITY"; + Size = 0; + break; + } + + /* Check if this is a capability that should be dumped */ + if (Size) + { + /* Read the whole capability data */ + TempOffset = PciReadDeviceCapability(NewExtension, + CapOffset, + CapHeader.CapabilityID, + &CapHeader, + Size); + + if (TempOffset != CapOffset) + { + /* Again, a strange issue that shouldn't be seen */ + DPRINT1("- Failed to read capability data. ***\n"); + ASSERT(TempOffset == CapOffset); + } + } + + /* Dump this capability */ + DPRINT1("CAP @%02x ID %02x (%s)\n", + CapOffset, CapHeader.CapabilityID, Name); + for (i = 0; i < Size; i += 2) + DPRINT1(" %04x\n", *(PUSHORT)((ULONG_PTR)&CapHeader + i)); + DPRINT1("\n"); + + /* Check the next capability */ + CapOffset = CapHeader.Next; } /* Check for IDE controllers */ @@ -544,6 +1066,39 @@ { /* Do not allow these legacy bridges to be powered down */ NewExtension->DisablePowerDown = TRUE; + } + + /* Check if the BIOS did not configure a cache line size */ + if (!PciData->CacheLineSize) + { + /* Check if the device is disabled */ + if (!(NewExtension->CommandEnables & (PCI_ENABLE_IO_SPACE | + PCI_ENABLE_MEMORY_SPACE | + PCI_ENABLE_BUS_MASTER))) + { + /* Check if this is a PCI-X device*/ + TempOffset = PciReadDeviceCapability(NewExtension, + NewExtension->CapabilitiesPtr, + PCI_CAPABILITY_ID_PCIX, + &PcixCapHeader, + sizeof(PCI_CAPABILITIES_HEADER)); + + /* + * A device with default cache line size and latency timer + * settings is considered to be unconfigured. Note that on + * PCI-X, the reset value of the latency timer field in the + * header is 64, not 0, hence why the check for PCI-X caps + * was required, and the value used here below. + */ + if (!(PciData->LatencyTimer) || + ((TempOffset) && (PciData->LatencyTimer == 64))) + { + /* Keep track of the fact that it needs configuration */ + DPRINT1("PCI - ScanBus, PDOx %x found unconfigured\n", + NewExtension); + NewExtension->NeedsHotPlugConfiguration = TRUE; + } + } } /* Save latency and cache size information */ 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] Mon Jul 19 15:15:39 2010 @@ -63,6 +63,13 @@ #define PCI_SKIP_RESOURCE_ENUMERATION 0x02 // +// PCI Apply Hack Flags +// +#define PCI_HACK_FIXUP_BEFORE_CONFIGURATION 0x00 +#define PCI_HACK_FIXUP_AFTER_CONFIGURATION 0x01 +#define PCI_HACK_FIXUP_BEFORE_UPDATE 0x03 + +// // PCI Debugging Device Support // #define MAX_DEBUGGING_DEVICES_SUPPORTED 0x04 @@ -71,7 +78,7 @@ // PCI Driver Verifier Failures // #define PCI_VERIFIER_CODES 0x04 - + // // Device Extension, Interface, Translator and Arbiter Signatures // @@ -974,6 +981,21 @@ IN BOOLEAN ForPowerDown ); +BOOLEAN +NTAPI +PciIsSlotPresentInParentMethod( + IN PPCI_PDO_EXTENSION PdoExtension, + IN ULONG Method +); + +VOID +NTAPI +PciDecodeEnable( + IN PPCI_PDO_EXTENSION PdoExtension, + IN BOOLEAN Enable, + OUT PUSHORT Command +); + // // Configuration Routines // @@ -1232,6 +1254,12 @@ IN USHORT Version, IN USHORT Size, IN PINTERFACE Interface +); + +VOID +NTAPI +ario_ApplyBrokenVideoHack( + IN PPCI_FDO_EXTENSION FdoExtension ); NTSTATUS @@ -1342,5 +1370,9 @@ extern PDRIVER_OBJECT PciDriverObject; extern PWATCHDOG_TABLE WdTable; extern PPCI_HACK_ENTRY PciHackTable; +extern BOOLEAN PciEnableNativeModeATA; + +/* Exported by NTOS, should this go in the NDK? */ +extern NTSYSAPI BOOLEAN InitSafeBootMode; /* EOF */ 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] Mon Jul 19 15:15:39 2010 @@ -1041,4 +1041,117 @@ return !(HackFlags & PCI_HACK_NO_PM_CAPS); } +BOOLEAN +NTAPI +PciIsSlotPresentInParentMethod(IN PPCI_PDO_EXTENSION PdoExtension, + IN ULONG Method) +{ + BOOLEAN FoundSlot; + PACPI_METHOD_ARGUMENT Argument; + ACPI_EVAL_INPUT_BUFFER InputBuffer; + PACPI_EVAL_OUTPUT_BUFFER OutputBuffer; + ULONG i, Length; + NTSTATUS Status; + PAGED_CODE(); + + /* Assume slot is not part of the parent method */ + FoundSlot = FALSE; + + /* Allocate a 2KB buffer for the method return parameters */ + Length = sizeof(ACPI_EVAL_OUTPUT_BUFFER) + 2048; + OutputBuffer = ExAllocatePoolWithTag(PagedPool, Length, 'BicP'); + if (OutputBuffer) + { + /* Clear out the output buffer */ + RtlZeroMemory(OutputBuffer, Length); + + /* Initialize the input buffer with the method requested */ + InputBuffer.Signature = 0; + *(PULONG)InputBuffer.MethodName = Method; + InputBuffer.Signature = ACPI_EVAL_INPUT_BUFFER_SIGNATURE; + + /* Send it to the ACPI driver */ + Status = PciSendIoctl(PdoExtension->ParentFdoExtension->PhysicalDeviceObject, + IOCTL_ACPI_EVAL_METHOD, + &InputBuffer, + sizeof(ACPI_EVAL_INPUT_BUFFER), + OutputBuffer, + Length); + if (NT_SUCCESS(Status)) + { + /* Scan all output arguments */ + for (i = 0; i < OutputBuffer->Count; i++) + { + /* Make sure it's an integer */ + Argument = &OutputBuffer->Argument[i]; + if (Argument->Type != ACPI_METHOD_ARGUMENT_INTEGER) continue; + + /* Check if the argument matches this PCI slot structure */ + if (Argument->Argument == ((PdoExtension->Slot.u.bits.DeviceNumber) | + ((PdoExtension->Slot.u.bits.FunctionNumber) << 16))) + { + /* This slot has been found, return it */ + FoundSlot = TRUE; + break; + } + } + } + + /* Finished with the buffer, free it */ + ExFreePoolWithTag(OutputBuffer, 0); + } + + /* Return if the slot was found */ + return FoundSlot; +} + +VOID +NTAPI +PciDecodeEnable(IN PPCI_PDO_EXTENSION PdoExtension, + IN BOOLEAN Enable, + OUT PUSHORT Command) +{ + USHORT CommandValue; + + /* + * If decodes are being disabled, make sure it's allowed, and in both cases, + * make sure that a hackflag isn't preventing touching the decodes at all. + */ + if (((Enable) || (PciCanDisableDecodes(PdoExtension, 0, 0, 0))) && + !(PdoExtension->HackFlags & PCI_HACK_PRESERVE_COMMAND)) + { + /* Did the caller already have a command word? */ + if (Command) + { + /* Use the caller's */ + CommandValue = *Command; + } + else + { + /* Otherwise, read the current command */ + PciReadDeviceConfig(PdoExtension, + &Command, + FIELD_OFFSET(PCI_COMMON_HEADER, Command), + sizeof(USHORT)); + } + + /* Turn off decodes by default */ + CommandValue &= ~(PCI_ENABLE_IO_SPACE | + PCI_ENABLE_MEMORY_SPACE | + PCI_ENABLE_BUS_MASTER); + + /* If requested, enable the decodes that were enabled at init time */ + if (Enable) CommandValue |= PdoExtension->CommandEnables & + (PCI_ENABLE_IO_SPACE | + PCI_ENABLE_MEMORY_SPACE | + PCI_ENABLE_BUS_MASTER); + + /* Update the command word */ + PciWriteDeviceConfig(PdoExtension, + &CommandValue, + FIELD_OFFSET(PCI_COMMON_HEADER, Command), + sizeof(USHORT)); + } +} + /* EOF */

1 0

[sir_richard] 48115: [NDK]: Add a missing HAL function. [PCI]: Update hack flags.
by sir_richard＠svn.reactos.org 19 Jul '10

19 Jul '10

Author: sir_richard Date: Mon Jul 19 15:14:34 2010 New Revision: 48115 URL: http://svn.reactos.org/svn/reactos?rev=48115&view=rev Log: [NDK]: Add a missing HAL function. [PCI]: Update hack flags. Modified: trunk/reactos/include/ndk/halfuncs.h trunk/reactos/include/reactos/drivers/pci/pci.h Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/halfuncs.h [iso-8859-1] Mon Jul 19 15:14:34 2010 @@ -213,6 +213,16 @@ ); // +// Bus Functions +// +NTHALAPI +NTSTATUS +NTAPI +HalAdjustResourceList( + IN OUT PIO_RESOURCE_REQUIREMENTS_LIST *pResourceList +); + +// // Environment Functions // #ifdef _ARC_ Modified: trunk/reactos/include/reactos/drivers/pci/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/pc… ============================================================================== --- trunk/reactos/include/reactos/drivers/pci/pci.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/pci/pci.h [iso-8859-1] Mon Jul 19 15:14:34 2010 @@ -42,7 +42,7 @@ #define PCI_HACK_VIDEO_LEGACY_DECODE 0x0000000100000000LL #define PCI_HACK_FAKE_CLASS_CODE 0x0000000200000000LL #define PCI_HACK_UNUSED_40000000 0x0000000400000000LL -#define PCI_HACK_UNUSED_80000000 0x0000000800000000LL +#define PCI_HACK_DISABLE_IDE_NATIVE_MODE 0x0000000800000000LL #define PCI_HACK_FAIL_QUERY_REMOVE 0x0000001000000000LL #define PCI_HACK_CRITICAL_DEVICE 0x0000002000000000LL #define PCI_HACK_UNUSED_4000000000 0x0000004000000000LL @@ -50,7 +50,9 @@ #define PCI_HACK_NO_REVISION_AFTER_D3 0x0000010000000000LL #define PCI_HACK_ENABLE_MSI_MAPPING 0x0000020000000000LL #define PCI_HACK_DISABLE_PM_DOWNSTREAM_PCI_BRIDGE 0x0000040000000000LL - +#define PCI_HACK_DISABLE_HOT_PLUG 0x0000080000000000LL +#define PCI_HACK_IGNORE_AER_CAPABILITY 0x0000100000000000LL + // // Bit encodes for PCI_COMMON_CONFIG.u.type1.BridgeControl //

1 0

[akhaldi] 48114: [MINGW] - __attribute__ ((__unused__)) -> __UNUSED_PARAM, which is MSVC compatible.
by akhaldi＠svn.reactos.org 19 Jul '10

19 Jul '10

Author: akhaldi Date: Mon Jul 19 09:58:51 2010 New Revision: 48114 URL: http://svn.reactos.org/svn/reactos?rev=48114&view=rev Log: [MINGW] - __attribute__ ((__unused__)) -> __UNUSED_PARAM, which is MSVC compatible. Modified: trunk/reactos/lib/3rdparty/mingw/crt0_c.c trunk/reactos/lib/3rdparty/mingw/crt0_w.c trunk/reactos/lib/3rdparty/mingw/crtexe.c trunk/reactos/lib/3rdparty/mingw/dllentry.c trunk/reactos/lib/3rdparty/mingw/dllmain.c trunk/reactos/lib/3rdparty/mingw/tlsthrd.c Modified: trunk/reactos/lib/3rdparty/mingw/crt0_c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt0_c.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crt0_c.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crt0_c.c [iso-8859-1] Mon Jul 19 09:58:51 2010 @@ -11,9 +11,9 @@ extern DWORD __mingw_winmain_nShowCmd; /*ARGSUSED*/ -int main (int flags __attribute__ ((__unused__)), - char **cmdline __attribute__ ((__unused__)), - char **inst __attribute__ ((__unused__))) +int main (int __UNUSED_PARAM(flags), + char ** __UNUSED_PARAM(cmdline), + char ** __UNUSED_PARAM(inst)) { return (int) WinMain (__mingw_winmain_hInstance, NULL, __mingw_winmain_lpCmdLine, __mingw_winmain_nShowCmd); Modified: trunk/reactos/lib/3rdparty/mingw/crt0_w.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt0_w.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crt0_w.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crt0_w.c [iso-8859-1] Mon Jul 19 09:58:51 2010 @@ -16,9 +16,9 @@ int wmain (int, wchar_t **, wchar_t **); /*ARGSUSED*/ -int wmain (int flags __attribute__ ((__unused__)), - wchar_t **cmdline __attribute__ ((__unused__)), - wchar_t **inst __attribute__ ((__unused__))) +int wmain (int __UNUSED_PARAM(flags), + wchar_t ** __UNUSED_PARAM(cmdline), + wchar_t ** __UNUSED_PARAM(inst)) { return (int) wWinMain (__mingw_winmain_hInstance, NULL, __mingw_winmain_lpCmdLine, __mingw_winmain_nShowCmd); Modified: trunk/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtexe.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Mon Jul 19 09:58:51 2010 @@ -20,7 +20,6 @@ #include <tchar.h> #include <sect_attribs.h> #include <locale.h> -#include <intrin.h> #ifndef __winitenv extern wchar_t *** __MINGW_IMP_SYMBOL(__winitenv); @@ -52,11 +51,7 @@ #define _commode (* __MINGW_IMP_SYMBOL(_commode)) extern int _dowildcard; -#if defined(__GNUC__) int _MINGW_INSTALL_DEBUG_MATHERR __attribute__((weak)) = 0; -#else -int _MINGW_INSTALL_DEBUG_MATHERR = 0; -#endif extern int __defaultmatherr; extern _CRTIMP void __cdecl _initterm(_PVFV *, _PVFV *); @@ -251,7 +246,7 @@ #ifdef _MBCS if (_ismbblead (*lpszCommandLine)) { - if (*lpszCommandLine) + if (lpszCommandLine) /* FIXME: Why this check? Should I check for *lpszCommandLine != 0 too? */ lpszCommandLine++; } #endif @@ -463,12 +458,17 @@ } #endif +#ifdef __MINGW_SHOW_INVALID_PARAMETER_EXCEPTION +#define __UNUSED_PARAM_1(x) x +#else +#define __UNUSED_PARAM_1 __UNUSED_PARAM +#endif static void -__mingw_invalidParameterHandler (const wchar_t *expression __attribute__ ((__unused__)), - const wchar_t *function __attribute__ ((__unused__)), - const wchar_t *file __attribute__ ((__unused__)), - unsigned int line __attribute__ ((__unused__)), - uintptr_t pReserved __attribute__ ((__unused__))) +__mingw_invalidParameterHandler (const wchar_t * __UNUSED_PARAM_1(expression), + const wchar_t * __UNUSED_PARAM_1(function), + const wchar_t * __UNUSED_PARAM_1(file), + unsigned int __UNUSED_PARAM_1(line), + uintptr_t __UNUSED_PARAM(pReserved)) { #ifdef __MINGW_SHOW_INVALID_PARAMETER_EXCEPTION wprintf(L"Invalid parameter detected in function %s. File: %s Line: %d\n", function, file, line); Modified: trunk/reactos/lib/3rdparty/mingw/dllentry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/dllentr… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/dllentry.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/dllentry.c [iso-8859-1] Mon Jul 19 09:58:51 2010 @@ -10,9 +10,9 @@ BOOL WINAPI DllEntryPoint (HANDLE, DWORD, LPVOID); -BOOL WINAPI DllEntryPoint (HANDLE hDllHandle __attribute__ ((__unused__)), - DWORD dwReason __attribute__ ((__unused__)), - LPVOID lpreserved __attribute__ ((__unused__))) +BOOL WINAPI DllEntryPoint (HANDLE __UNUSED_PARAM(hDllHandle), + DWORD __UNUSED_PARAM(dwReason), + LPVOID __UNUSED_PARAM(lpreserved)) { return TRUE; } Modified: trunk/reactos/lib/3rdparty/mingw/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/dllmain… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/dllmain.c [iso-8859-1] Mon Jul 19 09:58:51 2010 @@ -2,9 +2,9 @@ #define _DECL_DLLMAIN #include <process.h> -BOOL WINAPI DllMain (HANDLE hDllHandle __attribute__ ((__unused__)), - DWORD dwReason __attribute__ ((__unused__)), - LPVOID lpreserved __attribute__ ((__unused__))) +BOOL WINAPI DllMain (HANDLE __UNUSED_PARAM(hDllHandle), + DWORD __UNUSED_PARAM(dwReason), + LPVOID __UNUSED_PARAM(lpreserved)) { return TRUE; } Modified: trunk/reactos/lib/3rdparty/mingw/tlsthrd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/tlsthrd… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/tlsthrd.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/tlsthrd.c [iso-8859-1] Mon Jul 19 09:58:51 2010 @@ -118,9 +118,9 @@ } WINBOOL -__mingw_TLScallback (HANDLE hDllHandle __attribute__ ((__unused__)), +__mingw_TLScallback (HANDLE __UNUSED_PARAM(hDllHandle), DWORD reason, - LPVOID reserved __attribute__ ((__unused__))) + LPVOID __UNUSED_PARAM(reserved)) { switch (reason) {

1 0

[akhaldi] 48113: - Leftover from the r45430 merge.
by akhaldi＠svn.reactos.org 19 Jul '10

19 Jul '10

Author: akhaldi Date: Mon Jul 19 01:17:23 2010 New Revision: 48113 URL: http://svn.reactos.org/svn/reactos?rev=48113&view=rev Log: - Leftover from the r45430 merge. Modified: trunk/reactos/ (props changed) Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 19 01:17:23 2010 @@ -1,4 +1,4 @@ /branches/header-work:45691-47721 /branches/reactos-yarotows:46372,46848,46966,47800,48026,48064 /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,36393,36397,36445,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37322-37323,37333-37334,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,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-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-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 +/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,36393,36397,36445,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37322-37323,37333-37334,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,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-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-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882

1 0

[akhaldi] 48112: [PSDK] - Fix IOCTL_STORAGE_* redefinitions.
by akhaldi＠svn.reactos.org 19 Jul '10

19 Jul '10

Author: akhaldi Date: Mon Jul 19 01:06:32 2010 New Revision: 48112 URL: http://svn.reactos.org/svn/reactos?rev=48112&view=rev Log: [PSDK] - Fix IOCTL_STORAGE_* redefinitions. Modified: trunk/reactos/include/psdk/ntddstor.h trunk/reactos/include/psdk/winioctl.h Modified: trunk/reactos/include/psdk/ntddstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddstor.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddstor.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddstor.h [iso-8859-1] Mon Jul 19 01:06:32 2010 @@ -80,6 +80,8 @@ #endif /* defined(DEFINE_GUID) */ +#ifndef _WINIOCTL_H + #define IOCTL_STORAGE_BASE FILE_DEVICE_MASS_STORAGE #define IOCTL_STORAGE_CHECK_VERIFY \ @@ -88,75 +90,83 @@ #define IOCTL_STORAGE_CHECK_VERIFY2 \ CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_MEDIA_REMOVAL \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) + #define IOCTL_STORAGE_EJECT_MEDIA \ CTL_CODE(IOCTL_STORAGE_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_LOAD_MEDIA \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_STORAGE_LOAD_MEDIA2 \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_STORAGE_RESERVE \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_STORAGE_RELEASE \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_STORAGE_FIND_NEW_DEVICES \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) + #define IOCTL_STORAGE_EJECTION_CONTROL \ CTL_CODE(IOCTL_STORAGE_BASE, 0x0250, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_STORAGE_FIND_NEW_DEVICES \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_MCN_CONTROL \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0251, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_STORAGE_GET_MEDIA_TYPES \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_STORAGE_GET_MEDIA_TYPES_EX \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0301, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_STORAGE_RESET_BUS \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + +#define IOCTL_STORAGE_RESET_DEVICE \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_STORAGE_GET_DEVICE_NUMBER \ CTL_CODE(IOCTL_STORAGE_BASE, 0x0420, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_PREDICT_FAILURE \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0440, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#endif /* _WINIOCTL_H */ + #define IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER \ CTL_CODE(IOCTL_STORAGE_BASE, 0x0304, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_STORAGE_GET_MEDIA_TYPES \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_STORAGE_GET_MEDIA_TYPES_EX \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0301, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_STORAGE_LOAD_MEDIA \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_STORAGE_LOAD_MEDIA2 \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_STORAGE_MCN_CONTROL \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0251, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_STORAGE_MEDIA_REMOVAL \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_STORAGE_PREDICT_FAILURE \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0440, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_GET_HOTPLUG_INFO \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0305, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_STORAGE_SET_HOTPLUG_INFO \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0306, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + +#define OBSOLETE_IOCTL_STORAGE_RESET_BUS \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + +#define OBSOLETE_IOCTL_STORAGE_RESET_DEVICE \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + +#define IOCTL_STORAGE_BREAK_RESERVATION \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_STORAGE_PERSISTENT_RESERVE_IN \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0406, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_STORAGE_PERSISTENT_RESERVE_OUT \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0407, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + +#define IOCTL_STORAGE_READ_CAPACITY \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0450, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_QUERY_PROPERTY \ CTL_CODE(IOCTL_STORAGE_BASE, 0x0500, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_STORAGE_RELEASE \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_STORAGE_RESERVE \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_STORAGE_GET_HOTPLUG_INFO \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0305, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_STORAGE_SET_HOTPLUG_INFO \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0306, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) - -#define IOCTL_STORAGE_RESET_BUS \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) - -#define IOCTL_STORAGE_RESET_DEVICE \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) - -#define IOCTL_STORAGE_BREAK_RESERVATION \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_STORAGE_PERSISTENT_RESERVE_IN \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0406, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_STORAGE_PERSISTENT_RESERVE_OUT \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0407, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) - -#define IOCTL_STORAGE_READ_CAPACITY \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0450, METHOD_BUFFERED, FILE_READ_ACCESS) - #define IOCTL_STORAGE_MANAGE_DATA_SET_ATTRIBUTES \ CTL_CODE(IOCTL_STORAGE_BASE, 0x0501, METHOD_BUFFERED, FILE_WRITE_ACCESS) @@ -171,12 +181,6 @@ #define IOCTL_STORAGE_CHECK_PRIORITY_HINT_SUPPORT \ CTL_CODE(IOCTL_STORAGE_BASE, 0x0620, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define OBSOLETE_IOCTL_STORAGE_RESET_BUS \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) - -#define OBSOLETE_IOCTL_STORAGE_RESET_DEVICE \ - CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define RECOVERED_WRITES_VALID 0x00000001 #define UNRECOVERED_WRITES_VALID 0x00000002 Modified: trunk/reactos/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winioctl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winioctl.h [iso-8859-1] Mon Jul 19 01:06:32 2010 @@ -16,6 +16,8 @@ #define DISK_HISTOGRAM_SIZE sizeof(DISK_HISTOGRAM) #define CTL_CODE(t,f,m,a) (((t)<<16)|((a)<<14)|((f)<<2)|(m)) #define DEVICE_TYPE_FROM_CTL_CODE(c) (((DWORD)((c)&0xffff0000))>>16) + +#ifndef _NTDDSTOR_H_ #define IOCTL_STORAGE_BASE FILE_DEVICE_MASS_STORAGE #define IOCTL_STORAGE_CHECK_VERIFY CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_CHECK_VERIFY2 CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -34,6 +36,8 @@ #define IOCTL_STORAGE_RESET_DEVICE CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_GET_DEVICE_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0420, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_PREDICT_FAILURE CTL_CODE(IOCTL_STORAGE_BASE, 0x0440, METHOD_BUFFERED, FILE_ANY_ACCESS) +#endif + #define IOCTL_DISK_BASE FILE_DEVICE_DISK #define IOCTL_DISK_GET_DRIVE_GEOMETRY CTL_CODE(IOCTL_DISK_BASE,0,METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_DISK_GET_PARTITION_INFO CTL_CODE(IOCTL_DISK_BASE,1,METHOD_BUFFERED,FILE_READ_ACCESS)

1 0

[akhaldi] 48111: [CRT] - Fix the double use of _CRTIMP.
by akhaldi＠svn.reactos.org 19 Jul '10

19 Jul '10

Author: akhaldi Date: Mon Jul 19 00:25:54 2010 New Revision: 48111 URL: http://svn.reactos.org/svn/reactos?rev=48111&view=rev Log: [CRT] - Fix the double use of _CRTIMP. Modified: trunk/reactos/include/crt/conio.h Modified: trunk/reactos/include/crt/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/conio.h?rev=48… ============================================================================== --- trunk/reactos/include/crt/conio.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/conio.h [iso-8859-1] Mon Jul 19 00:25:54 2010 @@ -84,15 +84,15 @@ #endif #ifndef NO_OLDNAMES - _CRTIMP _CRT_NONSTDC_DEPRECATE(_cgets) _CRT_INSECURE_DEPRECATE(_cgets_s) _CRTIMP char *__cdecl cgets(char *_Buffer); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_cprintf) _CRTIMP int __cdecl cprintf(const char *_Format,...); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_cputs) _CRTIMP int __cdecl cputs(const char *_Str); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_cscanf) _CRTIMP int __cdecl cscanf(const char *_Format,...); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_getch) _CRTIMP int __cdecl getch(void); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_getche) _CRTIMP int __cdecl getche(void); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_kbhit) _CRTIMP int __cdecl kbhit(void); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_putch) _CRTIMP int __cdecl putch(int _Ch); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_ungetch) _CRTIMP int __cdecl ungetch(int _Ch); + _CRT_NONSTDC_DEPRECATE(_cgets) _CRT_INSECURE_DEPRECATE(_cgets_s) _CRTIMP char *__cdecl cgets(char *_Buffer); + _CRT_NONSTDC_DEPRECATE(_cprintf) _CRTIMP int __cdecl cprintf(const char *_Format,...); + _CRT_NONSTDC_DEPRECATE(_cputs) _CRTIMP int __cdecl cputs(const char *_Str); + _CRT_NONSTDC_DEPRECATE(_cscanf) _CRTIMP int __cdecl cscanf(const char *_Format,...); + _CRT_NONSTDC_DEPRECATE(_getch) _CRTIMP int __cdecl getch(void); + _CRT_NONSTDC_DEPRECATE(_getche) _CRTIMP int __cdecl getche(void); + _CRT_NONSTDC_DEPRECATE(_kbhit) _CRTIMP int __cdecl kbhit(void); + _CRT_NONSTDC_DEPRECATE(_putch) _CRTIMP int __cdecl putch(int _Ch); + _CRT_NONSTDC_DEPRECATE(_ungetch) _CRTIMP int __cdecl ungetch(int _Ch); #if (defined(_X86_) && !defined(__x86_64)) _CRT_NONSTDC_DEPRECATE(_inp) _CRTIMP int __cdecl inp(unsigned short);

1 0

[akhaldi] 48110: - Fix _InterlockedExchangeAdd16, _InterlockedCompareExchangePointer and _InterlockedExchangePointer intrinsics.
by akhaldi＠svn.reactos.org 18 Jul '10

18 Jul '10

Author: akhaldi Date: Sun Jul 18 22:43:04 2010 New Revision: 48110 URL: http://svn.reactos.org/svn/reactos?rev=48110&view=rev Log: - Fix _InterlockedExchangeAdd16, _InterlockedCompareExchangePointer and _InterlockedExchangePointer intrinsics. Modified: trunk/reactos/include/crt/msc/intrin.h Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Sun Jul 18 22:43:04 2010 @@ -27,13 +27,9 @@ #pragma intrinsic(_InterlockedCompareExchange16) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand); #pragma intrinsic(_InterlockedCompareExchange) -void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand); -#pragma intrinsic(_InterlockedCompareExchangePointer) long _InterlockedExchange(volatile long * const Target, const long Value); #pragma intrinsic(_InterlockedExchange) -void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value); -#pragma intrinsic(_InterlockedExchangePointer) -long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value); +short _InterlockedExchangeAdd16(volatile short * const Addend, const short Value); #pragma intrinsic(_InterlockedExchangeAdd16) long _InterlockedExchangeAdd(volatile long * const Addend, const long Value); #pragma intrinsic(_InterlockedExchangeAdd) @@ -75,6 +71,10 @@ #pragma intrinsic(_InterlockedExchange64) __int64 _InterlockedExchangeAdd64(volatile __int64 * const Addend, const __int64 Value); #pragma intrinsic(_InterlockedExchangeAdd64) +void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand); +#pragma intrinsic(_InterlockedCompareExchangePointer) +void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value); +#pragma intrinsic(_InterlockedExchangePointer) __int64 _InterlockedAnd64(volatile __int64 * const value, const __int64 mask); #pragma intrinsic(_InterlockedAnd64) long _InterlockedOr64(volatile __int64 * const value, const __int64 mask);

1 0

[akhaldi] 48109: Merge r45430 from amd64-bringup : Add #pragma intrinsic for msvc intrinsics.
by akhaldi＠svn.reactos.org 18 Jul '10

18 Jul '10

Author: akhaldi Date: Sun Jul 18 21:55:54 2010 New Revision: 48109 URL: http://svn.reactos.org/svn/reactos?rev=48109&view=rev Log: Merge r45430 from amd64-bringup : Add #pragma intrinsic for msvc intrinsics. Modified: trunk/reactos/include/crt/msc/intrin.h Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Sun Jul 18 21:55:54 2010 @@ -7,160 +7,284 @@ /*** Stack frame juggling ***/ void * _ReturnAddress(void); +#pragma intrinsic(_ReturnAddress) void * _AddressOfReturnAddress(void); +#pragma intrinsic(_AddressOfReturnAddress) unsigned int __getcallerseflags(void); +#pragma intrinsic(__getcallerseflags) /*** Atomic operations ***/ void _ReadWriteBarrier(void); +#pragma intrinsic(_ReadWriteBarrier) void _ReadBarrier(void); +#pragma intrinsic(_ReadBarrier) void _WriteBarrier(void); +#pragma intrinsic(_WriteBarrier) char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand); +#pragma intrinsic(_InterlockedCompareExchange8) short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand); +#pragma intrinsic(_InterlockedCompareExchange16) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand); +#pragma intrinsic(_InterlockedCompareExchange) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand); +#pragma intrinsic(_InterlockedCompareExchangePointer) long _InterlockedExchange(volatile long * const Target, const long Value); +#pragma intrinsic(_InterlockedExchange) void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value); +#pragma intrinsic(_InterlockedExchangePointer) long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value); +#pragma intrinsic(_InterlockedExchangeAdd16) long _InterlockedExchangeAdd(volatile long * const Addend, const long Value); +#pragma intrinsic(_InterlockedExchangeAdd) char _InterlockedAnd8(volatile char * const value, const char mask); +#pragma intrinsic(_InterlockedAnd8) short _InterlockedAnd16(volatile short * const value, const short mask); +#pragma intrinsic(_InterlockedAnd16) long _InterlockedAnd(volatile long * const value, const long mask); +#pragma intrinsic(_InterlockedAnd) char _InterlockedOr8(volatile char * const value, const char mask); +#pragma intrinsic(_InterlockedOr8) short _InterlockedOr16(volatile short * const value, const short mask); +#pragma intrinsic(_InterlockedOr16) long _InterlockedOr(volatile long * const value, const long mask); +#pragma intrinsic(_InterlockedOr) char _InterlockedXor8(volatile char * const value, const char mask); +#pragma intrinsic(_InterlockedXor8) short _InterlockedXor16(volatile short * const value, const short mask); +#pragma intrinsic(_InterlockedXor16) long _InterlockedXor(volatile long * const value, const long mask); +#pragma intrinsic(_InterlockedXor) long _InterlockedAddLargeStatistic(volatile __int64 * const Addend, const long Value); +#pragma intrinsic(_InterlockedAddLargeStatistic) long _InterlockedDecrement(volatile long * const lpAddend); +#pragma intrinsic(_InterlockedDecrement) long _InterlockedIncrement(volatile long * const lpAddend); +#pragma intrinsic(_InterlockedIncrement) short _InterlockedDecrement16(volatile short * const lpAddend); +#pragma intrinsic(_InterlockedDecrement16) short _InterlockedIncrement16(volatile short * const lpAddend); +#pragma intrinsic(_InterlockedIncrement16) unsigned char _interlockedbittestandreset(volatile long * a, const long b); +#pragma intrinsic(_interlockedbittestandreset) unsigned char _interlockedbittestandset(volatile long * a, const long b); +#pragma intrinsic(_interlockedbittestandset) #if defined(_M_AMD64) __int64 _InterlockedExchange64(volatile __int64 * const Target, const __int64 Value); +#pragma intrinsic(_InterlockedExchange64) __int64 _InterlockedExchangeAdd64(volatile __int64 * const Addend, const __int64 Value); -long _InterlockedAnd64(volatile __int64 * const value, const __int64 mask); +#pragma intrinsic(_InterlockedExchangeAdd64) +__int64 _InterlockedAnd64(volatile __int64 * const value, const __int64 mask); +#pragma intrinsic(_InterlockedAnd64) long _InterlockedOr64(volatile __int64 * const value, const __int64 mask); +#pragma intrinsic(_InterlockedOr64) __int64 _InterlockedCompareExchange64(volatile __int64 * const Destination, const __int64 Exchange, const __int64 Comperand); +#pragma intrinsic(_InterlockedCompareExchange64) __int64 _InterlockedDecrement64(volatile __int64 * const lpAddend); +#pragma intrinsic(_InterlockedDecrement64) __int64 _InterlockedIncrement64(volatile __int64 * const lpAddend); +#pragma intrinsic(_InterlockedIncrement64) unsigned char _interlockedbittestandreset64(volatile __int64 * a, const __int64 b); +#pragma intrinsic(_interlockedbittestandreset64) unsigned char _interlockedbittestandset64(volatile __int64 * a, const __int64 b); +#pragma intrinsic(_interlockedbittestandset64) #endif /*** String operations ***/ void __stosb(unsigned char * Dest, const unsigned char Data, size_t Count); +#pragma intrinsic(__stosb) void __stosw(unsigned short * Dest, const unsigned short Data, size_t Count); +#pragma intrinsic(__stosw) void __stosd(unsigned long * Dest, const unsigned long Data, size_t Count); +#pragma intrinsic(__stosd) void __movsb(unsigned char * Destination, const unsigned char * Source, size_t Count); +#pragma intrinsic(__movsb) void __movsw(unsigned short * Destination, const unsigned short * Source, size_t Count); +#pragma intrinsic(__movsw) void __movsd(unsigned long * Destination, const unsigned long * Source, size_t Count); +#pragma intrinsic(__movsd) #if defined(_M_AMD64) /*** GS segment addressing ***/ void __writegsbyte(const unsigned long Offset, const unsigned char Data); +#pragma intrinsic(__writegsbyte) void __writegsword(const unsigned long Offset, const unsigned short Data); +#pragma intrinsic(__writegsword) void __writegsdword(const unsigned long Offset, const unsigned long Data); +#pragma intrinsic(__writegsdword) void __writegsqword(const unsigned long Offset, const unsigned __int64 Data); +#pragma intrinsic(__writegsqword) unsigned char __readgsbyte(const unsigned long Offset); +#pragma intrinsic(__readgsbyte) unsigned short __readgsword(const unsigned long Offset); +#pragma intrinsic(__readgsword) unsigned long __readgsdword(const unsigned long Offset); +#pragma intrinsic(__readgsdword) unsigned __int64 __readgsqword(const unsigned long Offset); +#pragma intrinsic(__readgsqword) void __incgsbyte(const unsigned long Offset); +#pragma intrinsic(__incgsbyte) void __incgsword(const unsigned long Offset); +#pragma intrinsic(__incgsword) void __incgsdword(const unsigned long Offset); +#pragma intrinsic(__incgsdword) void __addgsbyte(const unsigned long Offset, const unsigned char Data); +#pragma intrinsic(__addgsbyte) void __addgsword(const unsigned long Offset, const unsigned short Data); +#pragma intrinsic(__addgsword) void __addgsdword(const unsigned long Offset, const unsigned int Data); +#pragma intrinsic(__addgsdword) void __addgsqword(const unsigned long Offset, const unsigned __int64 Data); -#endif - -#if defined(_M_IX86) +#pragma intrinsic(__addgsqword) +#endif + +//#if defined(_M_IX86) /*** FS segment addressing ***/ void __writefsbyte(const unsigned long Offset, const unsigned char Data); +#pragma intrinsic(__writefsbyte) void __writefsword(const unsigned long Offset, const unsigned short Data); +#pragma intrinsic(__writefsword) void __writefsdword(const unsigned long Offset, const unsigned long Data); +#pragma intrinsic(__writefsdword) unsigned char __readfsbyte(const unsigned long Offset); +#pragma intrinsic(__readfsbyte) unsigned short __readfsword(const unsigned long Offset); +#pragma intrinsic(__readfsword) unsigned long __readfsdword(const unsigned long Offset); +#pragma intrinsic(__readfsdword) void __incfsbyte(const unsigned long Offset); +#pragma intrinsic(__incfsbyte) void __incfsword(const unsigned long Offset); +#pragma intrinsic(__incfsword) void __incfsdword(const unsigned long Offset); +#pragma intrinsic(__incfsdword) void __addfsbyte(const unsigned long Offset, const unsigned char Data); +#pragma intrinsic(__addfsbyte) void __addfsword(const unsigned long Offset, const unsigned short Data); +#pragma intrinsic(__addfsword) void __addfsdword(const unsigned long Offset, const unsigned int Data); -#endif +#pragma intrinsic(__addfsdword) +//#endif /*** Bit manipulation ***/ unsigned char _BitScanForward(unsigned long * const Index, const unsigned long Mask); +#pragma intrinsic(_BitScanForward) unsigned char _BitScanReverse(unsigned long * const Index, const unsigned long Mask); +#pragma intrinsic(_BitScanReverse) unsigned char _bittest(const long * const a, const long b); +#pragma intrinsic(_bittest) unsigned char _bittestandcomplement(long * const a, const long b); +#pragma intrinsic(_bittestandcomplement) unsigned char _bittestandreset(long * const a, const long b); +#pragma intrinsic(_bittestandreset) unsigned char _bittestandset(long * const a, const long b); +#pragma intrinsic(_bittestandset) unsigned char _rotl8(unsigned char value, unsigned char shift); +#pragma intrinsic(_rotl8) unsigned short _rotl16(unsigned short value, unsigned char shift); +#pragma intrinsic(_rotl16) unsigned int _rotl(unsigned int value, int shift); +#pragma intrinsic(_rotl) unsigned int _rotr(unsigned int value, int shift); +#pragma intrinsic(_rotr) unsigned char _rotr8(unsigned char value, unsigned char shift); +#pragma intrinsic(_rotr8) unsigned short _rotr16(unsigned short value, unsigned char shift); +#pragma intrinsic(_rotr16) unsigned __int64 __ll_lshift(const unsigned __int64 Mask, const int Bit); +#pragma intrinsic(__ll_lshift) __int64 __ll_rshift(const __int64 Mask, const int Bit); +#pragma intrinsic(__ll_rshift) unsigned __int64 __ull_rshift(const unsigned __int64 Mask, int Bit); +#pragma intrinsic(__ull_rshift) unsigned short _byteswap_ushort(unsigned short value); +#pragma intrinsic(_byteswap_ushort) unsigned long _byteswap_ulong(unsigned long value); +#pragma intrinsic(_byteswap_ulong) unsigned __int64 _byteswap_uint64(unsigned __int64 value); +#pragma intrinsic(_byteswap_uint64) /*** 64-bit math ***/ __int64 __emul(const int a, const int b); +#pragma intrinsic(__emul) unsigned __int64 __emulu(const unsigned int a, const unsigned int b); +#pragma intrinsic(__emulu) /*** Port I/O ***/ unsigned char __inbyte(const unsigned short Port); +#pragma intrinsic(__inbyte) unsigned short __inword(const unsigned short Port); +#pragma intrinsic(__inword) unsigned long __indword(const unsigned short Port); +#pragma intrinsic(__indword) void __inbytestring(unsigned short Port, unsigned char * Buffer, unsigned long Count); +#pragma intrinsic(__inbytestring) void __inwordstring(unsigned short Port, unsigned short * Buffer, unsigned long Count); +#pragma intrinsic(__inwordstring) void __indwordstring(unsigned short Port, unsigned long * Buffer, unsigned long Count); +#pragma intrinsic(__indwordstring) void __outbyte(unsigned short const Port, const unsigned char Data); +#pragma intrinsic(__outbyte) void __outword(unsigned short const Port, const unsigned short Data); +#pragma intrinsic(__outword) void __outdword(unsigned short const Port, const unsigned long Data); +#pragma intrinsic(__outdword) void __outbytestring(unsigned short const Port, const unsigned char * const Buffer, const unsigned long Count); +#pragma intrinsic(__outbytestring) void __outwordstring(unsigned short const Port, const unsigned short * const Buffer, const unsigned long Count); +#pragma intrinsic(__outwordstring) void __outdwordstring(unsigned short const Port, const unsigned long * const Buffer, const unsigned long Count); +#pragma intrinsic(__outdwordstring) /*** System information ***/ void __cpuid(int CPUInfo[], const int InfoType); +#pragma intrinsic(__cpuid) unsigned __int64 __rdtsc(void); +#pragma intrinsic(__rdtsc) void __writeeflags(uintptr_t Value); +#pragma intrinsic(__writeeflags) uintptr_t __readeflags(void); +#pragma intrinsic(__readeflags) /*** Interrupts ***/ void __debugbreak(void); +#pragma intrinsic(__debugbreak) void __int2c(void); +#pragma intrinsic(__int2c) void _disable(void); +#pragma intrinsic(_disable) void _enable(void); +#pragma intrinsic(_enable) void __halt(void); +#pragma intrinsic(__halt) /*** Protected memory management ***/ void __writecr0(const unsigned __int64 Data); +#pragma intrinsic(__writecr0) void __writecr3(const unsigned __int64 Data); +#pragma intrinsic(__writecr3) void __writecr4(const unsigned __int64 Data); +#pragma intrinsic(__writecr4) #ifdef _M_AMD64 void __writecr8(const unsigned __int64 Data); +#pragma intrinsic(__writecr8) unsigned __int64 __readcr0(void); +#pragma intrinsic(__readcr0) unsigned __int64 __readcr2(void); +#pragma intrinsic(__readcr2) unsigned __int64 __readcr3(void); +#pragma intrinsic(__readcr3) unsigned __int64 __readcr4(void); +#pragma intrinsic(__readcr4) unsigned __int64 __readcr8(void); +#pragma intrinsic(__readcr8) unsigned __int64 __readdr(unsigned int reg); +#pragma intrinsic(__readdr) void __writedr(unsigned reg, unsigned __int64 value); +#pragma intrinsic(__writedr) #else unsigned long __readcr0(void); unsigned long __readcr2(void); @@ -171,16 +295,25 @@ #endif void __invlpg(void * const Address); +#pragma intrinsic(__invlpg) /*** System operations ***/ unsigned __int64 __readmsr(const int reg); +#pragma intrinsic(__readmsr) void __writemsr(const unsigned long Register, const unsigned __int64 Value); +#pragma intrinsic(__writemsr) unsigned __int64 __readpmc(const int counter); +#pragma intrinsic(__readpmc) unsigned long __segmentlimit(const unsigned long a); +#pragma intrinsic(__segmentlimit) void __wbinvd(void); +#pragma intrinsic(__wbinvd) void __lidt(void *Source); +#pragma intrinsic(__lidt) void __sidt(void *Destination); +#pragma intrinsic(__sidt) void _mm_pause(void); +#pragma intrinsic(_mm_pause) #ifdef __cplusplus }

1 0

[ekohl] 48108: [ADVAPI32/LSASRV] - LookupAccountNameW: Call LsaLookupNames instead of returning a dummy name. - Implement LsaLookupNames. Calls LsarLookupNames. - LsarLookupNames: return dummy names.
by ekohl＠svn.reactos.org 18 Jul '10

18 Jul '10

Author: ekohl Date: Sun Jul 18 20:34:34 2010 New Revision: 48108 URL: http://svn.reactos.org/svn/reactos?rev=48108&view=rev Log: [ADVAPI32/LSASRV] - LookupAccountNameW: Call LsaLookupNames instead of returning a dummy name. - Implement LsaLookupNames. Calls LsarLookupNames. - LsarLookupNames: return dummy names. Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/advapi32/sec/misc.c trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sun Jul 18 20:34:34 2010 @@ -348,47 +348,47 @@ */ NTSTATUS WINAPI -LsaLookupNames( - LSA_HANDLE PolicyHandle, - ULONG Count, - PLSA_UNICODE_STRING Names, - PLSA_REFERENCED_DOMAIN_LIST *ReferencedDomains, - PLSA_TRANSLATED_SID *Sids) -{ - PLSA_TRANSLATED_SID2 Sids2; - LSA_TRANSLATED_SID *TranslatedSids; - ULONG i; +LsaLookupNames(IN LSA_HANDLE PolicyHandle, + IN ULONG Count, + IN PLSA_UNICODE_STRING Names, + OUT PLSA_REFERENCED_DOMAIN_LIST *ReferencedDomains, + OUT PLSA_TRANSLATED_SID *Sids) +{ + LSAPR_TRANSLATED_SIDS TranslatedSids; + ULONG MappedCount = 0; NTSTATUS Status; TRACE("(%p,0x%08x,%p,%p,%p)\n", PolicyHandle, Count, Names, ReferencedDomains, Sids); - /* Call LsaLookupNames2, which supersedes this function */ - Status = LsaLookupNames2(PolicyHandle, Count, 0, Names, ReferencedDomains, &Sids2); - if (!NT_SUCCESS(Status)) - return Status; - - /* Translate the returned structure */ - TranslatedSids = RtlAllocateHeap(RtlGetProcessHeap(), 0, Count * sizeof(LSA_TRANSLATED_SID)); - if (!TranslatedSids) - { - LsaFreeMemory(Sids2); - return SCESTATUS_NOT_ENOUGH_RESOURCE; - } - RtlZeroMemory(Sids, Count * sizeof(PLSA_TRANSLATED_SID)); - for (i = 0; i < Count; i++) - { - TranslatedSids[i].Use = Sids2[i].Use; - if (Sids2[i].Use != SidTypeInvalid && Sids2[i].Use != SidTypeUnknown) + RpcTryExcept + { + *ReferencedDomains = NULL; + *Sids = NULL; + + TranslatedSids.Entries = Count; + TranslatedSids.Sids = *Sids; + + Status = LsarLookupNames((LSAPR_HANDLE)PolicyHandle, + Count, + (PRPC_UNICODE_STRING)Names, + (PLSAPR_REFERENCED_DOMAIN_LIST *)ReferencedDomains, + &TranslatedSids, + LsapLookupWksta, + &MappedCount); + + *Sids = (PLSA_TRANSLATED_SID)TranslatedSids.Sids; + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + if (TranslatedSids.Sids != NULL) { - TranslatedSids[i].DomainIndex = Sids2[i].DomainIndex; - if (Sids2[i].Use != SidTypeDomain) - TranslatedSids[i].RelativeId = *GetSidSubAuthority(Sids2[i].Sid, 0); + MIDL_user_free(TranslatedSids.Sids); } - } - LsaFreeMemory(Sids2); - - *Sids = TranslatedSids; + + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; return Status; } @@ -487,12 +487,11 @@ */ NTSTATUS WINAPI -LsaLookupSids( - LSA_HANDLE PolicyHandle, - ULONG Count, - PSID *Sids, - PLSA_REFERENCED_DOMAIN_LIST *ReferencedDomains, - PLSA_TRANSLATED_NAME *Names) +LsaLookupSids(IN LSA_HANDLE PolicyHandle, + IN ULONG Count, + IN PSID *Sids, + OUT PLSA_REFERENCED_DOMAIN_LIST *ReferencedDomains, + OUT PLSA_TRANSLATED_NAME *Names) { LSAPR_SID_ENUM_BUFFER SidEnumBuffer; LSAPR_TRANSLATED_NAMES TranslatedNames; Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Sun Jul 18 20:34:34 2010 @@ -1177,7 +1177,7 @@ /****************************************************************************** * LookupAccountNameW [ADVAPI32.@] * - * @unimplemented + * @implemented */ BOOL WINAPI @@ -1189,78 +1189,94 @@ LPDWORD cchReferencedDomainName, PSID_NAME_USE peUse) { - /* Default implementation: Always return a default SID */ - SID_IDENTIFIER_AUTHORITY identifierAuthority = {SECURITY_NT_AUTHORITY}; - BOOL ret; - PSID pSid; - static const WCHAR dm[] = {'D','O','M','A','I','N',0}; - unsigned int i; - - TRACE("%s %s %p %p %p %p %p - stub\n", lpSystemName, lpAccountName, + OBJECT_ATTRIBUTES ObjectAttributes = {0}; + UNICODE_STRING SystemName; + UNICODE_STRING AccountName; + LSA_HANDLE PolicyHandle = NULL; + PLSA_REFERENCED_DOMAIN_LIST ReferencedDomains = NULL; + PLSA_TRANSLATED_SID TranslatedSid = NULL; + PSID pDomainSid; + DWORD dwDomainNameLength; + DWORD dwSidLength; + UCHAR nSubAuthorities; + BOOL bResult; + NTSTATUS Status; + + TRACE("%s %s %p %p %p %p %p\n", lpSystemName, lpAccountName, Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); - if (!ADVAPI_IsLocalComputer(lpSystemName)) - { - SetLastError(RPC_S_SERVER_UNAVAILABLE); - return FALSE; - } - - for (i = 0; i < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); i++) - { - if (!wcscmp(lpAccountName, ACCOUNT_SIDS[i].account)) - { - if (*cchReferencedDomainName) - *ReferencedDomainName = '\0'; - *cchReferencedDomainName = 0; - *peUse = SidTypeWellKnownGroup; - return CreateWellKnownSid(ACCOUNT_SIDS[i].type, NULL, Sid, cbSid); - } - } - - ret = AllocateAndInitializeSid(&identifierAuthority, - 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, - &pSid); - - if (!ret) - return FALSE; - - if (!RtlValidSid(pSid)) - { - FreeSid(pSid); - return FALSE; - } - - if (Sid != NULL && (*cbSid >= GetLengthSid(pSid))) - CopySid(*cbSid, Sid, pSid); - - if (*cbSid < GetLengthSid(pSid)) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - ret = FALSE; - } - - *cbSid = GetLengthSid(pSid); - - if (ReferencedDomainName != NULL && (*cchReferencedDomainName > wcslen(dm))) - wcscpy(ReferencedDomainName, dm); - - if ((*cchReferencedDomainName <= wcslen(dm)) || (!ret)) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - ret = FALSE; - *cchReferencedDomainName = wcslen(dm) + 1; + RtlInitUnicodeString(&SystemName, + lpSystemName); + + Status = LsaOpenPolicy(lpSystemName ? &SystemName : NULL, + &ObjectAttributes, + POLICY_LOOKUP_NAMES, + &PolicyHandle); + if (!NT_SUCCESS(Status)) + { + SetLastError(LsaNtStatusToWinError(Status)); + return FALSE; + } + + RtlInitUnicodeString(&AccountName, + lpAccountName); + + Status = LsaLookupNames(PolicyHandle, + 1, + &AccountName, + &ReferencedDomains, + &TranslatedSid); + + LsaClose(PolicyHandle); + + if (!NT_SUCCESS(Status) || Status == STATUS_SOME_NOT_MAPPED) + { + SetLastError(LsaNtStatusToWinError(Status)); + bResult = FALSE; } else { - *cchReferencedDomainName = wcslen(dm); - } - - FreeSid(pSid); - - return ret; + pDomainSid = ReferencedDomains->Domains[TranslatedSid->DomainIndex].Sid; + nSubAuthorities = *GetSidSubAuthorityCount(pDomainSid); + dwSidLength = GetSidLengthRequired(nSubAuthorities + 1); + + dwDomainNameLength = ReferencedDomains->Domains->Name.Length / sizeof(WCHAR); + + if (*cbSid < dwSidLength || + *cchReferencedDomainName < dwDomainNameLength + 1) + { + *cbSid = dwSidLength; + *cchReferencedDomainName = dwDomainNameLength + 1; + + bResult = FALSE; + } + else + { + CopySid(*cbSid, Sid, pDomainSid); + *GetSidSubAuthorityCount(Sid) = nSubAuthorities + 1; + *GetSidSubAuthority(Sid, (DWORD)nSubAuthorities) = TranslatedSid->RelativeId; + + RtlCopyMemory(ReferencedDomainName, ReferencedDomains->Domains->Name.Buffer, dwDomainNameLength * sizeof(WCHAR)); + ReferencedDomainName[dwDomainNameLength] = L'\0'; + + *cchReferencedDomainName = dwDomainNameLength; + + *peUse = TranslatedSid->Use; + + bResult = TRUE; + } + + if (bResult == FALSE) + SetLastError(ERROR_INSUFFICIENT_BUFFER); + } + + if (ReferencedDomains != NULL) + LsaFreeMemory(ReferencedDomains); + + if (TranslatedSid != NULL) + LsaFreeMemory(TranslatedSid); + + return bResult; } @@ -1499,11 +1515,11 @@ &PrivilegeName); if (NT_SUCCESS(Status)) { - if (PrivilegeName->Length + sizeof(WCHAR) > (*cchName) * sizeof(WCHAR)) + if (PrivilegeName->Length + sizeof(WCHAR) > *cchName * sizeof(WCHAR)) { Status = STATUS_BUFFER_TOO_SMALL; - (*cchName) = (PrivilegeName->Length + sizeof(WCHAR)) / sizeof(WCHAR); + *cchName = (PrivilegeName->Length + sizeof(WCHAR)) / sizeof(WCHAR); } else { @@ -1512,7 +1528,7 @@ PrivilegeName->Length); lpName[PrivilegeName->Length / sizeof(WCHAR)] = 0; - (*cchName) = PrivilegeName->Length / sizeof(WCHAR); + *cchName = PrivilegeName->Length / sizeof(WCHAR); } LsaFreeMemory(PrivilegeName->Buffer); Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Jul 18 20:34:34 2010 @@ -333,8 +333,91 @@ LSAP_LOOKUP_LEVEL LookupLevel, DWORD *MappedCount) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority = {SECURITY_NT_AUTHORITY}; + static const UNICODE_STRING DomainName = RTL_CONSTANT_STRING(L"DOMAIN"); + PLSAPR_REFERENCED_DOMAIN_LIST OutputDomains = NULL; + PLSA_TRANSLATED_SID OutputSids = NULL; + ULONG OutputSidsLength; + ULONG i; + PSID Sid; + ULONG SidLength; + NTSTATUS Status; + + TRACE("LsarLookupNames(%p, %lu, %p, %p, %p, %d, %p)\n", + PolicyHandle, Count, Names, ReferencedDomains, TranslatedSids, + LookupLevel, MappedCount); + + TranslatedSids->Entries = Count; + TranslatedSids->Sids = NULL; + *ReferencedDomains = NULL; + + OutputSidsLength = Count * sizeof(LSA_TRANSLATED_SID); + OutputSids = MIDL_user_allocate(OutputSidsLength); + if (OutputSids == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlZeroMemory(OutputSids, OutputSidsLength); + + OutputDomains = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); + if (OutputDomains == NULL) + { + MIDL_user_free(OutputSids); + return STATUS_INSUFFICIENT_RESOURCES; + } + + OutputDomains->Entries = Count; + OutputDomains->Domains = MIDL_user_allocate(Count * sizeof(LSA_TRUST_INFORMATION)); + if (OutputDomains->Domains == NULL) + { + MIDL_user_free(OutputDomains); + MIDL_user_free(OutputSids); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = RtlAllocateAndInitializeSid(&IdentifierAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &Sid); + if (!NT_SUCCESS(Status)) + { + MIDL_user_free(OutputDomains->Domains); + MIDL_user_free(OutputDomains); + MIDL_user_free(OutputSids); + return Status; + } + + SidLength = RtlLengthSid(Sid); + + for (i = 0; i < Count; i++) + { + OutputDomains->Domains[i].Sid = MIDL_user_allocate(SidLength); + RtlCopyMemory(OutputDomains->Domains[i].Sid, Sid, SidLength); + + OutputDomains->Domains[i].Name.Buffer = MIDL_user_allocate(DomainName.MaximumLength); + OutputDomains->Domains[i].Name.Length = DomainName.Length; + OutputDomains->Domains[i].Name.MaximumLength = DomainName.MaximumLength; + RtlCopyMemory(OutputDomains->Domains[i].Name.Buffer, DomainName.Buffer, DomainName.MaximumLength); + } + + for (i = 0; i < Count; i++) + { + OutputSids[i].Use = SidTypeWellKnownGroup; + OutputSids[i].RelativeId = DOMAIN_ALIAS_RID_ADMINS; + OutputSids[i].DomainIndex = i; + } + + *ReferencedDomains = OutputDomains; + + *MappedCount = Count; + + TranslatedSids->Entries = Count; + TranslatedSids->Sids = OutputSids; + + return STATUS_SUCCESS; }

1 0

[evb] 48107: Can't sleep so write more source codes! add scan bus functions to get power caps (PciGetEnhancedCapabilities) and AGP caps, use PciReadDeviceCapability util function, now can get wake levels, PCI power state plus target AGP ID. Now can find PCI Device that can't sleep neither! Ha-ha! Support PCI_HACK_NO_PM_CAPS, PCI_HACK_PRESERVE_COMMAND, PCI_HACK_DONT_DISABLE_DECOES Add scan bus function to set power for PCI, for now to power up (PciSetPowerManagedDevicePowerState), with support fo
by evb＠svn.reactos.org 18 Jul '10

18 Jul '10

Author: evb Date: Sun Jul 18 18:58:33 2010 New Revision: 48107 URL: http://svn.reactos.org/svn/reactos?rev=48107&view=rev Log: Can't sleep so write more source codes! add scan bus functions to get power caps (PciGetEnhancedCapabilities) and AGP caps, use PciReadDeviceCapability util function, now can get wake levels, PCI power state plus target AGP ID. Now can find PCI Device that can't sleep neither! Ha-ha! Support PCI_HACK_NO_PM_CAPS, PCI_HACK_PRESERVE_COMMAND, PCI_HACK_DONT_DISABLE_DECOES Add scan bus function to set power for PCI, for now to power up (PciSetPowerManagedDevicePowerState), with support for device that is critical/broken (PciCanDisableDecodes) Check spec-correct with PciStallForPowerChange after define PciPowerDelayTable for D0<->D3 crossmatrix spec timings (add PciReadDeviceConfig for support) If bad spec timing use PCI verifier support (PciVerifierRetrieveFailureData) + STATUS_DEVICE_PROTOCOL_ERROR Add PciVerifierFailureTable with all failure type Almost the time for resource discovery of BARs! Modified: trunk/reactos/drivers/bus/pcix/enum.c trunk/reactos/drivers/bus/pcix/pci.h trunk/reactos/drivers/bus/pcix/pci/config.c trunk/reactos/drivers/bus/pcix/pcivrify.c trunk/reactos/drivers/bus/pcix/power.c trunk/reactos/drivers/bus/pcix/utils.c 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 Jul 18 18:58:33 2010 @@ -122,6 +122,126 @@ /* Hit one of the known bugs/hackflags, or this is a new kind of PCI unit */ DPRINT1(" Device skipped (not enumerated).\n"); return TRUE; +} + +VOID +NTAPI +PciGetEnhancedCapabilities(IN PPCI_PDO_EXTENSION PdoExtension, + IN PPCI_COMMON_HEADER PciData) +{ + ULONG HeaderType, CapPtr, TargetAgpCapabilityId; + DEVICE_POWER_STATE WakeLevel; + PCI_CAPABILITIES_HEADER AgpCapability; + PCI_PM_CAPABILITY PowerCapabilities; + PAGED_CODE(); + + /* Assume no known wake level */ + PdoExtension->PowerState.DeviceWakeLevel = PowerDeviceUnspecified; + + /* Make sure the device has capabilities */ + if (!(PciData->Status & PCI_STATUS_CAPABILITIES_LIST)) + { + /* If it doesn't, there will be no power management */ + PdoExtension->CapabilitiesPtr = 0; + PdoExtension->HackFlags |= PCI_HACK_NO_PM_CAPS; + } + else + { + /* There's capabilities, need to figure out where to get the offset */ + HeaderType = PCI_CONFIGURATION_TYPE(PciData); + if (HeaderType == PCI_CARDBUS_BRIDGE_TYPE) + { + /* Use the bridge's header */ + CapPtr = PciData->u.type2.CapabilitiesPtr; + } + else + { + /* Use the device header */ + ASSERT(HeaderType <= PCI_CARDBUS_BRIDGE_TYPE); + CapPtr = PciData->u.type0.CapabilitiesPtr; + } + + /* Make sure the pointer is spec-aligned and located, and save it */ + DPRINT1("Device has capabilities at: %lx\n", CapPtr); + ASSERT(((CapPtr & 0x3) == 0) && (CapPtr >= PCI_COMMON_HDR_LENGTH)); + PdoExtension->CapabilitiesPtr = CapPtr; + + /* Check for PCI-to-PCI Bridges and AGP bridges */ + if ((PdoExtension->BaseClass == PCI_CLASS_BRIDGE_DEV) && + ((PdoExtension->SubClass == PCI_SUBCLASS_BR_HOST) || + (PdoExtension->SubClass == PCI_SUBCLASS_BR_PCI_TO_PCI))) + { + /* Query either the raw AGP capabilitity, or the Target AGP one */ + TargetAgpCapabilityId = (PdoExtension->SubClass == + PCI_SUBCLASS_BR_PCI_TO_PCI) ? + PCI_CAPABILITY_ID_AGP_TARGET : + PCI_CAPABILITY_ID_AGP; + if (PciReadDeviceCapability(PdoExtension, + PdoExtension->CapabilitiesPtr, + TargetAgpCapabilityId, + &AgpCapability, + sizeof(PCI_CAPABILITIES_HEADER))) + { + /* AGP target ID was found, store it */ + DPRINT1("AGP ID: %lx\n", TargetAgpCapabilityId); + PdoExtension->TargetAgpCapabilityId = TargetAgpCapabilityId; + } + } + + /* Check for devices that are known not to have proper power management */ + if (!(PdoExtension->HackFlags & PCI_HACK_NO_PM_CAPS)) + { + /* Query if this device supports power management */ + if (!PciReadDeviceCapability(PdoExtension, + PdoExtension->CapabilitiesPtr, + PCI_CAPABILITY_ID_POWER_MANAGEMENT, + &PowerCapabilities.Header, + sizeof(PCI_PM_CAPABILITY))) + { + /* No power management, so act as if it had the hackflag set */ + DPRINT1("No PM caps, disabling PM\n"); + PdoExtension->HackFlags |= PCI_HACK_NO_PM_CAPS; + } + else + { + /* Otherwise, pick the highest wake level that is supported */ + WakeLevel = PowerDeviceUnspecified; + if (PowerCapabilities.PMC.Capabilities.Support.PMED0) + WakeLevel = PowerDeviceD0; + if (PowerCapabilities.PMC.Capabilities.Support.PMED1) + WakeLevel = PowerDeviceD1; + if (PowerCapabilities.PMC.Capabilities.Support.PMED2) + WakeLevel = PowerDeviceD2; + if (PowerCapabilities.PMC.Capabilities.Support.PMED3Hot) + WakeLevel = PowerDeviceD3; + if (PowerCapabilities.PMC.Capabilities.Support.PMED3Cold) + WakeLevel = PowerDeviceD3; + PdoExtension->PowerState.DeviceWakeLevel = WakeLevel; + + /* Convert the PCI power state to the NT power state */ + PdoExtension->PowerState.CurrentDeviceState = + PowerCapabilities.PMCSR.ControlStatus.PowerState + 1; + + /* Save all the power capabilities */ + PdoExtension->PowerCapabilities = PowerCapabilities.PMC.Capabilities; + DPRINT1("PM Caps Found! Wake Level: %d Power State: %d\n", + WakeLevel, PdoExtension->PowerState.CurrentDeviceState); + } + } + } + + /* At the very end of all this, does this device not have power management? */ + if (PdoExtension->HackFlags & PCI_HACK_NO_PM_CAPS) + { + /* Then guess the current state based on whether the decodes are on */ + PdoExtension->PowerState.CurrentDeviceState = + PciData->Command & (PCI_ENABLE_IO_SPACE | + PCI_ENABLE_MEMORY_SPACE | + PCI_ENABLE_BUS_MASTER) ? + PowerDeviceD0: PowerDeviceD3; + DPRINT1("PM is off, so assumed device is: %d based on enables\n", + PdoExtension->PowerState.CurrentDeviceState); + } } NTSTATUS @@ -374,6 +494,12 @@ NewExtension->CommandEnables = PciData->Command; NewExtension->HackFlags = HackFlags; + /* Get power, AGP, and other capability data */ + PciGetEnhancedCapabilities(NewExtension, PciData); + + /* Power up the device */ + PciSetPowerManagedDevicePowerState(NewExtension, PowerDeviceD0, FALSE); + /* Save interrupt pin */ NewExtension->InterruptPin = PciData->u.type0.InterruptPin; 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 Jul 18 18:58:33 2010 @@ -67,6 +67,11 @@ // #define MAX_DEBUGGING_DEVICES_SUPPORTED 0x04 +// +// PCI Driver Verifier Failures +// +#define PCI_VERIFIER_CODES 0x04 + // // Device Extension, Interface, Translator and Arbiter Signatures // @@ -376,6 +381,17 @@ } PCI_ARBITER_INSTANCE, *PPCI_ARBITER_INSTANCE; // +// PCI Verifier Data +// +typedef struct _PCI_VERIFIER_DATA +{ + ULONG FailureCode; + VF_FAILURE_CLASS FailureClass; + ULONG AssertionControl; + PCHAR DebuggerMessageText; +} PCI_VERIFIER_DATA, *PPCI_VERIFIER_DATA; + +// // IRP Dispatch Routines // NTSTATUS @@ -440,6 +456,14 @@ IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension +); + +NTSTATUS +NTAPI +PciSetPowerManagedDevicePowerState( + IN PPCI_PDO_EXTENSION DeviceExtension, + IN DEVICE_POWER_STATE DeviceState, + IN BOOLEAN IrpSet ); // @@ -776,6 +800,12 @@ NTAPI PciVerifierInit( IN PDRIVER_OBJECT DriverObject +); + +PPCI_VERIFIER_DATA +NTAPI +PciVerifierRetrieveFailureData( + IN ULONG FailureCode ); // @@ -925,6 +955,25 @@ OUT PPCI_COMMON_HEADER PciData ); +UCHAR +NTAPI +PciReadDeviceCapability( + IN PPCI_PDO_EXTENSION DeviceExtension, + IN UCHAR Offset, + IN ULONG CapabilityId, + OUT PPCI_CAPABILITIES_HEADER Buffer, + IN ULONG Length +); + +BOOLEAN +NTAPI +PciCanDisableDecodes( + IN PPCI_PDO_EXTENSION DeviceExtension, + IN PPCI_COMMON_HEADER Config, + IN ULONGLONG HackFlags, + IN BOOLEAN ForPowerDown +); + // // Configuration Routines // @@ -947,6 +996,15 @@ VOID NTAPI PciWriteDeviceConfig( + IN PPCI_PDO_EXTENSION DeviceExtension, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length +); + +VOID +NTAPI +PciReadDeviceConfig( IN PPCI_PDO_EXTENSION DeviceExtension, IN PVOID Buffer, IN ULONG Offset, Modified: trunk/reactos/drivers/bus/pcix/pci/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/confi… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] Sun Jul 18 18:58:33 2010 @@ -24,7 +24,7 @@ { UCHAR InterruptLine = 0, PciInterruptLine; ULONG Length; - + /* Does the device have an interrupt pin? */ if (PdoExtension->InterruptPin) { @@ -100,6 +100,22 @@ Offset, Length, FALSE); +} + +VOID +NTAPI +PciReadDeviceConfig(IN PPCI_PDO_EXTENSION DeviceExtension, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length) +{ + /* Call the generic worker function */ + PciReadWriteConfigSpace(DeviceExtension->ParentFdoExtension, + DeviceExtension->Slot, + Buffer, + Offset, + Length, + TRUE); } VOID Modified: trunk/reactos/drivers/bus/pcix/pcivrify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pcivrify.… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pcivrify.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pcivrify.c [iso-8859-1] Sun Jul 18 18:58:33 2010 @@ -17,7 +17,61 @@ BOOLEAN PciVerifierRegistered; PVOID PciVerifierNotificationHandle; +PCI_VERIFIER_DATA PciVerifierFailureTable[PCI_VERIFIER_CODES] = +{ + { + 1, + VFFAILURE_FAIL_LOGO, + 0, + "The BIOS has reprogrammed the bus numbers of an active PCI device " + "(!devstack %DevObj) during a dock or undock!" + }, + { + 2, + VFFAILURE_FAIL_LOGO, + 0, + "A device in the system did not update it's PMCSR register in the spec " + "mandated time (!devstack %DevObj, Power state D%Ulong)" + }, + { + 3, + VFFAILURE_FAIL_LOGO, + 0, + "A driver controlling a PCI device has tried to access OS controlled " + "configuration space registers (!devstack %DevObj, Offset 0x%Ulong1, " + "Length 0x%Ulong2)" + }, + { + 4, + VFFAILURE_FAIL_UNDER_DEBUGGER, + 0, + "A driver controlling a PCI device has tried to read or write from an " + "invalid space using IRP_MN_READ/WRITE_CONFIG or via BUS_INTERFACE_STANDARD." + " NB: These functions take WhichSpace parameters of the form PCI_WHICHSPACE_*" + " and not a BUS_DATA_TYPE (!devstack %DevObj, WhichSpace 0x%Ulong1)" + }, +}; + /* FUNCTIONS ******************************************************************/ + +PPCI_VERIFIER_DATA +NTAPI +PciVerifierRetrieveFailureData(IN ULONG FailureCode) +{ + PPCI_VERIFIER_DATA VerifierData; + + /* Scan the verifier failure table for this code */ + VerifierData = PciVerifierFailureTable; + while (VerifierData->FailureCode != FailureCode) + { + /* Keep searching */ + ++VerifierData; + ASSERT(VerifierData < &PciVerifierFailureTable[PCI_VERIFIER_CODES]); + } + + /* Return the entry for this code */ + return VerifierData; +} NTSTATUS NTAPI Modified: trunk/reactos/drivers/bus/pcix/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/power.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/power.c [iso-8859-1] Sun Jul 18 18:58:33 2010 @@ -14,7 +14,191 @@ /* GLOBALS ********************************************************************/ +ULONG PciPowerDelayTable[PowerDeviceD3 * PowerDeviceD3] = +{ + 0, // D0 -> D0 + 0, // D1 -> D0 + 200, // D2 -> D0 + 10000, // D3 -> D0 + + 0, // D0 -> D1 + 0, // D1 -> D1 + 200, // D2 -> D1 + 10000, // D3 -> D1 + + 200, // D0 -> D2 + 200, // D1 -> D2 + 0, // D2 -> D2 + 10000, // D3 -> D2 + + 10000, // D0 -> D3 + 10000, // D1 -> D3 + 10000, // D2 -> D3 + 0 // D3 -> D3 +}; + /* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +PciStallForPowerChange(IN PPCI_PDO_EXTENSION PdoExtension, + IN DEVICE_POWER_STATE PowerState, + IN ULONG_PTR CapOffset) +{ + ULONG PciState, TimeoutEntry, PmcsrOffset, TryCount; + PPCI_VERIFIER_DATA VerifierData; + LARGE_INTEGER Interval; + PCI_PMCSR Pmcsr; + KIRQL Irql; + + /* Make sure the power state is valid, and the device can support it */ + ASSERT((PdoExtension->PowerState.CurrentDeviceState >= PowerDeviceD0) && + (PdoExtension->PowerState.CurrentDeviceState <= PowerDeviceD3)); + ASSERT((PowerState >= PowerDeviceD0) && (PowerState <= PowerDeviceD3)); + ASSERT(!(PdoExtension->HackFlags & PCI_HACK_NO_PM_CAPS)); + + /* Save the current IRQL */ + Irql = KeGetCurrentIrql(); + + /* Pick the expected timeout for this transition */ + TimeoutEntry = PciPowerDelayTable[PowerState * PdoExtension->PowerState.CurrentDeviceState]; + + /* PCI power states are one less than NT power states */ + PciState = PowerState - 1; + + /* The state status is stored in the PMCSR offset */ + PmcsrOffset = CapOffset + FIELD_OFFSET(PCI_PM_CAPABILITY, PMCSR); + + /* Try changing the power state up to 100 times */ + TryCount = 100; + while (--TryCount) + { + /* Check if this state transition will take time */ + if (TimeoutEntry > 0) + { + /* Check if this is happening at high IRQL */ + if (Irql >= DISPATCH_LEVEL) + { + /* Can't wait at high IRQL, stall the processor */ + KeStallExecutionProcessor(TimeoutEntry); + } + else + { + /* Do a wait for the timeout specified instead */ + Interval.QuadPart = -10 * TimeoutEntry; + Interval.QuadPart -= KeQueryTimeIncrement() - 1; + KeDelayExecutionThread(0, 0, &Interval); + } + } + + /* Read the PMCSR and see if the state has changed */ + PciReadDeviceConfig(PdoExtension, &Pmcsr, PmcsrOffset, sizeof(PCI_PMCSR)); + if (Pmcsr.PowerState == PciState) return STATUS_SUCCESS; + + /* Try again, forcing a timeout of 1ms */ + TimeoutEntry = 1000; + } + + /* Call verifier with this error */ + VerifierData = PciVerifierRetrieveFailureData(2); + ASSERT(VerifierData); + VfFailDeviceNode(PdoExtension->PhysicalDeviceObject, + PCI_VERIFIER_DETECTED_VIOLATION, + 2, // The PMCSR register was not updated within the spec-mandated time. + VerifierData->FailureClass, + &VerifierData->AssertionControl, + VerifierData->DebuggerMessageText, + "%DevObj%Ulong", + PdoExtension->PhysicalDeviceObject, + PciState); + + return STATUS_DEVICE_PROTOCOL_ERROR; +} + +NTSTATUS +NTAPI +PciSetPowerManagedDevicePowerState(IN PPCI_PDO_EXTENSION DeviceExtension, + IN DEVICE_POWER_STATE DeviceState, + IN BOOLEAN IrpSet) +{ + NTSTATUS Status; + PCI_PM_CAPABILITY PmCaps; + ULONG CapsOffset; + + /* Assume success */ + Status = STATUS_SUCCESS; + + /* Check if this device can support low power states */ + if (!(PciCanDisableDecodes(DeviceExtension, NULL, 0, TRUE)) && + (DeviceState != PowerDeviceD0)) + { + /* Simply return success, ignoring this request */ + DPRINT1("Cannot disable decodes on this device, ignoring PM request...\n"); + return Status; + } + + /* Does the device support power management at all? */ + if (!(DeviceExtension->HackFlags & PCI_HACK_NO_PM_CAPS)) + { + /* Get the PM capabailities register */ + CapsOffset = PciReadDeviceCapability(DeviceExtension, + DeviceExtension->CapabilitiesPtr, + PCI_CAPABILITY_ID_POWER_MANAGEMENT, + &PmCaps.Header, + sizeof(PCI_PM_CAPABILITY)); + ASSERT(CapsOffset); + ASSERT(DeviceState != PowerDeviceUnspecified); + + /* Check if the device is being powered up */ + if (DeviceState == PowerDeviceD0) + { + /* Set full power state */ + PmCaps.PMCSR.ControlStatus.PowerState = 0; + + /* Check if the device supports Cold-D3 poweroff */ + if (PmCaps.PMC.Capabilities.Support.PMED3Cold) + { + /* If there was a pending PME, clear it */ + PmCaps.PMCSR.ControlStatus.PMEStatus = 1; + } + } + else + { + /* Otherwise, just set the new power state, converting from NT */ + PmCaps.PMCSR.ControlStatus.PowerState = DeviceState - 1; + } + + /* Write the new power state in the PMCSR */ + PciWriteDeviceConfig(DeviceExtension, + &PmCaps.PMCSR, + CapsOffset + FIELD_OFFSET(PCI_PM_CAPABILITY, PMCSR), + sizeof(PCI_PMCSR)); + + /* Now wait for the change to "stick" based on the spec-mandated time */ + Status = PciStallForPowerChange(DeviceExtension, DeviceState, CapsOffset); + if (!NT_SUCCESS(Status)) return Status; + } + else + { + /* Nothing to do! */ + DPRINT1("No PM on this device, ignoring request\n"); + } + + /* Check if new resources have to be assigned */ + if (IrpSet) + { + /* Check if the new device state is lower (higher power) than now */ + if (DeviceState < DeviceExtension->PowerState.CurrentDeviceState) + { + /* We would normally re-assign resources after powerup */ + UNIMPLEMENTED; + while (TRUE); + } + } + + /* Return the power state change status */ + return Status; +} NTSTATUS NTAPI 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 Jul 18 18:58:33 2010 @@ -864,7 +864,7 @@ DeviceExtension->Slot.u.bits.DeviceNumber, DeviceExtension->Slot.u.bits.FunctionNumber); RtlInitUnicodeString(&KeyValue, Buffer); - + /* Set the value data (the PCI BIOS configuration header) */ Status = ZwSetValueKey(SubKeyHandle, &KeyValue, @@ -876,4 +876,169 @@ return Status; } +UCHAR +NTAPI +PciReadDeviceCapability(IN PPCI_PDO_EXTENSION DeviceExtension, + IN UCHAR Offset, + IN ULONG CapabilityId, + OUT PPCI_CAPABILITIES_HEADER Buffer, + IN ULONG Length) +{ + ULONG CapabilityCount = 0; + + /* If the device has no capabilility list, fail */ + if (!Offset) return 0; + + /* Validate a PDO with capabilities, a valid buffer, and a valid length */ + ASSERT(DeviceExtension->ExtensionType == PciPdoExtensionType); + ASSERT(DeviceExtension->CapabilitiesPtr != 0); + ASSERT(Buffer); + ASSERT(Length >= sizeof(PCI_CAPABILITIES_HEADER)); + + /* Loop all capabilities */ + while (Offset) + { + /* Make sure the pointer is spec-aligned and spec-sized */ + ASSERT((Offset >= PCI_COMMON_HDR_LENGTH) && ((Offset & 0x3) == 0)); + + /* Read the capability header */ + PciReadDeviceConfig(DeviceExtension, + Buffer, + Offset, + sizeof(PCI_CAPABILITIES_HEADER)); + + /* Check if this is the capability being looked up */ + if ((Buffer->CapabilityID == CapabilityId) || !(CapabilityId)) + { + /* Check if was at a valid offset and length */ + if ((Offset) && (Length > sizeof(PCI_CAPABILITIES_HEADER))) + { + /* Sanity check */ + ASSERT(Length <= (sizeof(PCI_COMMON_CONFIG) - Offset)); + + /* Now read the whole capability data into the buffer */ + PciReadDeviceConfig(DeviceExtension, + (PVOID)((ULONG_PTR)Buffer + + sizeof(PCI_CAPABILITIES_HEADER)), + Offset + sizeof(PCI_CAPABILITIES_HEADER), + Length - sizeof(PCI_CAPABILITIES_HEADER)); + } + + /* Return the offset where the capability was found */ + return Offset; + } + + /* Try the next capability instead */ + CapabilityCount++; + Offset = Buffer->Next; + + /* There can't be more than 48 capabilities (256 bytes max) */ + if (CapabilityCount > 48) + { + /* Fail, since this is basically a broken PCI device */ + DPRINT1("PCI device %p capabilities list is broken.\n", DeviceExtension); + return 0; + } + } + + /* Capability wasn't found, fail */ + return 0; +} + +BOOLEAN +NTAPI +PciCanDisableDecodes(IN PPCI_PDO_EXTENSION DeviceExtension, + IN PPCI_COMMON_HEADER Config, + IN ULONGLONG HackFlags, + IN BOOLEAN ForPowerDown) +{ + UCHAR BaseClass, SubClass; + BOOLEAN IsVga; + + /* Is there a device extension or should the PCI header be used? */ + if (DeviceExtension) + { + /* Never disable decodes for a debug PCI Device */ + if (DeviceExtension->OnDebugPath) return FALSE; + + /* Hack flags will be obtained from the extension, not the caller */ + ASSERT(HackFlags == 0); + + /* Get hacks and classification from the device extension */ + HackFlags = DeviceExtension->HackFlags; + SubClass = DeviceExtension->SubClass; + BaseClass = DeviceExtension->BaseClass; + } + else + { + /* There must be a PCI header, go read the classification information */ + ASSERT(Config != NULL); + BaseClass = Config->BaseClass; + SubClass = Config->SubClass; + } + + /* Check for hack flags that prevent disabling the decodes */ + if (HackFlags & (PCI_HACK_PRESERVE_COMMAND | + PCI_HACK_CB_SHARE_CMD_BITS | + PCI_HACK_DONT_DISABLE_DECODES)) + { + /* Don't do it */ + return FALSE; + } + + /* Is this a VGA adapter? */ + if ((BaseClass == PCI_CLASS_DISPLAY_CTLR) && + (SubClass == PCI_SUBCLASS_VID_VGA_CTLR)) + { + /* Never disable decodes if this is for power down */ + return ForPowerDown; + } + + /* Check for legacy devices */ + if (BaseClass == PCI_CLASS_PRE_20) + { + /* Never disable video adapter cards if this is for power down */ + if (SubClass == PCI_SUBCLASS_PRE_20_VGA) return ForPowerDown; + } + else if (BaseClass == PCI_CLASS_DISPLAY_CTLR) + { + /* Never disable VGA adapters if this is for power down */ + if (SubClass == PCI_SUBCLASS_VID_VGA_CTLR) return ForPowerDown; + } + else if (BaseClass == PCI_CLASS_BRIDGE_DEV) + { + /* Check for legacy bridges */ + if ((SubClass == PCI_SUBCLASS_BR_ISA) || + (SubClass == PCI_SUBCLASS_BR_EISA) || + (SubClass == PCI_SUBCLASS_BR_MCA) || + (SubClass == PCI_SUBCLASS_BR_HOST) || + (SubClass == PCI_SUBCLASS_BR_OTHER)) + { + /* Never disable these */ + return FALSE; + } + else if ((SubClass == PCI_SUBCLASS_BR_PCI_TO_PCI) || + (SubClass == PCI_SUBCLASS_BR_CARDBUS)) + { + /* This is a supported bridge, but does it have a VGA card? */ + if (!DeviceExtension) + { + /* Read the bridge control flag from the PCI header */ + IsVga = Config->u.type1.BridgeControl & PCI_ENABLE_BRIDGE_VGA; + } + else + { + /* Read the cached flag in the device extension */ + IsVga = DeviceExtension->Dependent.type1.VgaBitSet; + } + + /* Never disable VGA adapters if this is for power down */ + if (IsVga) return ForPowerDown; + } + } + + /* Finally, never disable decodes if there's no power management */ + return !(HackFlags & PCI_HACK_NO_PM_CAPS); +} + /* EOF */

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
47
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 July 2010