From f150c299f21eb64230b881c93ae396f10500dfce Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Fri, 4 Jun 2010 20:16:26 +0000
Subject: [PATCH] [DDK] Fix definition of USE_DMA_MACROS

svn path=/trunk/; revision=47574
---
 reactos/include/ddk/ntddk.h | 12 ------------
 reactos/include/ddk/wdm.h   | 21 +++++++++------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/reactos/include/ddk/ntddk.h b/reactos/include/ddk/ntddk.h
index 0e02581425d..3a51cd86bd0 100644
--- a/reactos/include/ddk/ntddk.h
+++ b/reactos/include/ddk/ntddk.h
@@ -852,18 +852,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/reactos/include/ddk/wdm.h b/reactos/include/ddk/wdm.h
index 563801bfece..e097c4e1794 100644
--- a/reactos/include/ddk/wdm.h
+++ b/reactos/include/ddk/wdm.h
@@ -124,6 +124,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;
@@ -3698,18 +3707,6 @@ typedef enum _CM_ERROR_CONTROL_TYPE {
 #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
 
 #define CONNECT_FULLY_SPECIFIED         0x1