- miniport.h : Remove VIDEO_ACCESS_RANGE definition.
- ntagp.h : Introduce pragma once, apply a consistent formatting and add some missing definitions.
- video.h : Introduce pragma once, apply a consistent formatting, remove _WINDDI_ guard, group related definitions and add some missing ones.
- videoagp.h : Introduce pragma once and apply a consistent formatting.

svn path=/branches/header-work/; revision=46973
This commit is contained in:
Amine Khaldi 2010-04-21 01:33:08 +00:00
parent 8bb6364e53
commit dde9ac5d8a
4 changed files with 1547 additions and 1277 deletions

View file

@ -46,18 +46,6 @@ typedef struct _EMULATOR_ACCESS_ENTRY {
PVOID Routine;
} EMULATOR_ACCESS_ENTRY, *PEMULATOR_ACCESS_ENTRY;
#ifndef VIDEO_ACCESS_RANGE_DEFINED /* also in video.h */
#define VIDEO_ACCESS_RANGE_DEFINED
typedef struct _VIDEO_ACCESS_RANGE {
PHYSICAL_ADDRESS RangeStart;
ULONG RangeLength;
UCHAR RangeInIoSpace;
UCHAR RangeVisible;
UCHAR RangeShareable;
UCHAR RangePassive;
} VIDEO_ACCESS_RANGE, *PVIDEO_ACCESS_RANGE;
#endif
typedef VOID
(NTAPI *PBANKED_SECTION_ROUTINE)(
IN ULONG ReadBank,

View file

@ -20,86 +20,189 @@
*
*/
#ifndef __NTAGP_H
#define __NTAGP_H
#include "video.h"
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
#define AGP_BUS_INTERFACE_V1 1L
#define AGP_BUS_INTERFACE_V2 2L
DEFINE_GUID(GUID_AGP_BUS_INTERFACE_STANDARD, 0x2ef74803, 0xd8d3, 0x11d1, 0x9c, 0xaa, 0x00, 0xc0, 0xf0, 0x16, 0x56, 0x36);
#define AGP_BUS_INTERFACE_V1 1
#define AGP_BUS_INTERFACE_V2 2
#define AGP_BUS_INTERFACE_V3 3
#define AGP_BUS_INTERFACE_V4 4
#define AGP_BUS_INTERFACE_V5 5
/* Indicates wether the GART supports mapping of physical memory for the CPU */
#define AGP_CAPABILITIES_MAP_PHYSICAL 0x00000001L
#define AGP_CAPABILITIES_MAP_PHYSICAL 0x00000001
#define AGP_CAPABILITIES_CACHE_COHERENT 0x00000002
#define AGP_CAPABILITIES_REQUIRES_GPU_FLUSH 0x00000004
typedef NTSTATUS
(NTAPI *PAGP_BUS_COMMIT_MEMORY)(
IN PVOID AgpContext,
IN PVOID MapHandle,
IN ULONG NumberOfPages,
IN ULONG OffsetInPages,
IN OUT PMDL Mdl OPTIONAL,
OUT PHYSICAL_ADDRESS *MemoryBase);
#define AGP_SET_RATE_DISABLE_SBA 0x00010000
#define AGP_SET_RATE_DISABLE_FW 0x00020000
typedef NTSTATUS
(NTAPI *PAGP_BUS_FREE_MEMORY)(
IN PVOID AgpContext,
IN PVOID MapHandle,
IN ULONG NumberOfPages,
IN ULONG OffsetInPages);
#define AGP_GUARD_PAGE_CHECK_FIRST_ULONG 0x00000001
#define AGP_GUARD_PAGE_CHECK_USE_SAME_OFFSET 0x00000002
#define AGP_GUARD_PAGE_CHECK_DO_NOT_BUGCHECK 0x00000004
typedef NTSTATUS
(NTAPI *PAGP_BUS_RELEASE_MEMORY)(
IN PVOID AgpContext,
IN PVOID MapHandle);
typedef NTSTATUS
(NTAPI *PAGP_BUS_RESERVE_MEMORY)(
IN PVOID AgpContext,
IN ULONG NumberOfPages,
IN MEMORY_CACHING_TYPE MemoryType,
OUT PVOID *MapHandle,
OUT PHYSICAL_ADDRESS *PhysicalAddress OPTIONAL);
#define AGP_BUS_INTERFACE_V1_SIZE (FIELD_OFFSET(AGP_BUS_INTERFACE_STANDARD,SetRate))
#define AGP_BUS_INTERFACE_V2_SIZE (FIELD_OFFSET(AGP_BUS_INTERFACE_STANDARD, AgpSize))
#define AGP_BUS_INTERFACE_V3_SIZE (FIELD_OFFSET(AGP_BUS_INTERFACE_STANDARD, FlushChipsetCaches))
#define AGP_BUS_INTERFACE_V4_SIZE (FIELD_OFFSET(AGP_BUS_INTERFACE_STANDARD, MapMemoryEx))
typedef NTSTATUS
(NTAPI *PAGP_BUS_SET_RATE)(
IN PVOID AgpContext,
IN ULONG AgpRate);
IN PVOID AgpContext,
IN ULONG AgpRate);
typedef NTSTATUS
(NTAPI *PAGP_BUS_RESERVE_MEMORY)(
IN PVOID AgpContext,
IN ULONG NumberOfPages,
IN MEMORY_CACHING_TYPE MemoryType,
OUT PVOID *MapHandle,
OUT PHYSICAL_ADDRESS *PhysicalAddress OPTIONAL);
typedef NTSTATUS
(NTAPI *PAGP_BUS_RELEASE_MEMORY)(
IN PVOID AgpContext,
IN PVOID MapHandle);
typedef NTSTATUS
(NTAPI *PAGP_BUS_COMMIT_MEMORY)(
IN PVOID AgpContext,
IN PVOID MapHandle,
IN ULONG NumberOfPages,
IN ULONG OffsetInPages,
IN OUT PMDL Mdl OPTIONAL,
OUT PHYSICAL_ADDRESS *MemoryBase);
typedef NTSTATUS
(NTAPI *PAGP_BUS_FREE_MEMORY)(
IN PVOID AgpContext,
IN PVOID MapHandle,
IN ULONG NumberOfPages,
IN ULONG OffsetInPages);
typedef NTSTATUS
(NTAPI *PAGP_GET_MAPPED_PAGES)(
IN PVOID AgpContext,
IN PVOID MapHandle,
IN ULONG NumberOfPages,
IN ULONG OffsetInPages,
OUT PMDL Mdl);
IN PVOID AgpContext,
IN PVOID MapHandle,
IN ULONG NumberOfPages,
IN ULONG OffsetInPages,
OUT PMDL Mdl);
typedef NTSTATUS
(NTAPI *PAGP_MAP_MEMORY)(
IN PVOID AgpContext,
IN PVOID MapHandle,
IN ULONG NumberOfPages,
IN ULONG OffsetInPages,
IN PMDL Mdl,
OUT PHYSICAL_ADDRESS *MemoryBase);
typedef NTSTATUS
(NTAPI *PAGP_UNMAP_MEMORY)(
IN PVOID AgpContext,
IN PVOID MapHandle,
IN ULONG NumberOfPages,
IN ULONG OffsetInPages,
IN PMDL Mdl);
typedef NTSTATUS
(NTAPI *PAGP_FLUSH_CHIPSET_CACHES)(
IN PVOID AgpContext);
typedef NTSTATUS
(NTAPI *PAGP_CHECK_INTEGRITY)(
IN PVOID AgpContext);
typedef NTSTATUS
(NTAPI *PAGP_MAP_MEMORY_EX)(
IN PVOID AgpContext,
IN PVOID MapHandle,
IN ULONG NumberOfPages,
IN ULONG OffsetInPages,
IN PMDL Mdl,
IN MEMORY_CACHING_TYPE *CacheTypeOverride OPTIONAL,
OUT PHYSICAL_ADDRESS *MemoryBase);
typedef NTSTATUS
(NTAPI *PAGP_UNMAP_MEMORY_EX)(
IN PVOID AgpContext,
IN PVOID MapHandle,
IN ULONG NumberOfPages,
IN ULONG OffsetInPages,
IN PMDL Mdl);
typedef NTSTATUS
(NTAPI *PAGP_FLUSH_GART_TLB)(
IN PVOID AgpContext);
typedef NTSTATUS
(NTAPI *PAGP_CHECK_GUARD_PAGE)(
IN PVOID AgpContext,
IN ULONG Flags,
IN ULONG ULongsToCheck);
typedef struct _AGP_INFO_COMMON {
PCI_AGP_CAPABILITY MasterCap;
PCI_AGP_CAPABILITY TargetCap;
USHORT DeviceId;
USHORT VendorId;
USHORT SubVendorId;
USHORT SubSystemId;
UCHAR HwRevisionId;
ULONG VerifierFlags;
BOOLEAN GuardPageCorruption;
} AGP_INFO_COMMON, *PAGP_INFO_COMMON;
typedef struct _AGP_INFO_DRIVER {
ULONG AGPReg1;
ULONG AGPReg2;
PHYSICAL_ADDRESS ApertureStart;
PHYSICAL_ADDRESS GartTranslationTable;
ULONG ApertureLength;
} AGP_INFO_DRIVER, *PAGP_INFO_DRIVER;
typedef struct _AGP_INFO {
AGP_INFO_COMMON CommonInfo;
AGP_INFO_DRIVER DriverInfo;
} AGP_INFO, *PAGP_INFO;
typedef VOID
(NTAPI *PAGP_GET_INFO)(
IN PVOID AgpContext,
OUT PAGP_INFO AgpInfo);
typedef struct _AGP_BUS_INTERFACE_STANDARD {
USHORT Size;
USHORT Version;
PVOID AgpContext;
PINTERFACE_REFERENCE InterfaceReference;
PINTERFACE_DEREFERENCE InterfaceDereference;
ULONG Capabilities;
PAGP_BUS_RESERVE_MEMORY ReserveMemory;
PAGP_BUS_RELEASE_MEMORY ReleaseMemory;
PAGP_BUS_COMMIT_MEMORY CommitMemory;
PAGP_BUS_FREE_MEMORY FreeMemory;
PAGP_GET_MAPPED_PAGES GetMappedPages;
PAGP_BUS_SET_RATE SetRate;
USHORT Size;
USHORT Version;
PVOID AgpContext;
PINTERFACE_REFERENCE InterfaceReference;
PINTERFACE_DEREFERENCE InterfaceDereference;
ULONG Capabilities;
PAGP_BUS_RESERVE_MEMORY ReserveMemory;
PAGP_BUS_RELEASE_MEMORY ReleaseMemory;
PAGP_BUS_COMMIT_MEMORY CommitMemory;
PAGP_BUS_FREE_MEMORY FreeMemory;
PAGP_GET_MAPPED_PAGES GetMappedPages;
PAGP_BUS_SET_RATE SetRate;
SIZE_T AgpSize;
PHYSICAL_ADDRESS AgpBase;
PHYSICAL_ADDRESS MaxPhysicalAddress;
PAGP_MAP_MEMORY MapMemory;
PAGP_UNMAP_MEMORY UnMapMemory;
PAGP_FLUSH_CHIPSET_CACHES FlushChipsetCaches;
PAGP_CHECK_INTEGRITY CheckIntegrity;
PAGP_MAP_MEMORY_EX MapMemoryEx;
PAGP_UNMAP_MEMORY_EX UnMapMemoryEx;
PAGP_FLUSH_GART_TLB FlushGartTLB;
PAGP_CHECK_GUARD_PAGE CheckGuardPage;
PAGP_GET_INFO GetAgpInfo;
} AGP_BUS_INTERFACE_STANDARD, *PAGP_BUS_INTERFACE_STANDARD;
#define AGP_BUS_INTERFACE_V2_SIZE sizeof(AGP_BUS_INTERFACE_STANDARD)
#define AGP_BUS_INTERFACE_V1_SIZE \
(AGP_BUS_INTERFACE_V2_SIZE - sizeof(PAGP_BUS_SET_RATE))
#ifdef __cplusplus
}
#endif
#endif /* __NTAGP_H */

