[ros-diffs] [akhaldi] 61941: [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

Author: akhaldi
Date: Mon Feb  3 00:15:44 2014
New Revision: 61941

URL: http://svn.reactos.org/svn/reactos?rev=61941&view=rev
Log:
[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

Added:
    trunk/reactos/drivers/serial/serial/guid.c   (with props)
Modified:
    trunk/reactos/drivers/serial/serial/CMakeLists.txt
    trunk/reactos/drivers/serial/serial/circularbuffer.c
    trunk/reactos/drivers/serial/serial/cleanup.c
    trunk/reactos/drivers/serial/serial/close.c
    trunk/reactos/drivers/serial/serial/create.c
    trunk/reactos/drivers/serial/serial/devctrl.c
    trunk/reactos/drivers/serial/serial/info.c
    trunk/reactos/drivers/serial/serial/legacy.c
    trunk/reactos/drivers/serial/serial/misc.c
    trunk/reactos/drivers/serial/serial/pnp.c
    trunk/reactos/drivers/serial/serial/power.c
    trunk/reactos/drivers/serial/serial/rw.c
    trunk/reactos/drivers/serial/serial/serial.h

Modified: trunk/reactos/drivers/serial/serial/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/CMake...
==============================================================================
--- trunk/reactos/drivers/serial/serial/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/drivers/serial/serial/CMakeLists.txt	[iso-8859-1] Mon Feb  3 00:15:44 2014
@@ -12,6 +12,7 @@
     power.c
     rw.c
     serial.c
+    guid.c
     serial.rc)

add_pch(serial serial.h)

Modified: trunk/reactos/drivers/serial/serial/circularbuffer.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/circu...
==============================================================================
--- trunk/reactos/drivers/serial/serial/circularbuffer.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/serial/serial/circularbuffer.c	[iso-8859-1] Mon Feb  3 00:15:44 2014
@@ -8,6 +8,8 @@
  */

#include "serial.h"
+
+#include <debug.h>

NTSTATUS
 InitializeCircularBuffer(

Modified: trunk/reactos/drivers/serial/serial/cleanup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/clean...
==============================================================================
--- trunk/reactos/drivers/serial/serial/cleanup.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/serial/serial/cleanup.c	[iso-8859-1] Mon Feb  3 00:15:44 2014
@@ -8,6 +8,8 @@
  */

#include "serial.h"
+
+#include <debug.h>

NTSTATUS NTAPI
 SerialCleanup(

Modified: trunk/reactos/drivers/serial/serial/close.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/close...
==============================================================================
--- trunk/reactos/drivers/serial/serial/close.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/serial/serial/close.c	[iso-8859-1] Mon Feb  3 00:15:44 2014
@@ -8,6 +8,8 @@
  */

#include "serial.h"
+
+#include <debug.h>

NTSTATUS NTAPI
 SerialClose(

Modified: trunk/reactos/drivers/serial/serial/create.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/creat...
==============================================================================
--- trunk/reactos/drivers/serial/serial/create.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/serial/serial/create.c	[iso-8859-1] Mon Feb  3 00:15:44 2014
@@ -8,6 +8,8 @@
  */

#include "serial.h"
+
+#include <debug.h>

NTSTATUS NTAPI
 SerialCreate(

Modified: trunk/reactos/drivers/serial/serial/devctrl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/devct...
==============================================================================
--- trunk/reactos/drivers/serial/serial/devctrl.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/serial/serial/devctrl.c	[iso-8859-1] Mon Feb  3 00:15:44 2014
@@ -8,6 +8,8 @@
  */

#include "serial.h"
+
+#include <debug.h>

#define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003)

Added: trunk/reactos/drivers/serial/serial/guid.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/guid....
==============================================================================
--- trunk/reactos/drivers/serial/serial/guid.c	(added)
+++ trunk/reactos/drivers/serial/serial/guid.c	[iso-8859-1] Mon Feb  3 00:15:44 2014
@@ -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 */

Propchange: trunk/reactos/drivers/serial/serial/guid.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/drivers/serial/serial/info.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/info....
==============================================================================
--- trunk/reactos/drivers/serial/serial/info.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/serial/serial/info.c	[iso-8859-1] Mon Feb  3 00:15:44 2014
@@ -8,6 +8,8 @@
  */

#include "serial.h"
+
+#include <debug.h>

NTSTATUS NTAPI
 SerialQueryInformation(

Modified: trunk/reactos/drivers/serial/serial/legacy.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/legac...
==============================================================================
--- trunk/reactos/drivers/serial/serial/legacy.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/serial/serial/legacy.c	[iso-8859-1] Mon Feb  3 00:15:44 2014
@@ -9,6 +9,8 @@
  */

#include "serial.h"
+
+#include <debug.h>

UART_TYPE
 SerialDetectUartType(

Modified: trunk/reactos/drivers/serial/serial/misc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/misc....
==============================================================================
--- trunk/reactos/drivers/serial/serial/misc.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/serial/serial/misc.c	[iso-8859-1] Mon Feb  3 00:15:44 2014
@@ -10,6 +10,8 @@

#include "serial.h"

+#include <debug.h>
+
 static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion;

static NTSTATUS NTAPI

Modified: trunk/reactos/drivers/serial/serial/pnp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/pnp.c...
==============================================================================
--- trunk/reactos/drivers/serial/serial/pnp.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/serial/serial/pnp.c	[iso-8859-1] Mon Feb  3 00:15:44 2014
@@ -8,8 +8,11 @@
  */
 /* 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(

Modified: trunk/reactos/drivers/serial/serial/power.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/power...
==============================================================================
--- trunk/reactos/drivers/serial/serial/power.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/serial/serial/power.c	[iso-8859-1] Mon Feb  3 00:15:44 2014
@@ -8,6 +8,8 @@
  */

#include "serial.h"
+
+#include <debug.h>

NTSTATUS NTAPI
 SerialPower(

Modified: trunk/reactos/drivers/serial/serial/rw.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/rw.c?...
==============================================================================
--- trunk/reactos/drivers/serial/serial/rw.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/serial/serial/rw.c	[iso-8859-1] Mon Feb  3 00:15:44 2014
@@ -8,6 +8,8 @@
  */

#include "serial.h"
+
+#include <debug.h>

static IO_WORKITEM_ROUTINE SerialReadWorkItem;

Modified: trunk/reactos/drivers/serial/serial/serial.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/seria...
==============================================================================
--- trunk/reactos/drivers/serial/serial/serial.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/serial/serial/serial.h	[iso-8859-1] Mon Feb  3 00:15:44 2014
@@ -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