[akhaldi] 61944: [CDROM_NEW] * Move some inclusions to the main header. * Improve header inclusions. * Remove inclusions and definitions that already exist in the main header. * Improve the GUIDs s...

Author: akhaldi
Date: Mon Feb  3 10:39:05 2014
New Revision: 61944

URL: http://svn.reactos.org/svn/reactos?rev=61944&view=rev
Log:
[CDROM_NEW]
* Move some inclusions to the main header.
* Improve header inclusions.
* Remove inclusions and definitions that already exist in the main header.
* Improve the GUIDs situation.
CORE-7716

Removed:
    trunk/reactos/drivers/storage/class/cdrom_new/sec.h
Modified:
    trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt
    trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c
    trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h
    trunk/reactos/drivers/storage/class/cdrom_new/data.c
    trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c
    trunk/reactos/drivers/storage/class/cdrom_new/mmc.c
    trunk/reactos/drivers/storage/class/cdrom_new/sec.c
    trunk/reactos/drivers/storage/class/cdrom_new/trace.h

Modified: trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt	[iso-8859-1] Mon Feb  3
10:39:05 2014
@@ -1,4 +1,5 @@
-include_directories(..)
+
+include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/class)
 
 list(APPEND SOURCE
     cdrom.c

Modified: trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c	[iso-8859-1] Mon Feb  3 10:39:05
2014
@@ -24,16 +24,6 @@
 
 --*/
 
-#include "stddef.h"
-#include "string.h"
-
-#include "ntddk.h"
-#include "initguid.h"
-
-#include "ntddcdvd.h"
-#include "classpnp.h"
-
-#include "ntddstor.h"
 #include "cdrom.h"
 
 #ifdef ALLOC_PRAGMA

Modified: trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h	[iso-8859-1] Mon Feb  3 10:39:05
2014
@@ -28,7 +28,11 @@
 #ifndef __CDROMP_H__
 #define __CDROMP_H__
 
-#include "ntddmmc.h"
+#include <ntddk.h>
+#include <ntddcdvd.h>
+#include <classpnp.h>
+#include <ntddmmc.h>
+
 #include "trace.h"
 
 extern CLASSPNP_SCAN_FOR_SPECIAL_INFO CdromHackItems[];
@@ -872,4 +876,4 @@
     IN BOOLEAN CalledFromWorkItem
     );
 
-#endif // __CDROMP_H__
+#endif /* __CDROMP_H__ */

Modified: trunk/reactos/drivers/storage/class/cdrom_new/data.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom_new/data.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/cdrom_new/data.c	[iso-8859-1] Mon Feb  3 10:39:05
2014
@@ -17,9 +17,7 @@
 
 --*/
 
-#include "ntddk.h"
-#include "classpnp.h"
-#include "trace.h"
+#include "cdrom.h"
 
 #ifdef ALLOC_DATA_PRAGMA
 #pragma data_seg("PAGE")

Modified: trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c	[iso-8859-1] Mon Feb  3 10:39:05
2014
@@ -24,18 +24,7 @@
 
 --*/
 
-#include "stddef.h"
-#include "string.h"
-
-#include "ntddk.h"
-
-#include "ntddcdvd.h"
-#include "classpnp.h"
-
-#include "initguid.h"
-#include "ntddstor.h"
 #include "cdrom.h"
-
 
 #if DBG
     PUCHAR READ_DVD_STRUCTURE_FORMAT_STRINGS[DvdMaxDescriptor+1] = {

Modified: trunk/reactos/drivers/storage/class/cdrom_new/mmc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom_new/mmc.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/cdrom_new/mmc.c	[iso-8859-1] Mon Feb  3 10:39:05
2014
@@ -24,8 +24,6 @@
 
 --*/
 
-#include "ntddk.h"
-#include "classpnp.h"
 #include "cdrom.h"
 
 NTSTATUS

Modified: trunk/reactos/drivers/storage/class/cdrom_new/sec.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom_new/sec.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/cdrom_new/sec.c	[iso-8859-1] Mon Feb  3 10:39:05
2014
@@ -4,8 +4,7 @@
 
 --*/
 
-
-#include "sec.h"
+#include "cdrom.h"
 
 NTSTATUS
 NTAPI

Removed: trunk/reactos/drivers/storage/class/cdrom_new/sec.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom_new/sec.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/cdrom_new/sec.h	(removed)
@@ -1,9 +0,0 @@
-/*--
-
-Copyright (C) Microsoft Corporation, 1999
-
---*/
-
-#include "ntddk.h"
-#include "classpnp.h"
-#include "cdrom.h"

Modified: trunk/reactos/drivers/storage/class/cdrom_new/trace.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom_new/trace.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/cdrom_new/trace.h	[iso-8859-1] Mon Feb  3 10:39:05
2014
@@ -8,6 +8,7 @@
 
 */
 
+#pragma once
 
 #define TraceLogger(x, ...)   DbgPrint(__VA_ARGS__)
 #define TraceLog(x) TraceLogger x
@@ -49,5 +50,3 @@
         WPP_DEFINE_BIT(CdromSecError)           /* bit 30 = 0x00000000 */ \
         WPP_DEFINE_BIT(CdromSecInfo)            /* bit 31 = 0x00000000 */ \
         )
-
-