From eb04ce90503d8d4b3b97cba7b34af2718a94da3b Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 3 Feb 2014 10:43:32 +0000 Subject: [PATCH] [CLASSPNP] * Remove one time inclusions from the main header and put them back where they belong. * Improve the GUIDs situation. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61946 --- reactos/drivers/storage/classpnp/CMakeLists.txt | 1 + reactos/drivers/storage/classpnp/autorun.c | 3 ++- reactos/drivers/storage/classpnp/class.c | 7 +++++-- reactos/drivers/storage/classpnp/classp.h | 15 ++------------- reactos/drivers/storage/classpnp/classwmi.c | 2 ++ reactos/drivers/storage/classpnp/clntirp.c | 1 - reactos/drivers/storage/classpnp/create.c | 2 -- reactos/drivers/storage/classpnp/debug.c | 2 -- reactos/drivers/storage/classpnp/debug.h | 3 +-- reactos/drivers/storage/classpnp/guid.c | 7 +++++++ reactos/drivers/storage/classpnp/lock.c | 2 -- reactos/drivers/storage/classpnp/obsolete.c | 1 - reactos/drivers/storage/classpnp/retry.c | 1 - reactos/drivers/storage/classpnp/utils.c | 1 - reactos/drivers/storage/classpnp/xferpkt.c | 1 - 15 files changed, 20 insertions(+), 29 deletions(-) create mode 100644 reactos/drivers/storage/classpnp/guid.c diff --git a/reactos/drivers/storage/classpnp/CMakeLists.txt b/reactos/drivers/storage/classpnp/CMakeLists.txt index 28d998d4185..29ce38319f2 100644 --- a/reactos/drivers/storage/classpnp/CMakeLists.txt +++ b/reactos/drivers/storage/classpnp/CMakeLists.txt @@ -26,6 +26,7 @@ list(APPEND SOURCE retry.c utils.c xferpkt.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/classpnp.def) add_library(classpnp SHARED diff --git a/reactos/drivers/storage/classpnp/autorun.c b/reactos/drivers/storage/classpnp/autorun.c index 08f2a8ef6a4..3a328571570 100644 --- a/reactos/drivers/storage/classpnp/autorun.c +++ b/reactos/drivers/storage/classpnp/autorun.c @@ -22,7 +22,8 @@ Revision History: --*/ #include "classp.h" -#include "debug.h" + +#include #define GESN_TIMEOUT_VALUE (0x4) #define GESN_BUFFER_SIZE (0x8) diff --git a/reactos/drivers/storage/classpnp/class.c b/reactos/drivers/storage/classpnp/class.c index 447d02694b3..cc55743bdc5 100644 --- a/reactos/drivers/storage/classpnp/class.c +++ b/reactos/drivers/storage/classpnp/class.c @@ -21,9 +21,12 @@ Revision History: --*/ -#define CLASS_INIT_GUID 1 #include "classp.h" -#include "debug.h" + +#include + +#include +#include #ifdef ALLOC_PRAGMA #pragma alloc_text(INIT, DriverEntry) diff --git a/reactos/drivers/storage/classpnp/classp.h b/reactos/drivers/storage/classpnp/classp.h index 951c5fe8d19..7ae9436a6bb 100644 --- a/reactos/drivers/storage/classpnp/classp.h +++ b/reactos/drivers/storage/classpnp/classp.h @@ -25,24 +25,11 @@ Revision History: --*/ -#include -#include #include - -#include -#include #include - -#if CLASS_INIT_GUID -#include -#endif - -#include #include #include -#include "wmistr.h" - extern CLASSPNP_SCAN_FOR_SPECIAL_INFO ClassBadItems[]; extern GUID ClassGuidQueryRegInfoEx; @@ -876,3 +863,5 @@ PMDL NTAPI BuildDeviceInputMdl(PVOID Buffer, ULONG BufferLen); VOID NTAPI FreeDeviceInputMdl(PMDL Mdl); NTSTATUS NTAPI InitializeTransferPackets(PDEVICE_OBJECT Fdo); VOID NTAPI DestroyAllTransferPackets(PDEVICE_OBJECT Fdo); + +#include "debug.h" diff --git a/reactos/drivers/storage/classpnp/classwmi.c b/reactos/drivers/storage/classpnp/classwmi.c index c1462a1bcdf..890b34768d8 100644 --- a/reactos/drivers/storage/classpnp/classwmi.c +++ b/reactos/drivers/storage/classpnp/classwmi.c @@ -23,6 +23,8 @@ Revision History: #include "classp.h" +#include + NTSTATUS NTAPI ClassSystemControl( diff --git a/reactos/drivers/storage/classpnp/clntirp.c b/reactos/drivers/storage/classpnp/clntirp.c index 39371db0bfa..c59c4cb0723 100644 --- a/reactos/drivers/storage/classpnp/clntirp.c +++ b/reactos/drivers/storage/classpnp/clntirp.c @@ -22,7 +22,6 @@ Revision History: --*/ #include "classp.h" -#include "debug.h" /* * EnqueueDeferredClientIrp diff --git a/reactos/drivers/storage/classpnp/create.c b/reactos/drivers/storage/classpnp/create.c index 7a0c5fa1822..00cfe2d7711 100644 --- a/reactos/drivers/storage/classpnp/create.c +++ b/reactos/drivers/storage/classpnp/create.c @@ -21,9 +21,7 @@ Revision History: --*/ -#define CLASS_INIT_GUID 0 #include "classp.h" -#include "debug.h" ULONG BreakOnClose = 0; diff --git a/reactos/drivers/storage/classpnp/debug.c b/reactos/drivers/storage/classpnp/debug.c index 3d1c085e2dd..c354d21075e 100644 --- a/reactos/drivers/storage/classpnp/debug.c +++ b/reactos/drivers/storage/classpnp/debug.c @@ -21,9 +21,7 @@ Revision History: --*/ - #include "classp.h" -#include "debug.h" #if DBG diff --git a/reactos/drivers/storage/classpnp/debug.h b/reactos/drivers/storage/classpnp/debug.h index aca86fbd1ab..8e9141b93b3 100644 --- a/reactos/drivers/storage/classpnp/debug.h +++ b/reactos/drivers/storage/classpnp/debug.h @@ -22,6 +22,7 @@ Revision History: --*/ +#pragma once VOID ClassDebugPrint(CLASS_DEBUG_LEVEL DebugPrintLevel, PCCHAR DebugMessage, ...); @@ -144,5 +145,3 @@ VOID ClassDebugPrint(CLASS_DEBUG_LEVEL DebugPrintLevel, PCCHAR DebugMessage, ... #define DBGGETSRBSTATUSSTR(_pSrb) #endif - - diff --git a/reactos/drivers/storage/classpnp/guid.c b/reactos/drivers/storage/classpnp/guid.c new file mode 100644 index 00000000000..49b4e9304fd --- /dev/null +++ b/reactos/drivers/storage/classpnp/guid.c @@ -0,0 +1,7 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include +#include +#include + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ diff --git a/reactos/drivers/storage/classpnp/lock.c b/reactos/drivers/storage/classpnp/lock.c index 3801020a0b6..3d609006ff7 100644 --- a/reactos/drivers/storage/classpnp/lock.c +++ b/reactos/drivers/storage/classpnp/lock.c @@ -23,8 +23,6 @@ Revision History: --*/ #include "classp.h" -#include "debug.h" - LONG LockHighWatermark = 0; LONG LockLowWatermark = 0; diff --git a/reactos/drivers/storage/classpnp/obsolete.c b/reactos/drivers/storage/classpnp/obsolete.c index 60862546f95..0e2ddf2ba85 100644 --- a/reactos/drivers/storage/classpnp/obsolete.c +++ b/reactos/drivers/storage/classpnp/obsolete.c @@ -24,7 +24,6 @@ Revision History: --*/ #include "classp.h" -#include "debug.h" PIRP NTAPI ClassRemoveCScanList(IN PCSCAN_LIST List); VOID NTAPI ClasspInitializeCScanList(IN PCSCAN_LIST List); diff --git a/reactos/drivers/storage/classpnp/retry.c b/reactos/drivers/storage/classpnp/retry.c index 4b950fb1056..1cbafe1d305 100644 --- a/reactos/drivers/storage/classpnp/retry.c +++ b/reactos/drivers/storage/classpnp/retry.c @@ -22,7 +22,6 @@ Revision History: --*/ #include "classp.h" -#include "debug.h" /* * InterpretTransferPacketError diff --git a/reactos/drivers/storage/classpnp/utils.c b/reactos/drivers/storage/classpnp/utils.c index 71b5a02cde4..de4cc049713 100644 --- a/reactos/drivers/storage/classpnp/utils.c +++ b/reactos/drivers/storage/classpnp/utils.c @@ -22,7 +22,6 @@ Revision History: --*/ #include "classp.h" -#include "debug.h" #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, ClassGetDeviceParameter) diff --git a/reactos/drivers/storage/classpnp/xferpkt.c b/reactos/drivers/storage/classpnp/xferpkt.c index 42b19c82951..390afe7614e 100644 --- a/reactos/drivers/storage/classpnp/xferpkt.c +++ b/reactos/drivers/storage/classpnp/xferpkt.c @@ -22,7 +22,6 @@ Revision History: --*/ #include "classp.h" -#include "debug.h" #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, InitializeTransferPackets)