[ros-diffs] [akhaldi] 61854: [CMBATT] * 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....

Author: akhaldi
Date: Mon Jan 27 22:55:47 2014
New Revision: 61854

URL: http://svn.reactos.org/svn/reactos?rev=61854&view=rev
Log:
[CMBATT]
* 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/cmbatt/guid.c   (with props)
Modified:
    trunk/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt
    trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.c
    trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.h
    trunk/reactos/drivers/bus/acpi/cmbatt/cmbwmi.c
    trunk/reactos/drivers/bus/acpi/cmbatt/cmexec.c

Modified: trunk/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/CM…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/cmbatt/CMakeLists.txt	[iso-8859-1] Mon Jan 27 22:55:47
2014
@@ -4,6 +4,7 @@
     cmexec.c
     cmbpnp.c
     cmbwmi.c
+    guid.c
     cmbatt.rc)
 
 add_library(cmbatt SHARED ${SOURCE})

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

Modified: trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/cm…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/cmbatt/cmbatt.h	[iso-8859-1] Mon Jan 27 22:55:47 2014
@@ -6,13 +6,10 @@
  * PROGRAMMERS:     ReactOS Portable Systems Group
  */
 
-#include <ntddk.h>
-#include <initguid.h>
+#include <wdm.h>
 #include <batclass.h>
-#include <acpiioct.h>
 #include <wmilib.h>
 #include <wdmguid.h>
-#include <debug.h>
 
 #define IOCTL_BATTERY_QUERY_UNIQUE_ID  \
     CTL_CODE(FILE_DEVICE_BATTERY, 0x101, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x294404 

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

Modified: trunk/reactos/drivers/bus/acpi/cmbatt/cmexec.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/cm…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/cmbatt/cmexec.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/cmbatt/cmexec.c	[iso-8859-1] Mon Jan 27 22:55:47 2014
@@ -9,6 +9,9 @@
 /* INCLUDES *******************************************************************/
 
 #include "cmbatt.h"
+
+#include <acpiioct.h>
+#include <debug.h>
 
 /* FUNCTIONS ******************************************************************/
 

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

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