[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

diff --git a/reactos/drivers/serial/serial/CMakeLists.txt b/reactos/drivers/serial/serial/CMakeLists.txt
index 6bea2c8..6e3e1d9 100644 (file)
--- a/reactos/drivers/serial/serial/CMakeLists.txt
+++ b/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)

diff --git a/reactos/drivers/serial/serial/circularbuffer.c b/reactos/drivers/serial/serial/circularbuffer.c
index 2f7a97d..23a7d55 100644 (file)
--- a/reactos/drivers/serial/serial/circularbuffer.c
+++ b/reactos/drivers/serial/serial/circularbuffer.c
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS
 InitializeCircularBuffer(
        IN PCIRCULAR_BUFFER pBuffer,

diff --git a/reactos/drivers/serial/serial/cleanup.c b/reactos/drivers/serial/serial/cleanup.c
index 96f7240..925eba6 100644 (file)
--- a/reactos/drivers/serial/serial/cleanup.c
+++ b/reactos/drivers/serial/serial/cleanup.c
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialCleanup(
        IN PDEVICE_OBJECT DeviceObject,

diff --git a/reactos/drivers/serial/serial/close.c b/reactos/drivers/serial/serial/close.c
index f5dc747..704416b 100644 (file)
--- a/reactos/drivers/serial/serial/close.c
+++ b/reactos/drivers/serial/serial/close.c
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialClose(
        IN PDEVICE_OBJECT DeviceObject,

diff --git a/reactos/drivers/serial/serial/create.c b/reactos/drivers/serial/serial/create.c
index 8a03ae3..89e2bb6 100644 (file)
--- a/reactos/drivers/serial/serial/create.c
+++ b/reactos/drivers/serial/serial/create.c
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialCreate(
        IN PDEVICE_OBJECT DeviceObject,

diff --git a/reactos/drivers/serial/serial/devctrl.c b/reactos/drivers/serial/serial/devctrl.c
index d89eaec..b7f056d 100644 (file)
--- a/reactos/drivers/serial/serial/devctrl.c
+++ b/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

diff --git a/reactos/drivers/serial/serial/guid.c b/reactos/drivers/serial/serial/guid.c
new file mode 100644 (file)
index 0000000..4fa09ff
--- /dev/null
+++ b/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 */

diff --git a/reactos/drivers/serial/serial/info.c b/reactos/drivers/serial/serial/info.c
index 2ebe6b0..d2804bf 100644 (file)
--- a/reactos/drivers/serial/serial/info.c
+++ b/reactos/drivers/serial/serial/info.c
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialQueryInformation(
        IN PDEVICE_OBJECT DeviceObject,

diff --git a/reactos/drivers/serial/serial/legacy.c b/reactos/drivers/serial/serial/legacy.c
index 7e1fdf2..7b887da 100644 (file)
--- a/reactos/drivers/serial/serial/legacy.c
+++ b/reactos/drivers/serial/serial/legacy.c
@@ -10,6 +10,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 UART_TYPE
 SerialDetectUartType(
        IN PUCHAR BaseAddress)

diff --git a/reactos/drivers/serial/serial/misc.c b/reactos/drivers/serial/serial/misc.c
index b72ccd9..b684c36 100644 (file)
--- a/reactos/drivers/serial/serial/misc.c
+++ b/reactos/drivers/serial/serial/misc.c
@@ -10,6 +10,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion;
 
 static NTSTATUS NTAPI

diff --git a/reactos/drivers/serial/serial/pnp.c b/reactos/drivers/serial/serial/pnp.c
index 80fc061..15c0ff4 100644 (file)
--- a/reactos/drivers/serial/serial/pnp.c
+++ b/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,

diff --git a/reactos/drivers/serial/serial/power.c b/reactos/drivers/serial/serial/power.c
index 21297e2..1043a75 100644 (file)
--- a/reactos/drivers/serial/serial/power.c
+++ b/reactos/drivers/serial/serial/power.c
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialPower(
        IN PDEVICE_OBJECT DeviceObject,

diff --git a/reactos/drivers/serial/serial/rw.c b/reactos/drivers/serial/serial/rw.c
index 716e34b..df101ca 100644 (file)
--- a/reactos/drivers/serial/serial/rw.c
+++ b/reactos/drivers/serial/serial/rw.c
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 static IO_WORKITEM_ROUTINE SerialReadWorkItem;
 
 static PVOID

diff --git a/reactos/drivers/serial/serial/serial.h b/reactos/drivers/serial/serial/serial.h
index 98da08b..6d878c2 100644 (file)
--- a/reactos/drivers/serial/serial/serial.h
+++ b/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