[ros-diffs] [akhaldi] 61855: [COMPBATT] * Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belon...

Author: akhaldi
Date: Mon Jan 27 23:11:48 2014
New Revision: 61855

URL: http://svn.reactos.org/svn/reactos?rev=61855&view=rev
Log:
[COMPBATT]
* Do not include debug.h from within the main header.
* Improve the GUIDs situation.
* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

Added:
    trunk/reactos/drivers/bus/acpi/compbatt/guid.c   (with props)
Modified:
    trunk/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt
    trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c
    trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h
    trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c

Modified: trunk/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/compbatt/CMakeLists.txt	[iso-8859-1] Mon Jan 27
23:11:48 2014
@@ -3,6 +3,7 @@
     compbatt.c
     compmisc.c
     comppnp.c
+    guid.c
     compbatt.rc)
 
 add_library(compbatt SHARED ${SOURCE})

Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c	[iso-8859-1] Mon Jan 27 23:11:48
2014
@@ -9,6 +9,8 @@
 /* INCLUDES *******************************************************************/
 
 #include "compbatt.h"
+
+#include <debug.h>
 
 /* GLOBALS ********************************************************************/
 

Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h	[iso-8859-1] Mon Jan 27 23:11:48
2014
@@ -6,11 +6,8 @@
  * PROGRAMMERS:     ReactOS Portable Systems Group
  */
 
-#include <ntddk.h>
-#include <initguid.h>
+#include <wdm.h>
 #include <batclass.h>
-#include <debug.h>
-#include <wdmguid.h>
 
 #define COMPBATT_BATTERY_INFORMATION_PRESENT    0x04
 #define COMPBATT_TAG_ASSIGNED                   0x80

Modified: trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c	[iso-8859-1] Mon Jan 27 23:11:48
2014
@@ -9,6 +9,8 @@
 /* INCLUDES *******************************************************************/
 
 #include "compbatt.h"
+
+#include <wdmguid.h>
 
 /* FUNCTIONS ******************************************************************/
 

Added: trunk/reactos/drivers/bus/acpi/compbatt/guid.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/compbatt/guid.c	(added)
+++ trunk/reactos/drivers/bus/acpi/compbatt/guid.c	[iso-8859-1] Mon Jan 27 23:11:48 2014
@@ -0,0 +1,8 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <wdm.h>
+#include <initguid.h>
+#include <wdmguid.h>
+#include <batclass.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

Propchange: trunk/reactos/drivers/bus/acpi/compbatt/guid.c
------------------------------------------------------------------------------
    svn:eol-style = native