[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

svn path=/trunk/; revision=61944

diff --git a/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt b/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt
index 48dfb3c..18ad587 100644 (file)
--- a/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt
+++ b/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt
@@ -1,4 +1,5 @@
-include_directories(..)
+
+include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/class)
 
 list(APPEND SOURCE
     cdrom.c

diff --git a/reactos/drivers/storage/class/cdrom_new/cdrom.c b/reactos/drivers/storage/class/cdrom_new/cdrom.c
index 1fa45e7..055e602 100644 (file)
--- a/reactos/drivers/storage/class/cdrom_new/cdrom.c
+++ b/reactos/drivers/storage/class/cdrom_new/cdrom.c
@@ -24,16 +24,6 @@ Revision History:
 
 --*/
 
-#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

diff --git a/reactos/drivers/storage/class/cdrom_new/cdrom.h b/reactos/drivers/storage/class/cdrom_new/cdrom.h
index 74afad2..9bd9c2e 100644 (file)
--- a/reactos/drivers/storage/class/cdrom_new/cdrom.h
+++ b/reactos/drivers/storage/class/cdrom_new/cdrom.h
@@ -28,7 +28,11 @@ Revision History:
 #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 @@ CdRompFlushDelayedList(
     IN BOOLEAN CalledFromWorkItem
     );
 
-#endif // __CDROMP_H__
+#endif /* __CDROMP_H__ */

diff --git a/reactos/drivers/storage/class/cdrom_new/data.c b/reactos/drivers/storage/class/cdrom_new/data.c
index 02d4239..cecd8ea 100644 (file)
--- a/reactos/drivers/storage/class/cdrom_new/data.c
+++ b/reactos/drivers/storage/class/cdrom_new/data.c
@@ -17,9 +17,7 @@ Revision History:
 
 --*/
 
-#include "ntddk.h"
-#include "classpnp.h"
-#include "trace.h"
+#include "cdrom.h"
 
 #ifdef ALLOC_DATA_PRAGMA
 #pragma data_seg("PAGE")

diff --git a/reactos/drivers/storage/class/cdrom_new/ioctl.c b/reactos/drivers/storage/class/cdrom_new/ioctl.c
index ed65db1..f81f2a3 100644 (file)
--- a/reactos/drivers/storage/class/cdrom_new/ioctl.c
+++ b/reactos/drivers/storage/class/cdrom_new/ioctl.c
@@ -24,19 +24,8 @@ Revision History:
 
 --*/
 
-#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] = {
         "Physical",

diff --git a/reactos/drivers/storage/class/cdrom_new/mmc.c b/reactos/drivers/storage/class/cdrom_new/mmc.c
index 5b4539c..59232d4 100644 (file)
--- a/reactos/drivers/storage/class/cdrom_new/mmc.c
+++ b/reactos/drivers/storage/class/cdrom_new/mmc.c
@@ -24,8 +24,6 @@ Revision History:
 
 --*/
 
-#include "ntddk.h"
-#include "classpnp.h"
 #include "cdrom.h"
 
 NTSTATUS

diff --git a/reactos/drivers/storage/class/cdrom_new/sec.c b/reactos/drivers/storage/class/cdrom_new/sec.c
index 3a3b330..b236126 100644 (file)
--- a/reactos/drivers/storage/class/cdrom_new/sec.c
+++ b/reactos/drivers/storage/class/cdrom_new/sec.c
@@ -4,8 +4,7 @@ Copyright (C) Microsoft Corporation, 1999
 
 --*/
 
-
-#include "sec.h"
+#include "cdrom.h"
 
 NTSTATUS
 NTAPI

diff --git a/reactos/drivers/storage/class/cdrom_new/sec.h b/reactos/drivers/storage/class/cdrom_new/sec.h
deleted file mode 100644 (file)
index 6461b94..0000000
--- a/reactos/drivers/storage/class/cdrom_new/sec.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*--
-
-Copyright (C) Microsoft Corporation, 1999
-
---*/
-
-#include "ntddk.h"
-#include "classpnp.h"
-#include "cdrom.h"

diff --git a/reactos/drivers/storage/class/cdrom_new/trace.h b/reactos/drivers/storage/class/cdrom_new/trace.h
index 2db702c..630ff69 100644 (file)
--- a/reactos/drivers/storage/class/cdrom_new/trace.h
+++ b/reactos/drivers/storage/class/cdrom_new/trace.h
@@ -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 */ \
         )
-
-