[SERIAL]

* Do not include debug.h into the main header.
* Remove one time inclusions from the main header and put them back where they belong.
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61941

reactos/drivers/serial/serial/CMakeLists.txt

@@ -12,6 +12,7 @@ add_library(serial SHARED
     power.c
     rw.c
     serial.c
+    guid.c
     serial.rc)
 
 add_pch(serial serial.h)

reactos/drivers/serial/serial/circularbuffer.c

@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS
 InitializeCircularBuffer(
 	IN PCIRCULAR_BUFFER pBuffer,

reactos/drivers/serial/serial/cleanup.c

@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialCleanup(
 	IN PDEVICE_OBJECT DeviceObject,

reactos/drivers/serial/serial/close.c

@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialClose(
 	IN PDEVICE_OBJECT DeviceObject,

reactos/drivers/serial/serial/create.c

@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialCreate(
 	IN PDEVICE_OBJECT DeviceObject,

reactos/drivers/serial/serial/devctrl.c

@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003)
 
 static VOID

reactos/drivers/serial/serial/guid.c

@@ -0,0 +1,7 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <ntdef.h>
+#include <initguid.h>
+#include <ntddser.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

reactos/drivers/serial/serial/info.c

@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialQueryInformation(
 	IN PDEVICE_OBJECT DeviceObject,

reactos/drivers/serial/serial/legacy.c

@@ -10,6 +10,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 UART_TYPE
 SerialDetectUartType(
 	IN PUCHAR BaseAddress)

reactos/drivers/serial/serial/misc.c

@@ -10,6 +10,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion;
 
 static NTSTATUS NTAPI

reactos/drivers/serial/serial/pnp.c

@@ -8,9 +8,12 @@
  */
 /* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */
 
-#define INITGUID
 #include "serial.h"
 
+#include <stdio.h>
+#include <ndk/haltypes.h>
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialAddDeviceInternal(
 	IN PDRIVER_OBJECT DriverObject,

reactos/drivers/serial/serial/power.c

@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialPower(
 	IN PDEVICE_OBJECT DeviceObject,

reactos/drivers/serial/serial/rw.c

@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 static IO_WORKITEM_ROUTINE SerialReadWorkItem;
 
 static PVOID

reactos/drivers/serial/serial/serial.h

@@ -8,10 +8,7 @@
  */
 
 #include <ntddk.h>
-#include <ndk/haltypes.h>
 #include <ntddser.h>
-#include <stdio.h>
-#include <debug.h>
 
 /* See winbase.h */
 #define PST_RS232 1