[ros-diffs] [tkreuzer] 46810: [XDK] - Move WDM version defines to wdm.template.h - Move USE_DMA_MACROS / NO_LEGACY_DRIVERS to wdm.template.h, remove duplicate

[tkreuzer]

Author: tkreuzer
Date: Sat Apr 10 13:32:36 2010
New Revision: 46810

URL: http://svn.reactos.org/svn/reactos?rev=46810&view=rev
Log:
[XDK]
- Move WDM version defines to wdm.template.h
- Move USE_DMA_MACROS / NO_LEGACY_DRIVERS to wdm.template.h, remove duplicate

Modified:
    branches/header-work/include/xdk/iotypes.h
    branches/header-work/include/xdk/wdm.template.h

Modified: branches/header-work/include/xdk/iotypes.h
URL: 
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/iotypes.h?rev=46810&r1=46809&r2=46810&view=diff
==============================================================================
--- branches/header-work/include/xdk/iotypes.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/iotypes.h [iso-8859-1] Sat Apr 10 13:32:36 
2010
@@ -5,20 +5,6 @@
 $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 @@
   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,

Modified: branches/header-work/include/xdk/wdm.template.h
URL: 
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/wdm.template.h?rev=46810&r1=46809&r2=46810&view=diff
==============================================================================
--- branches/header-work/include/xdk/wdm.template.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/wdm.template.h [iso-8859-1] Sat Apr 10 
13:32:36 2010
@@ -24,6 +24,9 @@
 
 #ifndef _WDMDDK_
 #define _WDMDDK_
+
+#define WDM_MAJORVERSION        0x06
+#define WDM_MINORVERSION        0x00
 
 /* Included via ntddk.h? */
 #ifndef _NTDDK_
@@ -123,6 +126,15 @@
 #endif
 
 #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;
@@ -153,7 +165,7 @@
 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;