From 3e3a1652c1800288de5b39403ac841ccf7848966 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 10 Apr 2010 11:32:36 +0000
Subject: [PATCH] [XDK] - 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
---
 include/xdk/iotypes.h      | 26 --------------------------
 include/xdk/wdm.template.h | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/include/xdk/iotypes.h b/include/xdk/iotypes.h
index 09ff65a8052..b2a16ccd0ea 100644
--- a/include/xdk/iotypes.h
+++ b/include/xdk/iotypes.h
@@ -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,
diff --git a/include/xdk/wdm.template.h b/include/xdk/wdm.template.h
index 1005bf13d94..7181ca7f764 100644
--- a/include/xdk/wdm.template.h
+++ b/include/xdk/wdm.template.h
@@ -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;