30 Oct
2009
30 Oct
'09
10:07 p.m.
Author: sginsberg
Date: Fri Oct 30 23:07:26 2009
New Revision: 43855
URL: http://svn.reactos.org/svn/reactos?rev=43855&view=rev
Log:
- Restructure HAL bus routines a bit.
- Fix some incorrect HAL types and add some that were missing.
Added:
trunk/reactos/hal/halx86/generic/bus/ (with props)
trunk/reactos/hal/halx86/generic/bus/bushndlr.c (with props)
trunk/reactos/hal/halx86/generic/bus/halbus.c
- copied, changed from r43810, trunk/reactos/hal/halx86/generic/bus.c
trunk/reactos/hal/halx86/generic/bus/isabus.c (with props)
trunk/reactos/hal/halx86/generic/bus/pcibus.c
- copied, changed from r43810, trunk/reactos/hal/halx86/generic/pci.c
trunk/reactos/hal/halx86/generic/bus/sysbus.c (with props)
Removed:
trunk/reactos/hal/halx86/generic/bus.c
trunk/reactos/hal/halx86/generic/pci.c
Modified:
trunk/reactos/hal/halx86/hal_generic.rbuild
trunk/reactos/hal/halx86/hal_generic_amd64.rbuild
trunk/reactos/hal/halx86/hal_generic_pc.rbuild
trunk/reactos/hal/halx86/halxbox.rbuild
trunk/reactos/include/ndk/haltypes.h
Propchange: trunk/reactos/hal/halx86/generic/bus/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Fri Oct 30 23:07:26 2009
@@ -1,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
Propchange: trunk/reactos/hal/halx86/generic/bus/
------------------------------------------------------------------------------
bugtraq:message = See issue #%BUGID% for more details.
Propchange: trunk/reactos/hal/halx86/generic/bus/
------------------------------------------------------------------------------
bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: trunk/reactos/hal/halx86/generic/bus/
------------------------------------------------------------------------------
tsvn:logminsize = 10
Removed: trunk/reactos/hal/halx86/generic/bus.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus.c?r…
==============================================================================
--- trunk/reactos/hal/halx86/generic/bus.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/bus.c (removed)
@@ -1,356 +1,0 @@
-/*
- * PROJECT: ReactOS HAL
- * LICENSE: GPL - See COPYING in the top level directory
- * FILE: hal/halx86/generic/bus.c
- * PURPOSE: Bus Support Routines
- * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <hal.h>
-#define NDEBUG
-#include <debug.h>
-
-/* GLOBALS *******************************************************************/
-
-ULONG HalpBusType;
-
-/* PRIVATE FUNCTIONS *********************************************************/
-
-VOID
-NTAPI
-HalpRegisterKdSupportFunctions(VOID)
-{
- /* Register PCI Device Functions */
- KdSetupPciDeviceForDebugging = HalpSetupPciDeviceForDebugging;
- KdReleasePciDeviceforDebugging = HalpReleasePciDeviceForDebugging;
-
- /* Register memory functions */
- KdMapPhysicalMemory64 = HalpMapPhysicalMemory64;
- KdUnmapVirtualAddress = HalpUnmapVirtualAddress;
-
- /* Register ACPI stub */
- KdCheckPowerButton = HalpCheckPowerButton;
-}
-
-NTSTATUS
-NTAPI
-HalpAssignSlotResources(IN PUNICODE_STRING RegistryPath,
- IN PUNICODE_STRING DriverClassName,
- IN PDRIVER_OBJECT DriverObject,
- IN PDEVICE_OBJECT DeviceObject,
- IN INTERFACE_TYPE BusType,
- IN ULONG BusNumber,
- IN ULONG SlotNumber,
- IN OUT PCM_RESOURCE_LIST *AllocatedResources)
-{
- BUS_HANDLER BusHandler;
- PAGED_CODE();
-
- /* Only PCI is supported */
- if (BusType != PCIBus) return STATUS_NOT_IMPLEMENTED;
-
- /* Setup fake PCI Bus handler */
- RtlCopyMemory(&BusHandler, &HalpFakePciBusHandler, sizeof(BUS_HANDLER));
- BusHandler.BusNumber = BusNumber;
-
- /* Call the PCI function */
- return HalpAssignPCISlotResources(&BusHandler,
- &BusHandler,
- RegistryPath,
- DriverClassName,
- DriverObject,
- DeviceObject,
- SlotNumber,
- AllocatedResources);
-}
-
-BOOLEAN
-NTAPI
-HalpTranslateBusAddress(IN INTERFACE_TYPE InterfaceType,
- IN ULONG BusNumber,
- IN PHYSICAL_ADDRESS BusAddress,
- IN OUT PULONG AddressSpace,
- OUT PPHYSICAL_ADDRESS TranslatedAddress)
-{
- /* Translation is easy */
- TranslatedAddress->QuadPart = BusAddress.QuadPart;
- return TRUE;
-}
-
-ULONG
-NTAPI
-HalpGetSystemInterruptVector(IN ULONG BusNumber,
- IN ULONG BusInterruptLevel,
- IN ULONG BusInterruptVector,
- OUT PKIRQL Irql,
- OUT PKAFFINITY Affinity)
-{
- ULONG Vector = IRQ2VECTOR(BusInterruptLevel);
- *Irql = (KIRQL)VECTOR2IRQL(Vector);
- *Affinity = 0xFFFFFFFF;
- return Vector;
-}
-
-BOOLEAN
-NTAPI
-HalpFindBusAddressTranslation(IN PHYSICAL_ADDRESS BusAddress,
- IN OUT PULONG AddressSpace,
- OUT PPHYSICAL_ADDRESS TranslatedAddress,
- IN OUT PULONG_PTR Context,
- IN BOOLEAN NextBus)
-{
- /* Make sure we have a context */
- if (!Context) return FALSE;
-
- /* If we have data in the context, then this shouldn't be a new lookup */
- if ((*Context) && (NextBus == TRUE)) return FALSE;
-
- /* Return bus data */
- TranslatedAddress->QuadPart = BusAddress.QuadPart;
-
- /* Set context value and return success */
- *Context = 1;
- return TRUE;
-}
-
-VOID
-NTAPI
-HalpInitNonBusHandler(VOID)
-{
- /* These should be written by the PCI driver later, but we give defaults */
- HalPciTranslateBusAddress = HalpTranslateBusAddress;
- HalPciAssignSlotResources = HalpAssignSlotResources;
- HalFindBusAddressTranslation = HalpFindBusAddressTranslation;
-}
-
-/* PUBLIC FUNCTIONS **********************************************************/
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-HalAdjustResourceList(IN PCM_RESOURCE_LIST Resources)
-{
- /* Deprecated, return success */
- return STATUS_SUCCESS;
-}
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-HalAssignSlotResources(IN PUNICODE_STRING RegistryPath,
- IN PUNICODE_STRING DriverClassName,
- IN PDRIVER_OBJECT DriverObject,
- IN PDEVICE_OBJECT DeviceObject,
- IN INTERFACE_TYPE BusType,
- IN ULONG BusNumber,
- IN ULONG SlotNumber,
- IN OUT PCM_RESOURCE_LIST *AllocatedResources)
-{
- /* Check the bus type */
- if (BusType != PCIBus)
- {
- /* Call our internal handler */
- return HalpAssignSlotResources(RegistryPath,
- DriverClassName,
- DriverObject,
- DeviceObject,
- BusType,
- BusNumber,
- SlotNumber,
- AllocatedResources);
- }
- else
- {
- /* Call the PCI registered function */
- return HalPciAssignSlotResources(RegistryPath,
- DriverClassName,
- DriverObject,
- DeviceObject,
- PCIBus,
- BusNumber,
- SlotNumber,
- AllocatedResources);
- }
-}
-
-/*
- * @implemented
- */
-ULONG
-NTAPI
-HalGetBusData(IN BUS_DATA_TYPE BusDataType,
- IN ULONG BusNumber,
- IN ULONG SlotNumber,
- IN PVOID Buffer,
- IN ULONG Length)
-{
- /* Call the extended function */
- return HalGetBusDataByOffset(BusDataType,
- BusNumber,
- SlotNumber,
- Buffer,
- 0,
- Length);
-}
-
-/*
- * @implemented
- */
-ULONG
-NTAPI
-HalGetBusDataByOffset(IN BUS_DATA_TYPE BusDataType,
- IN ULONG BusNumber,
- IN ULONG SlotNumber,
- IN PVOID Buffer,
- IN ULONG Offset,
- IN ULONG Length)
-{
- BUS_HANDLER BusHandler;
-
- /* Look as the bus type */
- if (BusDataType == Cmos)
- {
- /* Call CMOS Function */
- return HalpGetCmosData(0, SlotNumber, Buffer, Length);
- }
- else if (BusDataType == EisaConfiguration)
- {
- /* FIXME: TODO */
- ASSERT(FALSE);
- }
- else if ((BusDataType == PCIConfiguration) &&
- (HalpPCIConfigInitialized) &&
- ((BusNumber >= HalpMinPciBus) && (BusNumber <=
HalpMaxPciBus)))
- {
- /* Setup fake PCI Bus handler */
- RtlCopyMemory(&BusHandler, &HalpFakePciBusHandler, sizeof(BUS_HANDLER));
- BusHandler.BusNumber = BusNumber;
-
- /* Call PCI function */
- return HalpGetPCIData(&BusHandler,
- &BusHandler,
- *(PPCI_SLOT_NUMBER)&SlotNumber,
- Buffer,
- Offset,
- Length);
- }
-
- /* Invalid bus */
- return 0;
-}
-
-/*
- * @implemented
- */
-ULONG
-NTAPI
-HalGetInterruptVector(IN INTERFACE_TYPE InterfaceType,
- IN ULONG BusNumber,
- IN ULONG BusInterruptLevel,
- IN ULONG BusInterruptVector,
- OUT PKIRQL Irql,
- OUT PKAFFINITY Affinity)
-{
- /* Call the system bus translator */
- return HalpGetSystemInterruptVector(BusNumber,
- BusInterruptLevel,
- BusInterruptVector,
- Irql,
- Affinity);
-}
-
-/*
- * @implemented
- */
-ULONG
-NTAPI
-HalSetBusData(IN BUS_DATA_TYPE BusDataType,
- IN ULONG BusNumber,
- IN ULONG SlotNumber,
- IN PVOID Buffer,
- IN ULONG Length)
-{
- /* Call the extended function */
- return HalSetBusDataByOffset(BusDataType,
- BusNumber,
- SlotNumber,
- Buffer,
- 0,
- Length);
-}
-
-/*
- * @implemented
- */
-ULONG
-NTAPI
-HalSetBusDataByOffset(IN BUS_DATA_TYPE BusDataType,
- IN ULONG BusNumber,
- IN ULONG SlotNumber,
- IN PVOID Buffer,
- IN ULONG Offset,
- IN ULONG Length)
-{
- BUS_HANDLER BusHandler;
-
- /* Look as the bus type */
- if (BusDataType == Cmos)
- {
- /* Call CMOS Function */
- return HalpSetCmosData(0, SlotNumber, Buffer, Length);
- }
- else if ((BusDataType == PCIConfiguration) && (HalpPCIConfigInitialized))
- {
- /* Setup fake PCI Bus handler */
- RtlCopyMemory(&BusHandler, &HalpFakePciBusHandler, sizeof(BUS_HANDLER));
- BusHandler.BusNumber = BusNumber;
-
- /* Call PCI function */
- return HalpSetPCIData(&BusHandler,
- &BusHandler,
- *(PPCI_SLOT_NUMBER)&SlotNumber,
- Buffer,
- Offset,
- Length);
- }
-
- /* Invalid bus */
- return 0;
-}
-
-/*
- * @implemented
- */
-BOOLEAN
-NTAPI
-HalTranslateBusAddress(IN INTERFACE_TYPE InterfaceType,
- IN ULONG BusNumber,
- IN PHYSICAL_ADDRESS BusAddress,
- IN OUT PULONG AddressSpace,
- OUT PPHYSICAL_ADDRESS TranslatedAddress)
-{
- /* Look as the bus type */
- if (InterfaceType == PCIBus)
- {
- /* Call the PCI registered function */
- return HalPciTranslateBusAddress(PCIBus,
- BusNumber,
- BusAddress,
- AddressSpace,
- TranslatedAddress);
- }
- else
- {
- /* Translation is easy */
- TranslatedAddress->QuadPart = BusAddress.QuadPart;
- return TRUE;
- }
-}
-
-/* EOF */
Added: trunk/reactos/hal/halx86/generic/bus/bushndlr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/bus…
==============================================================================
--- trunk/reactos/hal/halx86/generic/bus/bushndlr.c (added)
+++ trunk/reactos/hal/halx86/generic/bus/bushndlr.c [iso-8859-1] Fri Oct 30 23:07:26 2009
@@ -1,0 +1,7 @@
+/*
+ * PROJECT: ReactOS HAL
+ * LICENSE: GPL - See COPYING in the top level directory
+ * FILE: hal/halx86/generic/bus/bushndlr.c
+ * PURPOSE:
+ * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org)
+ */
Propchange: trunk/reactos/hal/halx86/generic/bus/bushndlr.c
------------------------------------------------------------------------------
svn:eol-style = native
Copied: trunk/reactos/hal/halx86/generic/bus/halbus.c (from r43810,
trunk/reactos/hal/halx86/generic/bus.c)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/hal…
==============================================================================
--- trunk/reactos/hal/halx86/generic/bus.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/bus/halbus.c [iso-8859-1] Fri Oct 30 23:07:26 2009
@@ -1,7 +1,7 @@
/*
* PROJECT: ReactOS HAL
* LICENSE: GPL - See COPYING in the top level directory
- * FILE: hal/halx86/generic/bus.c
+ * FILE: hal/halx86/generic/bus/halbus.c
* PURPOSE: Bus Support Routines
* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org)
*/
Added: trunk/reactos/hal/halx86/generic/bus/isabus.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/isa…
==============================================================================
--- trunk/reactos/hal/halx86/generic/bus/isabus.c (added)
+++ trunk/reactos/hal/halx86/generic/bus/isabus.c [iso-8859-1] Fri Oct 30 23:07:26 2009
@@ -1,0 +1,7 @@
+/*
+ * PROJECT: ReactOS HAL
+ * LICENSE: GPL - See COPYING in the top level directory
+ * FILE: hal/halx86/generic/bus/isabus.c
+ * PURPOSE:
+ * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org)
+ */
Propchange: trunk/reactos/hal/halx86/generic/bus/isabus.c
------------------------------------------------------------------------------
svn:eol-style = native
Copied: trunk/reactos/hal/halx86/generic/bus/pcibus.c (from r43810,
trunk/reactos/hal/halx86/generic/pci.c)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/pci…
==============================================================================
--- trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/bus/pcibus.c [iso-8859-1] Fri Oct 30 23:07:26 2009
@@ -1,7 +1,7 @@
/*
* PROJECT: ReactOS HAL
* LICENSE: GPL - See COPYING in the top level directory
- * FILE: hal/halx86/generic/pci.c
+ * FILE: hal/halx86/generic/bus/pcibus.c
* PURPOSE: PCI Bus Support (Configuration Space, Resource Allocation)
* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org)
*/
@@ -98,9 +98,10 @@
NULL,
&HalpFakePciBusData,
0,
+ NULL,
{0, 0, 0, 0},
- HalpGetPCIData,
- HalpSetPCIData,
+ (PGETSETBUSDATA)HalpGetPCIData,
+ (PGETSETBUSDATA)HalpSetPCIData,
NULL,
HalpAssignPCISlotResources,
NULL,
@@ -338,7 +339,7 @@
HalpGetPCIData(IN PBUS_HANDLER BusHandler,
IN PBUS_HANDLER RootHandler,
IN PCI_SLOT_NUMBER Slot,
- IN PUCHAR Buffer,
+ IN PVOID Buffer,
IN ULONG Offset,
IN ULONG Length)
{
@@ -404,7 +405,7 @@
/* Update buffer and offset, decrement total length */
Offset += Len;
- Buffer += Len;
+ Buffer = (PVOID)((ULONG_PTR)Buffer + Len);
Length -= Len;
}
@@ -429,7 +430,7 @@
HalpSetPCIData(IN PBUS_HANDLER BusHandler,
IN PBUS_HANDLER RootHandler,
IN PCI_SLOT_NUMBER Slot,
- IN PUCHAR Buffer,
+ IN PVOID Buffer,
IN ULONG Offset,
IN ULONG Length)
{
@@ -483,7 +484,7 @@
/* Update buffer and offset, decrement total length */
Offset += Len;
- Buffer += Len;
+ Buffer = (PVOID)((ULONG_PTR)Buffer + Len);
Length -= Len;
}
Added: trunk/reactos/hal/halx86/generic/bus/sysbus.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/sys…
==============================================================================
--- trunk/reactos/hal/halx86/generic/bus/sysbus.c (added)
+++ trunk/reactos/hal/halx86/generic/bus/sysbus.c [iso-8859-1] Fri Oct 30 23:07:26 2009
@@ -1,0 +1,7 @@
+/*
+ * PROJECT: ReactOS HAL
+ * LICENSE: GPL - See COPYING in the top level directory
+ * FILE: hal/halx86/generic/bus/sysbus.c
+ * PURPOSE:
+ * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org)
+ */
Propchange: trunk/reactos/hal/halx86/generic/bus/sysbus.c
------------------------------------------------------------------------------
svn:eol-style = native
Removed: trunk/reactos/hal/halx86/generic/pci.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pci.c?r…
==============================================================================
--- trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/pci.c (removed)
@@ -1,937 +1,0 @@
-/*
- * PROJECT: ReactOS HAL
- * LICENSE: GPL - See COPYING in the top level directory
- * FILE: hal/halx86/generic/pci.c
- * PURPOSE: PCI Bus Support (Configuration Space, Resource Allocation)
- * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <hal.h>
-#define NDEBUG
-#include <debug.h>
-
-/* GLOBALS *******************************************************************/
-
-BOOLEAN HalpPCIConfigInitialized;
-ULONG HalpMinPciBus, HalpMaxPciBus;
-KSPIN_LOCK HalpPCIConfigLock;
-PCI_CONFIG_HANDLER PCIConfigHandler;
-
-/* PCI Operation Matrix */
-UCHAR PCIDeref[4][4] =
-{
- {0, 1, 2, 2}, // ULONG-aligned offset
- {1, 1, 1, 1}, // UCHAR-aligned offset
- {2, 1, 2, 2}, // USHORT-aligned offset
- {1, 1, 1, 1} // UCHAR-aligned offset
-};
-
-/* Type 1 PCI Bus */
-PCI_CONFIG_HANDLER PCIConfigHandlerType1 =
-{
- /* Synchronization */
- (FncSync)HalpPCISynchronizeType1,
- (FncReleaseSync)HalpPCIReleaseSynchronzationType1,
-
- /* Read */
- {
- (FncConfigIO)HalpPCIReadUlongType1,
- (FncConfigIO)HalpPCIReadUcharType1,
- (FncConfigIO)HalpPCIReadUshortType1
- },
-
- /* Write */
- {
- (FncConfigIO)HalpPCIWriteUlongType1,
- (FncConfigIO)HalpPCIWriteUcharType1,
- (FncConfigIO)HalpPCIWriteUshortType1
- }
-};
-
-/* Type 2 PCI Bus */
-PCI_CONFIG_HANDLER PCIConfigHandlerType2 =
-{
- /* Synchronization */
- (FncSync)HalpPCISynchronizeType2,
- (FncReleaseSync)HalpPCIReleaseSynchronizationType2,
-
- /* Read */
- {
- (FncConfigIO)HalpPCIReadUlongType2,
- (FncConfigIO)HalpPCIReadUcharType2,
- (FncConfigIO)HalpPCIReadUshortType2
- },
-
- /* Write */
- {
- (FncConfigIO)HalpPCIWriteUlongType2,
- (FncConfigIO)HalpPCIWriteUcharType2,
- (FncConfigIO)HalpPCIWriteUshortType2
- }
-};
-
-PCIPBUSDATA HalpFakePciBusData =
-{
- {
- PCI_DATA_TAG,
- PCI_DATA_VERSION,
- HalpReadPCIConfig,
- HalpWritePCIConfig,
- NULL,
- NULL,
- {{{0, 0, 0}}},
- {0, 0, 0, 0}
- },
- {{0, 0}},
- 32,
-};
-
-BUS_HANDLER HalpFakePciBusHandler =
-{
- 1,
- PCIBus,
- PCIConfiguration,
- 0,
- NULL,
- NULL,
- &HalpFakePciBusData,
- 0,
- {0, 0, 0, 0},
- HalpGetPCIData,
- HalpSetPCIData,
- NULL,
- HalpAssignPCISlotResources,
- NULL,
- NULL
-};
-
-/* TYPE 1 FUNCTIONS **********************************************************/
-
-VOID
-NTAPI
-HalpPCISynchronizeType1(IN PBUS_HANDLER BusHandler,
- IN PCI_SLOT_NUMBER Slot,
- IN PKIRQL Irql,
- IN PPCI_TYPE1_CFG_BITS PciCfg1)
-{
- /* Setup the PCI Configuration Register */
- PciCfg1->u.AsULONG = 0;
- PciCfg1->u.bits.BusNumber = BusHandler->BusNumber;
- PciCfg1->u.bits.DeviceNumber = Slot.u.bits.DeviceNumber;
- PciCfg1->u.bits.FunctionNumber = Slot.u.bits.FunctionNumber;
- PciCfg1->u.bits.Enable = TRUE;
-
- /* Acquire the lock */
- *Irql = KfRaiseIrql(HIGH_LEVEL);
- KiAcquireSpinLock(&HalpPCIConfigLock);
-}
-
-VOID
-NTAPI
-HalpPCIReleaseSynchronzationType1(IN PBUS_HANDLER BusHandler,
- IN KIRQL Irql)
-{
- PCI_TYPE1_CFG_BITS PciCfg1;
-
- /* Clear the PCI Configuration Register */
- PciCfg1.u.AsULONG = 0;
- WRITE_PORT_ULONG(((PPCIPBUSDATA)BusHandler->BusData)->Config.Type1.Address,
- PciCfg1.u.AsULONG);
-
- /* Release the lock */
- KiReleaseSpinLock(&HalpPCIConfigLock);
- KfLowerIrql(Irql);
-}
-
-TYPE1_READ(HalpPCIReadUcharType1, UCHAR)
-TYPE1_READ(HalpPCIReadUshortType1, USHORT)
-TYPE1_READ(HalpPCIReadUlongType1, ULONG)
-TYPE1_WRITE(HalpPCIWriteUcharType1, UCHAR)
-TYPE1_WRITE(HalpPCIWriteUshortType1, USHORT)
-TYPE1_WRITE(HalpPCIWriteUlongType1, ULONG)
-
-/* TYPE 2 FUNCTIONS **********************************************************/
-
-VOID
-NTAPI
-HalpPCISynchronizeType2(IN PBUS_HANDLER BusHandler,
- IN PCI_SLOT_NUMBER Slot,
- IN PKIRQL Irql,
- IN PPCI_TYPE2_ADDRESS_BITS PciCfg)
-{
- PCI_TYPE2_CSE_BITS PciCfg2Cse;
- PPCIPBUSDATA BusData = (PPCIPBUSDATA)BusHandler->BusData;
-
- /* Setup the configuration register */
- PciCfg->u.AsUSHORT = 0;
- PciCfg->u.bits.Agent = (USHORT)Slot.u.bits.DeviceNumber;
- PciCfg->u.bits.AddressBase = (USHORT)BusData->Config.Type2.Base;
-
- /* Acquire the lock */
- *Irql = KfRaiseIrql(HIGH_LEVEL);
- KiAcquireSpinLock(&HalpPCIConfigLock);
-
- /* Setup the CSE Register */
- PciCfg2Cse.u.AsUCHAR = 0;
- PciCfg2Cse.u.bits.Enable = TRUE;
- PciCfg2Cse.u.bits.FunctionNumber = (UCHAR)Slot.u.bits.FunctionNumber;
- PciCfg2Cse.u.bits.Key = -1;
-
- /* Write the bus number and CSE */
- WRITE_PORT_UCHAR(BusData->Config.Type2.Forward,
- (UCHAR)BusHandler->BusNumber);
- WRITE_PORT_UCHAR(BusData->Config.Type2.CSE, PciCfg2Cse.u.AsUCHAR);
-}
-
-VOID
-NTAPI
-HalpPCIReleaseSynchronizationType2(IN PBUS_HANDLER BusHandler,
- IN KIRQL Irql)
-{
- PCI_TYPE2_CSE_BITS PciCfg2Cse;
- PPCIPBUSDATA BusData = (PPCIPBUSDATA)BusHandler->BusData;
-
- /* Clear CSE and bus number */
- PciCfg2Cse.u.AsUCHAR = 0;
- WRITE_PORT_UCHAR(BusData->Config.Type2.CSE, PciCfg2Cse.u.AsUCHAR);
- WRITE_PORT_UCHAR(BusData->Config.Type2.Forward, 0);
-
- /* Release the lock */
- KiReleaseSpinLock(&HalpPCIConfigLock);
- KfLowerIrql(Irql);
-}
-
-TYPE2_READ(HalpPCIReadUcharType2, UCHAR)
-TYPE2_READ(HalpPCIReadUshortType2, USHORT)
-TYPE2_READ(HalpPCIReadUlongType2, ULONG)
-TYPE2_WRITE(HalpPCIWriteUcharType2, UCHAR)
-TYPE2_WRITE(HalpPCIWriteUshortType2, USHORT)
-TYPE2_WRITE(HalpPCIWriteUlongType2, ULONG)
-
-/* PCI CONFIGURATION SPACE ***************************************************/
-
-VOID
-NTAPI
-HalpPCIConfig(IN PBUS_HANDLER BusHandler,
- IN PCI_SLOT_NUMBER Slot,
- IN PUCHAR Buffer,
- IN ULONG Offset,
- IN ULONG Length,
- IN FncConfigIO *ConfigIO)
-{
- KIRQL OldIrql;
- ULONG i;
- UCHAR State[20];
-
- /* Synchronize the operation */
- PCIConfigHandler.Synchronize(BusHandler, Slot, &OldIrql, State);
-
- /* Loop every increment */
- while (Length)
- {
- /* Find out the type of read/write we need to do */
- i = PCIDeref[Offset % sizeof(ULONG)][Length % sizeof(ULONG)];
-
- /* Do the read/write and return the number of bytes */
- i = ConfigIO[i]((PPCIPBUSDATA)BusHandler->BusData,
- State,
- Buffer,
- Offset);
-
- /* Increment the buffer position and offset, and decrease the length */
- Offset += i;
- Buffer += i;
- Length -= i;
- }
-
- /* Release the lock and PCI bus */
- PCIConfigHandler.ReleaseSynchronzation(BusHandler, OldIrql);
-}
-
-VOID
-NTAPI
-HalpReadPCIConfig(IN PBUS_HANDLER BusHandler,
- IN PCI_SLOT_NUMBER Slot,
- IN PVOID Buffer,
- IN ULONG Offset,
- IN ULONG Length)
-{
- /* Validate the PCI Slot */
- if (!HalpValidPCISlot(BusHandler, Slot))
- {
- /* Fill the buffer with invalid data */
- RtlFillMemory(Buffer, Length, -1);
- }
- else
- {
- /* Send the request */
- HalpPCIConfig(BusHandler,
- Slot,
- Buffer,
- Offset,
- Length,
- PCIConfigHandler.ConfigRead);
- }
-}
-
-VOID
-NTAPI
-HalpWritePCIConfig(IN PBUS_HANDLER BusHandler,
- IN PCI_SLOT_NUMBER Slot,
- IN PVOID Buffer,
- IN ULONG Offset,
- IN ULONG Length)
-{
- /* Validate the PCI Slot */
- if (HalpValidPCISlot(BusHandler, Slot))
- {
- /* Send the request */
- HalpPCIConfig(BusHandler,
- Slot,
- Buffer,
- Offset,
- Length,
- PCIConfigHandler.ConfigWrite);
- }
-}
-
-BOOLEAN
-NTAPI
-HalpValidPCISlot(IN PBUS_HANDLER BusHandler,
- IN PCI_SLOT_NUMBER Slot)
-{
- PCI_SLOT_NUMBER MultiSlot;
- PPCIPBUSDATA BusData = (PPCIPBUSDATA)BusHandler->BusData;
- UCHAR HeaderType;
- ULONG Device;
-
- /* Simple validation */
- if (Slot.u.bits.Reserved) return FALSE;
- if (Slot.u.bits.DeviceNumber >= BusData->MaxDevice) return FALSE;
-
- /* Function 0 doesn't need checking */
- if (!Slot.u.bits.FunctionNumber) return TRUE;
-
- /* Functions 0+ need Multi-Function support, so check the slot */
- Device = Slot.u.bits.DeviceNumber;
- MultiSlot = Slot;
- MultiSlot.u.bits.FunctionNumber = 0;
-
- /* Send function 0 request to get the header back */
- HalpReadPCIConfig(BusHandler,
- MultiSlot,
- &HeaderType,
- FIELD_OFFSET(PCI_COMMON_CONFIG, HeaderType),
- sizeof(UCHAR));
-
- /* Now make sure the header is multi-function */
- if (!(HeaderType & PCI_MULTIFUNCTION) || (HeaderType == 0xFF)) return FALSE;
- return TRUE;
-}
-
-/* HAL PCI CALLBACKS *********************************************************/
-
-ULONG
-NTAPI
-HalpGetPCIData(IN PBUS_HANDLER BusHandler,
- IN PBUS_HANDLER RootHandler,
- IN PCI_SLOT_NUMBER Slot,
- IN PUCHAR Buffer,
- IN ULONG Offset,
- IN ULONG Length)
-{
- UCHAR PciBuffer[PCI_COMMON_HDR_LENGTH];
- PPCI_COMMON_CONFIG PciConfig = (PPCI_COMMON_CONFIG)PciBuffer;
- ULONG Len = 0;
-
-#ifdef SARCH_XBOX
- /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely
- * hang the Xbox. Also, the device number doesn't seem to be decoded for the
- * video card, so it appears to be present on 1:0:0 - 1:31:0.
- * We hack around these problems by indicating "device not present" for
devices
- * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */
- if ((0 == BusHandler->BusNumber && 0 == Slot.u.bits.DeviceNumber
&&
- (1 == Slot.u.bits.FunctionNumber || 2 == Slot.u.bits.FunctionNumber)) ||
- (1 == BusHandler->BusNumber && 0 != Slot.u.bits.DeviceNumber))
- {
- DPRINT("Blacklisted PCI slot\n");
- if (0 == Offset && 2 <= Length)
- {
- *(PUSHORT)Buffer = PCI_INVALID_VENDORID;
- return 2;
- }
- return 0;
- }
-#endif
-
- /* Normalize the length */
- if (Length > sizeof(PCI_COMMON_CONFIG)) Length = sizeof(PCI_COMMON_CONFIG);
-
- /* Check if this is a vendor-specific read */
- if (Offset >= PCI_COMMON_HDR_LENGTH)
- {
- /* Read the header */
- HalpReadPCIConfig(BusHandler, Slot, PciConfig, 0, sizeof(ULONG));
-
- /* Make sure the vendor is valid */
- if (PciConfig->VendorID == PCI_INVALID_VENDORID) return 0;
- }
- else
- {
- /* Read the entire header */
- Len = PCI_COMMON_HDR_LENGTH;
- HalpReadPCIConfig(BusHandler, Slot, PciConfig, 0, Len);
-
- /* Validate the vendor ID */
- if (PciConfig->VendorID == PCI_INVALID_VENDORID)
- {
- /* It's invalid, but we want to return this much */
- PciConfig->VendorID = PCI_INVALID_VENDORID;
- Len = sizeof(USHORT);
- }
-
- /* Now check if there's space left */
- if (Len < Offset) return 0;
-
- /* There is, so return what's after the offset and normalize */
- Len -= Offset;
- if (Len > Length) Len = Length;
-
- /* Copy the data into the caller's buffer */
- RtlMoveMemory(Buffer, PciBuffer + Offset, Len);
-
- /* Update buffer and offset, decrement total length */
- Offset += Len;
- Buffer += Len;
- Length -= Len;
- }
-
- /* Now we still have something to copy */
- if (Length)
- {
- /* Check if it's vendor-specific data */
- if (Offset >= PCI_COMMON_HDR_LENGTH)
- {
- /* Read it now */
- HalpReadPCIConfig(BusHandler, Slot, Buffer, Offset, Length);
- Len += Length;
- }
- }
-
- /* Update the total length read */
- return Len;
-}
-
-ULONG
-NTAPI
-HalpSetPCIData(IN PBUS_HANDLER BusHandler,
- IN PBUS_HANDLER RootHandler,
- IN PCI_SLOT_NUMBER Slot,
- IN PUCHAR Buffer,
- IN ULONG Offset,
- IN ULONG Length)
-{
- UCHAR PciBuffer[PCI_COMMON_HDR_LENGTH];
- PPCI_COMMON_CONFIG PciConfig = (PPCI_COMMON_CONFIG)PciBuffer;
- ULONG Len = 0;
-
-#ifdef SARCH_XBOX
- /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely
- * hang the Xbox. Also, the device number doesn't seem to be decoded for the
- * video card, so it appears to be present on 1:0:0 - 1:31:0.
- * We hack around these problems by indicating "device not present" for
devices
- * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */
- if ((0 == BusHandler->BusNumber && 0 == Slot.u.bits.DeviceNumber
&&
- (1 == Slot.u.bits.FunctionNumber || 2 == Slot.u.bits.FunctionNumber)) ||
- (1 == BusHandler->BusNumber && 0 != Slot.u.bits.DeviceNumber))
- {
- DPRINT1("Trying to set data on blacklisted PCI slot\n");
- return 0;
- }
-#endif
-
- /* Normalize the length */
- if (Length > sizeof(PCI_COMMON_CONFIG)) Length = sizeof(PCI_COMMON_CONFIG);
-
- /* Check if this is a vendor-specific read */
- if (Offset >= PCI_COMMON_HDR_LENGTH)
- {
- /* Read the header */
- HalpReadPCIConfig(BusHandler, Slot, PciConfig, 0, sizeof(ULONG));
-
- /* Make sure the vendor is valid */
- if (PciConfig->VendorID == PCI_INVALID_VENDORID) return 0;
- }
- else
- {
- /* Read the entire header and validate the vendor ID */
- Len = PCI_COMMON_HDR_LENGTH;
- HalpReadPCIConfig(BusHandler, Slot, PciConfig, 0, Len);
- if (PciConfig->VendorID == PCI_INVALID_VENDORID) return 0;
-
- /* Return what's after the offset and normalize */
- Len -= Offset;
- if (Len > Length) Len = Length;
-
- /* Copy the specific caller data */
- RtlMoveMemory(PciBuffer + Offset, Buffer, Len);
-
- /* Write the actual configuration data */
- HalpWritePCIConfig(BusHandler, Slot, PciBuffer + Offset, Offset, Len);
-
- /* Update buffer and offset, decrement total length */
- Offset += Len;
- Buffer += Len;
- Length -= Len;
- }
-
- /* Now we still have something to copy */
- if (Length)
- {
- /* Check if it's vendor-specific data */
- if (Offset >= PCI_COMMON_HDR_LENGTH)
- {
- /* Read it now */
- HalpWritePCIConfig(BusHandler, Slot, Buffer, Offset, Length);
- Len += Length;
- }
- }
-
- /* Update the total length read */
- return Len;
-}
-
-NTSTATUS
-NTAPI
-HalpSetupPciDeviceForDebugging(IN PVOID LoaderBlock,
- IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice)
-{
- DPRINT1("Unimplemented!\n");
- return STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS
-NTAPI
-HalpReleasePciDeviceForDebugging(IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice)
-{
- DPRINT1("Unimplemented!\n");
- return STATUS_NOT_IMPLEMENTED;
-}
-
-static ULONG NTAPI
-PciSize(ULONG Base, ULONG Mask)
-{
- ULONG Size = Mask & Base; /* Find the significant bits */
- Size = Size & ~(Size - 1); /* Get the lowest of them to find the decode size */
- return Size;
-}
-
-NTSTATUS
-NTAPI
-HalpAssignPCISlotResources(IN PBUS_HANDLER BusHandler,
- IN PBUS_HANDLER RootHandler,
- IN PUNICODE_STRING RegistryPath,
- IN PUNICODE_STRING DriverClassName OPTIONAL,
- IN PDRIVER_OBJECT DriverObject,
- IN PDEVICE_OBJECT DeviceObject OPTIONAL,
- IN ULONG Slot,
- IN OUT PCM_RESOURCE_LIST *AllocatedResources)
-{
- PCI_COMMON_CONFIG PciConfig;
- SIZE_T Address;
- SIZE_T ResourceCount;
- ULONG Size[PCI_TYPE0_ADDRESSES];
- NTSTATUS Status = STATUS_SUCCESS;
- UCHAR Offset;
- PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor;
- PCI_SLOT_NUMBER SlotNumber;
- ULONG WriteBuffer;
-
- /* FIXME: Should handle 64-bit addresses */
-
- /* Read configuration data */
- SlotNumber.u.AsULONG = Slot;
- HalpReadPCIConfig(BusHandler, SlotNumber, &PciConfig, 0, PCI_COMMON_HDR_LENGTH);
-
- /* Check if we read it correctly */
- if (PciConfig.VendorID == PCI_INVALID_VENDORID)
- return STATUS_NO_SUCH_DEVICE;
-
- /* Read the PCI configuration space for the device and store base address and
- size information in temporary storage. Count the number of valid base addresses */
- ResourceCount = 0;
- for (Address = 0; Address < PCI_TYPE0_ADDRESSES; Address++)
- {
- if (0xffffffff == PciConfig.u.type0.BaseAddresses[Address])
- PciConfig.u.type0.BaseAddresses[Address] = 0;
-
- /* Memory resource */
- if (0 != PciConfig.u.type0.BaseAddresses[Address])
- {
- ResourceCount++;
-
- Offset = (UCHAR)FIELD_OFFSET(PCI_COMMON_CONFIG,
u.type0.BaseAddresses[Address]);
-
- /* Write 0xFFFFFFFF there */
- WriteBuffer = 0xffffffff;
- HalpWritePCIConfig(BusHandler, SlotNumber, &WriteBuffer, Offset,
sizeof(ULONG));
-
- /* Read that figure back from the config space */
- HalpReadPCIConfig(BusHandler, SlotNumber, &Size[Address], Offset,
sizeof(ULONG));
-
- /* Write back initial value */
- HalpWritePCIConfig(BusHandler, SlotNumber,
&PciConfig.u.type0.BaseAddresses[Address], Offset, sizeof(ULONG));
- }
- }
-
- /* Interrupt resource */
- if (0 != PciConfig.u.type0.InterruptLine)
- ResourceCount++;
-
- /* Allocate output buffer and initialize */
- *AllocatedResources = ExAllocatePoolWithTag(
- PagedPool,
- sizeof(CM_RESOURCE_LIST) +
- (ResourceCount - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR),
- ' laH');
-
- if (NULL == *AllocatedResources)
- return STATUS_NO_MEMORY;
-
- (*AllocatedResources)->Count = 1;
- (*AllocatedResources)->List[0].InterfaceType = PCIBus;
- (*AllocatedResources)->List[0].BusNumber = BusHandler->BusNumber;
- (*AllocatedResources)->List[0].PartialResourceList.Version = 1;
- (*AllocatedResources)->List[0].PartialResourceList.Revision = 1;
- (*AllocatedResources)->List[0].PartialResourceList.Count = ResourceCount;
- Descriptor =
(*AllocatedResources)->List[0].PartialResourceList.PartialDescriptors;
-
- /* Store configuration information */
- for (Address = 0; Address < PCI_TYPE0_ADDRESSES; Address++)
- {
- if (0 != PciConfig.u.type0.BaseAddresses[Address])
- {
- if (/*PCI_BASE_ADDRESS_SPACE_MEMORY*/ 0 ==
- (PciConfig.u.type0.BaseAddresses[Address] & 0x1))
- {
- Descriptor->Type = CmResourceTypeMemory;
- Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; /*
FIXME I have no idea... */
- Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; /*
FIXME Just a guess */
- Descriptor->u.Memory.Start.QuadPart =
(PciConfig.u.type0.BaseAddresses[Address] & PCI_ADDRESS_MEMORY_ADDRESS_MASK);
- Descriptor->u.Memory.Length = PciSize(Size[Address],
PCI_ADDRESS_MEMORY_ADDRESS_MASK);
- }
- else if (PCI_ADDRESS_IO_SPACE ==
- (PciConfig.u.type0.BaseAddresses[Address] & 0x1))
- {
- Descriptor->Type = CmResourceTypePort;
- Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; /*
FIXME I have no idea... */
- Descriptor->Flags = CM_RESOURCE_PORT_IO; /*
FIXME Just a guess */
- Descriptor->u.Port.Start.QuadPart =
PciConfig.u.type0.BaseAddresses[Address] &= PCI_ADDRESS_IO_ADDRESS_MASK;
- Descriptor->u.Port.Length = PciSize(Size[Address],
PCI_ADDRESS_IO_ADDRESS_MASK & 0xffff);
- }
- else
- {
- ASSERT(FALSE);
- return STATUS_UNSUCCESSFUL;
- }
- Descriptor++;
- }
- }
-
- if (0 != PciConfig.u.type0.InterruptLine)
- {
- Descriptor->Type = CmResourceTypeInterrupt;
- Descriptor->ShareDisposition = CmResourceShareShared; /* FIXME Just a
guess */
- Descriptor->Flags = CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE; /* FIXME Just a
guess */
- Descriptor->u.Interrupt.Level = PciConfig.u.type0.InterruptLine;
- Descriptor->u.Interrupt.Vector = PciConfig.u.type0.InterruptLine;
- Descriptor->u.Interrupt.Affinity = 0xFFFFFFFF;
-
- Descriptor++;
- }
-
- ASSERT(Descriptor ==
(*AllocatedResources)->List[0].PartialResourceList.PartialDescriptors +
ResourceCount);
-
- /* FIXME: Should store the resources in the registry resource map */
-
- return Status;
-}
-
-ULONG
-NTAPI
-HaliPciInterfaceReadConfig(IN PBUS_HANDLER RootBusHandler,
- IN ULONG BusNumber,
- IN PCI_SLOT_NUMBER SlotNumber,
- IN PVOID Buffer,
- IN ULONG Offset,
- IN ULONG Length)
-{
- BUS_HANDLER BusHandler;
- PPCI_COMMON_CONFIG PciData = (PPCI_COMMON_CONFIG)Buffer;
-
- /* Setup fake PCI Bus handler */
- RtlCopyMemory(&BusHandler, &HalpFakePciBusHandler, sizeof(BUS_HANDLER));
- BusHandler.BusNumber = BusNumber;
-
- /* Read configuration data */
- HalpReadPCIConfig(&BusHandler, SlotNumber, Buffer, Offset, Length);
-
- /* Check if caller only wanted at least Vendor ID */
- if (Length >= 2)
- {
- /* Validate it */
- if (PciData->VendorID != PCI_INVALID_VENDORID)
- {
- /* Check if this is the new maximum bus number */
- if (HalpMaxPciBus < BusHandler.BusNumber)
- {
- /* Set it */
- HalpMaxPciBus = BusHandler.BusNumber;
- }
- }
- }
-
- /* Return length */
- return Length;
-}
-
-PPCI_REGISTRY_INFO_INTERNAL
-NTAPI
-HalpQueryPciRegistryInfo(VOID)
-{
- WCHAR NameBuffer[8];
- OBJECT_ATTRIBUTES ObjectAttributes;
- UNICODE_STRING KeyName, ConfigName, IdentName;
- HANDLE KeyHandle, BusKeyHandle;
- NTSTATUS Status;
- UCHAR KeyBuffer[sizeof(PPCI_REGISTRY_INFO) + 100];
- PKEY_VALUE_FULL_INFORMATION ValueInfo = (PVOID)KeyBuffer;
- ULONG ResultLength;
- PWSTR Tag;
- ULONG i;
- PCM_FULL_RESOURCE_DESCRIPTOR FullDescriptor;
- PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor;
- PPCI_REGISTRY_INFO PciRegInfo;
- PPCI_REGISTRY_INFO_INTERNAL PciRegistryInfo;
-
- /* Setup the object attributes for the key */
- RtlInitUnicodeString(&KeyName,
- L"\\Registry\\Machine\\Hardware\\Description\\"
- L"System\\MultiFunctionAdapter");
- InitializeObjectAttributes(&ObjectAttributes,
- &KeyName,
- OBJ_CASE_INSENSITIVE,
- NULL,
- NULL);
-
- /* Open the key */
- Status = ZwOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes);
- if (!NT_SUCCESS(Status)) return NULL;
-
- /* Setup the receiving string */
- KeyName.Buffer = NameBuffer;
- KeyName.MaximumLength = sizeof(NameBuffer);
-
- /* Setup the configuration and identifier key names */
- RtlInitUnicodeString(&ConfigName, L"ConfigurationData");
- RtlInitUnicodeString(&IdentName, L"Identifier");
-
- /* Keep looping for each ID */
- for (i = 0; TRUE; i++)
- {
- /* Setup the key name */
- RtlIntegerToUnicodeString(i, 10, &KeyName);
- InitializeObjectAttributes(&ObjectAttributes,
- &KeyName,
- OBJ_CASE_INSENSITIVE,
- KeyHandle,
- NULL);
-
- /* Open it */
- Status = ZwOpenKey(&BusKeyHandle, KEY_READ, &ObjectAttributes);
- if (!NT_SUCCESS(Status))
- {
- /* None left, fail */
- ZwClose(KeyHandle);
- return NULL;
- }
-
- /* Read the registry data */
- Status = ZwQueryValueKey(BusKeyHandle,
- &IdentName,
- KeyValueFullInformation,
- ValueInfo,
- sizeof(KeyBuffer),
- &ResultLength);
- if (!NT_SUCCESS(Status))
- {
- /* Failed, try the next one */
- ZwClose(BusKeyHandle);
- continue;
- }
-
- /* Get the PCI Tag and validate it */
- Tag = (PWSTR)((ULONG_PTR)ValueInfo + ValueInfo->DataOffset);
- if ((Tag[0] != L'P') ||
- (Tag[1] != L'C') ||
- (Tag[2] != L'I') ||
- (Tag[3]))
- {
- /* Not a valid PCI entry, skip it */
- ZwClose(BusKeyHandle);
- continue;
- }
-
- /* Now read our PCI structure */
- Status = ZwQueryValueKey(BusKeyHandle,
- &ConfigName,
- KeyValueFullInformation,
- ValueInfo,
- sizeof(KeyBuffer),
- &ResultLength);
- ZwClose(BusKeyHandle);
- if (!NT_SUCCESS(Status)) continue;
-
- /* We read it OK! Get the actual resource descriptors */
- FullDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)
- ((ULONG_PTR)ValueInfo + ValueInfo->DataOffset);
- PartialDescriptor = (PCM_PARTIAL_RESOURCE_DESCRIPTOR)
- ((ULONG_PTR)FullDescriptor->
- PartialResourceList.PartialDescriptors);
-
- /* Check if this is our PCI Registry Information */
- if (PartialDescriptor->Type == CmResourceTypeDeviceSpecific)
- {
- /* Close the key */
- ZwClose(KeyHandle);
-
- /* FIXME: Check PnP\PCI\CardList */
-
- /* Get the PCI information */
- PciRegInfo = (PPCI_REGISTRY_INFO)(PartialDescriptor + 1);
-
- /* Allocate the return structure */
- PciRegistryInfo = ExAllocatePoolWithTag(NonPagedPool,
- sizeof(PCI_REGISTRY_INFO_INTERNAL),
- ' laH');
- if (!PciRegistryInfo) return NULL;
-
- /* Fill it out */
- PciRegistryInfo->HardwareMechanism = PciRegInfo->HardwareMechanism;
- PciRegistryInfo->NoBuses = PciRegInfo->NoBuses;
- PciRegistryInfo->MajorRevision = PciRegInfo->MajorRevision;
- PciRegistryInfo->MinorRevision = PciRegInfo->MinorRevision;
- PciRegistryInfo->ElementCount = 0;
- }
- }
-}
-
-VOID
-NTAPI
-HalpInitializePciStubs(VOID)
-{
- PPCI_REGISTRY_INFO_INTERNAL PciRegistryInfo;
- UCHAR PciType;
- PPCIPBUSDATA BusData = (PPCIPBUSDATA)HalpFakePciBusHandler.BusData;
- ULONG i;
- PCI_SLOT_NUMBER j;
- ULONG VendorId = 0;
-
- /* Query registry information */
- PciRegistryInfo = HalpQueryPciRegistryInfo();
- if (!PciRegistryInfo)
- {
- /* Assume type 1 */
- PciType = 1;
- }
- else
- {
- /* Get the type and free the info structure */
- PciType = PciRegistryInfo->HardwareMechanism & 0xF;
- ExFreePool(PciRegistryInfo);
- }
-
- /* Initialize the PCI lock */
- KeInitializeSpinLock(&HalpPCIConfigLock);
-
- /* Check the type of PCI bus */
- switch (PciType)
- {
- /* Type 1 PCI Bus */
- case 1:
-
- /* Copy the Type 1 handler data */
- RtlCopyMemory(&PCIConfigHandler,
- &PCIConfigHandlerType1,
- sizeof(PCIConfigHandler));
-
- /* Set correct I/O Ports */
- BusData->Config.Type1.Address = PCI_TYPE1_ADDRESS_PORT;
- BusData->Config.Type1.Data = PCI_TYPE1_DATA_PORT;
- break;
-
- /* Type 2 PCI Bus */
- case 2:
-
- /* Copy the Type 1 handler data */
- RtlCopyMemory(&PCIConfigHandler,
- &PCIConfigHandlerType2,
- sizeof (PCIConfigHandler));
-
- /* Set correct I/O Ports */
- BusData->Config.Type2.CSE = PCI_TYPE2_CSE_PORT;
- BusData->Config.Type2.Forward = PCI_TYPE2_FORWARD_PORT;
- BusData->Config.Type2.Base = PCI_TYPE2_ADDRESS_BASE;
-
- /* Only 16 devices supported, not 32 */
- BusData->MaxDevice = 16;
- break;
-
- default:
-
- /* Invalid type */
- DbgPrint("HAL: Unnkown PCI type\n");
- }
-
- /* Loop all possible buses */
- for (i = 0; i < 256; i++)
- {
- /* Loop all devices */
- for (j.u.AsULONG = 0; j.u.AsULONG < 32; j.u.AsULONG++)
- {
- /* Query the interface */
- if (HaliPciInterfaceReadConfig(NULL,
- i,
- j,
- &VendorId,
- 0,
- sizeof(ULONG)))
- {
- /* Validate the vendor ID */
- if ((USHORT)VendorId != PCI_INVALID_VENDORID)
- {
- /* Set this as the maximum ID */
- HalpMaxPciBus = i;
- break;
- }
- }
- }
- }
-
- /* We're done */
- HalpPCIConfigInitialized = TRUE;
-}
-
-VOID
-NTAPI
-HalpInitializePciBus(VOID)
-{
- /* Initialize the stubs */
- HalpInitializePciStubs();
-
- /* FIXME: Initialize NMI Crash Flag */
-}
-
-/* EOF */
Modified: trunk/reactos/hal/halx86/hal_generic.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu…
==============================================================================
--- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Fri Oct 30 23:07:26 2009
@@ -6,9 +6,14 @@
<include base="ntoskrnl">include</include>
<define name="_NTHAL_" />
<directory name="generic">
+ <directory name="bus">
+ <file>bushndlr.c</file>
+ <file>isabus.c</file>
+ <file>halbus.c</file>
+ <file>sysbus.c</file>
+ </directory>
<file>beep.c</file>
<file>bios.c</file>
- <file>bus.c</file>
<file>cmos.c</file>
<file>dma.c</file>
<file>drive.c</file>
Modified: trunk/reactos/hal/halx86/hal_generic_amd64.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_amd…
==============================================================================
--- trunk/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] Fri Oct 30 23:07:26
2009
@@ -6,8 +6,13 @@
<include base="ntoskrnl">include</include>
<define name="_NTHAL_" />
<directory name="generic">
+ <directory name="bus">
+ <file>bushndlr.c</file>
+ <file>isabus.c</file>
+ <file>halbus.c</file>
+ <file>sysbus.c</file>
+ </directory>
<file>beep.c</file>
- <file>bus.c</file>
<file>cmos.c</file>
<file>dma.c</file>
<file>drive.c</file>
Modified: trunk/reactos/hal/halx86/hal_generic_pc.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_pc.…
==============================================================================
--- trunk/reactos/hal/halx86/hal_generic_pc.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/hal_generic_pc.rbuild [iso-8859-1] Fri Oct 30 23:07:26 2009
@@ -6,7 +6,9 @@
<include base="ntoskrnl">include</include>
<define name="_NTHAL_" />
<directory name="generic">
- <file>pci.c</file>
+ <directory name="bus">
+ <file>pcibus.c</file>
+ </directory>
</directory>
</module>
</group>
Modified: trunk/reactos/hal/halx86/halxbox.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halxbox.rbuild?…
==============================================================================
--- trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] Fri Oct 30 23:07:26 2009
@@ -11,7 +11,9 @@
<library>hal_generic_up</library>
<library>ntoskrnl</library>
<directory name="generic">
- <file>pci.c</file>
+ <directory name="bus">
+ <file>pcibus.c</file>
+ </directory>
</directory>
<directory name="xbox">
<file>halinit_xbox.c</file>
Modified: trunk/reactos/include/ndk/haltypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/haltypes.h?rev…
==============================================================================
--- trunk/reactos/include/ndk/haltypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/haltypes.h [iso-8859-1] Fri Oct 30 23:07:26 2009
@@ -44,7 +44,7 @@
//
typedef
PBUS_HANDLER
-(NTAPI *pHalHandlerForConfigSpace)(
+(FASTCALL *pHalHandlerForConfigSpace)(
IN BUS_DATA_TYPE ConfigSpace,
IN ULONG BusNumber
);
@@ -101,15 +101,15 @@
//
typedef
NTSTATUS
-(NTAPI *pAdjustResourceList)(
- IN PBUS_HANDLER BusHandler,
- IN ULONG BusNumber,
- IN OUT PCM_RESOURCE_LIST Resources
-);
-
-typedef
-NTSTATUS
-(NTAPI *pAssignSlotResources)(
+(NTAPI *PADJUSTRESOURCELIST)(
+ IN PBUS_HANDLER BusHandler,
+ IN PBUS_HANDLER RootHandler,
+ IN OUT PIO_RESOURCE_REQUIREMENTS_LIST *Resources
+);
+
+typedef
+NTSTATUS
+(NTAPI *PASSIGNSLOTRESOURCES)(
IN PBUS_HANDLER BusHandler,
IN PBUS_HANDLER RootHandler,
IN PUNICODE_STRING RegistryPath,
@@ -122,20 +122,20 @@
typedef
ULONG
-(NTAPI *pGetSetBusData)(
- IN PBUS_HANDLER BusHandler,
- IN PBUS_HANDLER RootHandler,
- IN PCI_SLOT_NUMBER SlotNumber,
- OUT PUCHAR Buffer,
+(NTAPI *PGETSETBUSDATA)(
+ IN PBUS_HANDLER BusHandler,
+ IN PBUS_HANDLER RootHandler,
+ IN ULONG SlotNumber,
+ OUT PVOID Buffer,
IN ULONG Offset,
IN ULONG Length
);
typedef
ULONG
-(NTAPI *pGetInterruptVector)(
- IN PBUS_HANDLER BusHandler,
- IN ULONG BusNumber,
+(NTAPI *PGETINTERRUPTVECTOR)(
+ IN PBUS_HANDLER BusHandler,
+ IN PBUS_HANDLER RootHandler,
IN ULONG BusInterruptLevel,
IN ULONG BusInterruptVector,
OUT PKIRQL Irql,
@@ -143,10 +143,10 @@
);
typedef
-ULONG
-(NTAPI *pTranslateBusAddress)(
- IN PBUS_HANDLER BusHandler,
- IN ULONG BusNumber,
+BOOLEAN
+(NTAPI *PTRANSLATEBUSADDRESS)(
+ IN PBUS_HANDLER BusHandler,
+ IN PBUS_HANDLER RootHandler,
IN PHYSICAL_ADDRESS BusAddress,
IN OUT PULONG AddressSpace,
OUT PPHYSICAL_ADDRESS TranslatedAddress
@@ -187,8 +187,37 @@
} HAL_PRIVATE_DISPATCH, *PHAL_PRIVATE_DISPATCH;
//
+// HAL Supported Range
+//
+#define HAL_SUPPORTED_RANGE_VERSION 1
+typedef struct _SUPPORTED_RANGE
+{
+ struct _SUPPORTED_RANGE *Next;
+ ULONG SystemAddressSpace;
+ LONGLONG SystemBase;
+ LONGLONG Base;
+ LONGLONG Limit;
+} SUPPORTED_RANGE, *PSUPPORTED_RANGE;
+
+typedef struct _SUPPORTED_RANGES
+{
+ USHORT Version;
+ BOOLEAN Sorted;
+ UCHAR Reserved;
+ ULONG NoIO;
+ SUPPORTED_RANGE IO;
+ ULONG NoMemory;
+ SUPPORTED_RANGE Memory;
+ ULONG NoPrefetchMemory;
+ SUPPORTED_RANGE PrefetchMemory;
+ ULONG NoDma;
+ SUPPORTED_RANGE Dma;
+} SUPPORTED_RANGES, *PSUPPORTED_RANGES;
+
+//
// HAL Bus Handler
//
+#define HAL_BUS_HANDLER_VERSION 1
typedef struct _BUS_HANDLER
{
ULONG Version;
@@ -199,15 +228,29 @@
struct _BUS_HANDLER *ParentHandler;
PVOID BusData;
ULONG DeviceControlExtensionSize;
- //PSUPPORTED_RANGES BusAddresses;
+ PSUPPORTED_RANGES BusAddresses;
ULONG Reserved[4];
- pGetSetBusData GetBusData;
- pGetSetBusData SetBusData;
- pAdjustResourceList AdjustResourceList;
- pAssignSlotResources AssignSlotResources;
- pGetInterruptVector GetInterruptVector;
- pTranslateBusAddress TranslateBusAddress;
+ PGETSETBUSDATA GetBusData;
+ PGETSETBUSDATA SetBusData;
+ PADJUSTRESOURCELIST AdjustResourceList;
+ PASSIGNSLOTRESOURCES AssignSlotResources;
+ PGETINTERRUPTVECTOR GetInterruptVector;
+ PTRANSLATEBUSADDRESS TranslateBusAddress;
+ PVOID Spare1;
+ PVOID Spare2;
+ PVOID Spare3;
+ PVOID Spare4;
+ PVOID Spare5;
+ PVOID Spare6;
+ PVOID Spare7;
+ PVOID Spare8;
} BUS_HANDLER;
+
+//
+// HAL Chip Hacks
+//
+#define HAL_PCI_CHIP_HACK_DISABLE_HIBERNATE 0x02
+#define HAL_PCI_CHIP_HACK_USB_SMI_DISABLE 0x08
//
// Kernel Exports