- Move WDM version defines to wdm.template.h
- Move USE_DMA_MACROS / NO_LEGACY_DRIVERS to wdm.template.h, remove duplicate

svn path=/branches/header-work/; revision=46810
This commit is contained in:
Timo Kreuzer 2010-04-10 11:32:36 +00:00
parent f0e3db2b34
commit 3e3a1652c1
2 changed files with 13 additions and 27 deletions

View file

@ -5,20 +5,6 @@ $if (_WDMDDK_ || _NTDDK_)
$endif
$if (_WDMDDK_)
#define WDM_MAJORVERSION 0x06
#define WDM_MINORVERSION 0x00
#if defined(_WIN64)
#ifndef USE_DMA_MACROS
#define USE_DMA_MACROS
#endif
#ifndef NO_LEGACY_DRIVERS
#define NO_LEGACY_DRIVERS
#endif
#endif /* defined(_WIN64) */
#define STATUS_CONTINUE_COMPLETION STATUS_SUCCESS
@ -4648,18 +4634,6 @@ typedef union _PCI_EXPRESS_PME_REQUESTOR_ID {
USHORT AsUSHORT;
} PCI_EXPRESS_PME_REQUESTOR_ID, *PPCI_EXPRESS_PME_REQUESTOR_ID;
#if defined(_WIN64)
#ifndef USE_DMA_MACROS
#define USE_DMA_MACROS
#endif
#ifndef NO_LEGACY_DRIVERS
#define NO_LEGACY_DRIVERS
#endif
#endif /* defined(_WIN64) */
typedef enum _PHYSICAL_COUNTER_RESOURCE_DESCRIPTOR_TYPE {
ResourceTypeSingle = 0,
ResourceTypeRange,

View file

@ -25,6 +25,9 @@
#ifndef _WDMDDK_
#define _WDMDDK_
#define WDM_MAJORVERSION 0x06
#define WDM_MINORVERSION 0x00
/* Included via ntddk.h? */
#ifndef _NTDDK_
#define _NTDDK_
@ -124,6 +127,15 @@ extern "C" {
#endif
#if defined(_WIN64)
#if !defined(USE_DMA_MACROS) && !defined(_NTHAL_)
#define USE_DMA_MACROS
#endif
#ifndef NO_LEGACY_DRIVERS
#define NO_LEGACY_DRIVERS
#endif
#endif /* defined(_WIN64) */
/* Forward declarations */
struct _IRP;
struct _MDL;
@ -153,7 +165,7 @@ typedef struct _KPROCESS *PKPROCESS;
typedef struct _KTHREAD *PKTHREAD, *PRKTHREAD;
typedef struct _CONTEXT *PCONTEXT;
#if defined(USE_DMA_MACROS) && !defined(_NTHAL_) && ( defined(_NTDDK_) || defined(_NTDRIVER_) || defined(_NTOSP_))
#if defined(USE_DMA_MACROS) && !defined(_NTHAL_)
typedef struct _DMA_ADAPTER *PADAPTER_OBJECT;
#elif defined(_WDM_INCLUDED_)
typedef struct _DMA_ADAPTER *PADAPTER_OBJECT;