[akhaldi] 61938: [NDIS] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

Author: akhaldi
Date: Mon Feb  3 00:03:57 2014
New Revision: 61938

URL: http://svn.reactos.org/svn/reactos?rev=61938&view=rev
Log:
[NDIS]
* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

Modified:
    trunk/reactos/drivers/network/ndis/include/buffer.h
    trunk/reactos/drivers/network/ndis/include/miniport.h
    trunk/reactos/drivers/network/ndis/include/ndissys.h
    trunk/reactos/drivers/network/ndis/ndis/30stubs.c
    trunk/reactos/drivers/network/ndis/ndis/40stubs.c
    trunk/reactos/drivers/network/ndis/ndis/50stubs.c
    trunk/reactos/drivers/network/ndis/ndis/buffer.c
    trunk/reactos/drivers/network/ndis/ndis/cm.c
    trunk/reactos/drivers/network/ndis/ndis/co.c
    trunk/reactos/drivers/network/ndis/ndis/config.c
    trunk/reactos/drivers/network/ndis/ndis/control.c
    trunk/reactos/drivers/network/ndis/ndis/io.c
    trunk/reactos/drivers/network/ndis/ndis/main.c
    trunk/reactos/drivers/network/ndis/ndis/memory.c
    trunk/reactos/drivers/network/ndis/ndis/miniport.c
    trunk/reactos/drivers/network/ndis/ndis/object.c
    trunk/reactos/drivers/network/ndis/ndis/string.c
    trunk/reactos/drivers/network/ndis/ndis/time.c

Modified: trunk/reactos/drivers/network/ndis/include/buffer.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu…
==============================================================================
--- trunk/reactos/drivers/network/ndis/include/buffer.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/include/buffer.h	[iso-8859-1] Mon Feb  3 00:03:57
2014
@@ -6,9 +6,6 @@
  */
 
 #pragma once
-
-#include "ndissys.h"
-
 
 /* FIXME: Possibly move this to ntddk.h */
 typedef struct _NETWORK_HEADER

Modified: trunk/reactos/drivers/network/ndis/include/miniport.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu…
==============================================================================
--- trunk/reactos/drivers/network/ndis/include/miniport.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/include/miniport.h	[iso-8859-1] Mon Feb  3 00:03:57
2014
@@ -6,9 +6,6 @@
  */
 
 #pragma once
-
-#include <ndis.h>
-#include <ndissys.h>
 
 struct _ADAPTER_BINDING;
 

Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu…
==============================================================================
--- trunk/reactos/drivers/network/ndis/include/ndissys.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/include/ndissys.h	[iso-8859-1] Mon Feb  3 00:03:57
2014
@@ -10,15 +10,9 @@
 #ifndef __NDISSYS_H
 #define __NDISSYS_H
 
-#include <ntifs.h>
 #include <ndis.h>
-#include <xfilter.h>
-#include <afilter.h>
-#include <atm.h>
-#include <ndistapi.h>
-#include <ndisguid.h>
-#include <debug.h>
 
+#include "debug.h"
 #include "miniport.h"
 #include "protocol.h"
 #include "efilter.h"
@@ -68,5 +62,3 @@
 #endif
 
 #endif /* __NDISSYS_H */
-
-/* EOF */

Modified: trunk/reactos/drivers/network/ndis/ndis/30stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/30stubs.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/30stubs.c	[iso-8859-1] Mon Feb  3 00:03:57
2014
@@ -10,6 +10,7 @@
 
 #include "ndissys.h"
 
+#include <afilter.h>
 
 /*
  * @unimplemented

Modified: trunk/reactos/drivers/network/ndis/ndis/40stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/40stubs.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/40stubs.c	[iso-8859-1] Mon Feb  3 00:03:57
2014
@@ -9,7 +9,6 @@
  */
 
 #include "ndissys.h"
-
 
 /*
  * @unimplemented

Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/50stubs.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c	[iso-8859-1] Mon Feb  3 00:03:57
2014
@@ -9,6 +9,8 @@
  */
 
 #include "ndissys.h"
+
+#include <atm.h>
 
 /*
  * @unimplemented

Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/buffer.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/buffer.c	[iso-8859-1] Mon Feb  3 00:03:57
2014
@@ -9,7 +9,6 @@
  */
 
 #include <ndissys.h>
-
 
 __inline ULONG SkipToOffset(
     IN PNDIS_BUFFER Buffer,

Modified: trunk/reactos/drivers/network/ndis/ndis/cm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/cm.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/cm.c	[iso-8859-1] Mon Feb  3 00:03:57 2014
@@ -10,7 +10,6 @@
 
 #include "ndissys.h"
 
-
 /*
  * @unimplemented
  */

Modified: trunk/reactos/drivers/network/ndis/ndis/co.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/co.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/co.c	[iso-8859-1] Mon Feb  3 00:03:57 2014
@@ -10,6 +10,8 @@
 
 #include "ndissys.h"
 
+#include <ndistapi.h>
+
 /*
  * @unimplemented
  */

Modified: trunk/reactos/drivers/network/ndis/ndis/config.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/config.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/config.c	[iso-8859-1] Mon Feb  3 00:03:57
2014
@@ -33,6 +33,8 @@
 
 #include "ndissys.h"
 
+#include <ntifs.h>
+
 #define PARAMETERS_KEY L"Parameters"     /* The parameters subkey under the
device-specific key */
 
 /*

Modified: trunk/reactos/drivers/network/ndis/ndis/control.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/control.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/control.c	[iso-8859-1] Mon Feb  3 00:03:57
2014
@@ -310,4 +310,3 @@
 }
 
 /* EOF */
-

Modified: trunk/reactos/drivers/network/ndis/ndis/io.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/io.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/io.c	[iso-8859-1] Mon Feb  3 00:03:57 2014
@@ -1256,4 +1256,3 @@
 
 
 /* EOF */
-

Modified: trunk/reactos/drivers/network/ndis/ndis/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/main.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/main.c	[iso-8859-1] Mon Feb  3 00:03:57 2014
@@ -12,7 +12,6 @@
  */
 
 #include "ndissys.h"
-
 
 #if DBG
 
@@ -133,4 +132,3 @@
 }
 
 /* EOF */
-

Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/memory.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/memory.c	[iso-8859-1] Mon Feb  3 00:03:57
2014
@@ -418,4 +418,3 @@
 
 
 /* EOF */
-

Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/miniport.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/miniport.c	[iso-8859-1] Mon Feb  3 00:03:57
2014
@@ -12,6 +12,8 @@
  */
 
 #include "ndissys.h"
+
+#include <ndisguid.h>
 
 /*
  * Define to 1 to get a debugger breakpoint at the end of NdisInitializeWrapper
@@ -3345,4 +3347,3 @@
 }
 
 /* EOF */
-

Modified: trunk/reactos/drivers/network/ndis/ndis/object.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/object.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/object.c	[iso-8859-1] Mon Feb  3 00:03:57
2014
@@ -37,4 +37,3 @@
 {
   ExFreePool(NdisGenericObject);
 }
-

Modified: trunk/reactos/drivers/network/ndis/ndis/string.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/string.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/string.c	[iso-8859-1] Mon Feb  3 00:03:57
2014
@@ -200,4 +200,3 @@
 }
 
 /* EOF */
-

Modified: trunk/reactos/drivers/network/ndis/ndis/time.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/time.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/time.c	[iso-8859-1] Mon Feb  3 00:03:57 2014
@@ -359,4 +359,3 @@
 }
 
 /* EOF */
-