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

Author: akhaldi
Date: Mon Jan 27 12:29:29 2014
New Revision: 61852

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

Modified:
    trunk/reactos/drivers/base/condrv/condrv.c
    trunk/reactos/drivers/base/condrv/condrv.h
    trunk/reactos/drivers/base/condrv/control.c

Modified: trunk/reactos/drivers/base/condrv/condrv.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/condrv/condrv....
==============================================================================
--- trunk/reactos/drivers/base/condrv/condrv.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/base/condrv/condrv.c	[iso-8859-1] Mon Jan 27 12:29:29 2014
@@ -12,7 +12,6 @@

#define NDEBUG
 #include <debug.h>
-

/* FUNCTIONS ******************************************************************/

Modified: trunk/reactos/drivers/base/condrv/condrv.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/condrv/condrv....
==============================================================================
--- trunk/reactos/drivers/base/condrv/condrv.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/base/condrv/condrv.h	[iso-8859-1] Mon Jan 27 12:29:29 2014
@@ -17,26 +17,18 @@
     #include "VisualDDKHelpers.h"
 #endif

-
-#include <ntddk.h>
-#include <condrv/ntddcon.h>
-
+#include <wdm.h>

#define CONDRV_TAG      ' noC'
 #define DD_CONDRV_TAG   '1noC'
 #define CONDRV_CONS_TAG '2noC'

-
-//
-// Console Driver object extension
-//
+/* Console Driver object extension */
 typedef struct _CONDRV_DRIVER
 {
     UNICODE_STRING RegistryPath;
     PDEVICE_OBJECT Controller; // The unique Controller device for the driver.
 } CONDRV_DRIVER, *PCONDRV_DRIVER;
-
-

NTSTATUS NTAPI
 ConDrvCreateController(IN PDRIVER_OBJECT DriverObject,
@@ -44,7 +36,4 @@
 NTSTATUS NTAPI
 ConDrvDeleteController(IN PDRIVER_OBJECT DriverObject);

-
 #endif // __CONDRV_H__
-
-/* EOF */

Modified: trunk/reactos/drivers/base/condrv/control.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/condrv/control...
==============================================================================
--- trunk/reactos/drivers/base/condrv/control.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/base/condrv/control.c	[iso-8859-1] Mon Jan 27 12:29:29 2014
@@ -10,9 +10,10 @@

#include "condrv.h"

+#include <condrv/ntddcon.h>
+
 #define NDEBUG
 #include <debug.h>
-

/* FUNCTIONS ******************************************************************/