File diff suppressed because it is too large Load diff

View file

@ -20,10 +20,7 @@
*
*/
#ifndef __VIDEOAGP_H__
#define __VIDEOAGP_H__
#include "video.h"
#pragma once
#ifdef __cplusplus
extern "C" {
@ -42,82 +39,79 @@ typedef enum _VIDEO_PORT_CACHE_TYPE {
typedef BOOLEAN
(NTAPI *PAGP_COMMIT_PHYSICAL)(
IN PVOID HwDeviceExtension,
IN PVOID PhysicalReserveContext,
IN ULONG Pages,
IN ULONG Offset);
IN PVOID HwDeviceExtension,
IN PVOID PhysicalReserveContext,
IN ULONG Pages,
IN ULONG Offset);
typedef PVOID
(NTAPI *PAGP_COMMIT_VIRTUAL)(
IN PVOID HwDeviceExtension,
IN PVOID VirtualReserveContext,
IN ULONG Pages,
IN ULONG Offset);
IN PVOID HwDeviceExtension,
IN PVOID VirtualReserveContext,
IN ULONG Pages,
IN ULONG Offset);
typedef VOID
(NTAPI *PAGP_FREE_PHYSICAL)(
IN PVOID HwDeviceExtension,
IN PVOID PhysicalReserveContext,
IN ULONG Pages,
IN ULONG Offset);
IN PVOID HwDeviceExtension,
IN PVOID PhysicalReserveContext,
IN ULONG Pages,
IN ULONG Offset);
typedef VOID
(NTAPI *PAGP_FREE_VIRTUAL)(
IN PVOID HwDeviceExtension,
IN PVOID VirtualReserveContext,
IN ULONG Pages,
IN ULONG Offset);
IN PVOID HwDeviceExtension,
IN PVOID VirtualReserveContext,
IN ULONG Pages,
IN ULONG Offset);
typedef VOID
(NTAPI *PAGP_RELEASE_PHYSICAL)(
IN PVOID HwDeviceExtension,
IN PVOID PhysicalReserveContext);
IN PVOID HwDeviceExtension,
IN PVOID PhysicalReserveContext);
typedef VOID
(NTAPI *PAGP_RELEASE_VIRTUAL)(
IN PVOID HwDeviceExtension,
IN PVOID VirtualReserveContext);
IN PVOID HwDeviceExtension,
IN PVOID VirtualReserveContext);
typedef PHYSICAL_ADDRESS
(NTAPI *PAGP_RESERVE_PHYSICAL)(
IN PVOID HwDeviceExtension,
IN ULONG Pages,
IN PVOID HwDeviceExtension,
IN ULONG Pages,
IN VIDEO_PORT_CACHE_TYPE Caching,
OUT PVOID *PhysicalReserveContext);
OUT PVOID *PhysicalReserveContext);
typedef PVOID
(NTAPI *PAGP_RESERVE_VIRTUAL)(
IN PVOID HwDeviceExtension,
IN HANDLE ProcessHandle,
IN PVOID PhysicalReserveContext,
OUT PVOID *VirtualReserveContext);
IN PVOID HwDeviceExtension,
IN HANDLE ProcessHandle,
IN PVOID PhysicalReserveContext,
OUT PVOID *VirtualReserveContext);
typedef BOOLEAN
(NTAPI *PAGP_SET_RATE)(
IN PVOID HwDeviceExtension,
IN ULONG AgpRate);
IN PVOID HwDeviceExtension,
IN ULONG AgpRate);
typedef struct _VIDEO_PORT_AGP_SERVICES {
PAGP_RESERVE_PHYSICAL AgpReservePhysical;
PAGP_RELEASE_PHYSICAL AgpReleasePhysical;
PAGP_COMMIT_PHYSICAL AgpCommitPhysical;
PAGP_FREE_PHYSICAL AgpFreePhysical;
PAGP_RESERVE_VIRTUAL AgpReserveVirtual;
PAGP_RELEASE_VIRTUAL AgpReleaseVirtual;
PAGP_COMMIT_VIRTUAL AgpCommitVirtual;
PAGP_FREE_VIRTUAL AgpFreeVirtual;
ULONGLONG AllocationLimit;
PAGP_RESERVE_PHYSICAL AgpReservePhysical;
PAGP_RELEASE_PHYSICAL AgpReleasePhysical;
PAGP_COMMIT_PHYSICAL AgpCommitPhysical;
PAGP_FREE_PHYSICAL AgpFreePhysical;
PAGP_RESERVE_VIRTUAL AgpReserveVirtual;
PAGP_RELEASE_VIRTUAL AgpReleaseVirtual;
PAGP_COMMIT_VIRTUAL AgpCommitVirtual;
PAGP_FREE_VIRTUAL AgpFreeVirtual;
ULONGLONG AllocationLimit;
} VIDEO_PORT_AGP_SERVICES, *PVIDEO_PORT_AGP_SERVICES;
VPAPI
BOOLEAN
NTAPI
VideoPortGetAgpServices(
IN PVOID HwDeviceExtension,
IN PVIDEO_PORT_AGP_SERVICES AgpServices);
IN PVOID HwDeviceExtension,
IN PVIDEO_PORT_AGP_SERVICES AgpServices);
#ifdef __cplusplus
}
#endif
#endif /* __VIDEOAGP_H__ */