mirror of
https://github.com/reactos/reactos.git
synced 2024-10-08 02:13:56 +00:00
[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
This commit is contained in:
parent
79551e8e30
commit
eb04ce9050
|
@ -26,6 +26,7 @@ list(APPEND SOURCE
|
||||||
retry.c
|
retry.c
|
||||||
utils.c
|
utils.c
|
||||||
xferpkt.c
|
xferpkt.c
|
||||||
|
guid.c
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/classpnp.def)
|
${CMAKE_CURRENT_BINARY_DIR}/classpnp.def)
|
||||||
|
|
||||||
add_library(classpnp SHARED
|
add_library(classpnp SHARED
|
||||||
|
|
|
@ -22,7 +22,8 @@ Revision History:
|
||||||
--*/
|
--*/
|
||||||
|
|
||||||
#include "classp.h"
|
#include "classp.h"
|
||||||
#include "debug.h"
|
|
||||||
|
#include <wmidata.h>
|
||||||
|
|
||||||
#define GESN_TIMEOUT_VALUE (0x4)
|
#define GESN_TIMEOUT_VALUE (0x4)
|
||||||
#define GESN_BUFFER_SIZE (0x8)
|
#define GESN_BUFFER_SIZE (0x8)
|
||||||
|
|
|
@ -21,9 +21,12 @@ Revision History:
|
||||||
|
|
||||||
--*/
|
--*/
|
||||||
|
|
||||||
#define CLASS_INIT_GUID 1
|
|
||||||
#include "classp.h"
|
#include "classp.h"
|
||||||
#include "debug.h"
|
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
|
#include <initguid.h>
|
||||||
|
#include <mountdev.h>
|
||||||
|
|
||||||
#ifdef ALLOC_PRAGMA
|
#ifdef ALLOC_PRAGMA
|
||||||
#pragma alloc_text(INIT, DriverEntry)
|
#pragma alloc_text(INIT, DriverEntry)
|
||||||
|
|
|
@ -25,24 +25,11 @@ Revision History:
|
||||||
|
|
||||||
--*/
|
--*/
|
||||||
|
|
||||||
#include <stddef.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <ntddk.h>
|
#include <ntddk.h>
|
||||||
|
|
||||||
#include <scsi.h>
|
|
||||||
#include <wmidata.h>
|
|
||||||
#include <classpnp.h>
|
#include <classpnp.h>
|
||||||
|
|
||||||
#if CLASS_INIT_GUID
|
|
||||||
#include <initguid.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <mountdev.h>
|
|
||||||
#include <ioevent.h>
|
#include <ioevent.h>
|
||||||
#include <pseh/pseh2.h>
|
#include <pseh/pseh2.h>
|
||||||
|
|
||||||
#include "wmistr.h"
|
|
||||||
|
|
||||||
extern CLASSPNP_SCAN_FOR_SPECIAL_INFO ClassBadItems[];
|
extern CLASSPNP_SCAN_FOR_SPECIAL_INFO ClassBadItems[];
|
||||||
|
|
||||||
extern GUID ClassGuidQueryRegInfoEx;
|
extern GUID ClassGuidQueryRegInfoEx;
|
||||||
|
@ -876,3 +863,5 @@ PMDL NTAPI BuildDeviceInputMdl(PVOID Buffer, ULONG BufferLen);
|
||||||
VOID NTAPI FreeDeviceInputMdl(PMDL Mdl);
|
VOID NTAPI FreeDeviceInputMdl(PMDL Mdl);
|
||||||
NTSTATUS NTAPI InitializeTransferPackets(PDEVICE_OBJECT Fdo);
|
NTSTATUS NTAPI InitializeTransferPackets(PDEVICE_OBJECT Fdo);
|
||||||
VOID NTAPI DestroyAllTransferPackets(PDEVICE_OBJECT Fdo);
|
VOID NTAPI DestroyAllTransferPackets(PDEVICE_OBJECT Fdo);
|
||||||
|
|
||||||
|
#include "debug.h"
|
||||||
|
|
|
@ -23,6 +23,8 @@ Revision History:
|
||||||
|
|
||||||
#include "classp.h"
|
#include "classp.h"
|
||||||
|
|
||||||
|
#include <wmistr.h>
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
NTAPI
|
NTAPI
|
||||||
ClassSystemControl(
|
ClassSystemControl(
|
||||||
|
|
|
@ -22,7 +22,6 @@ Revision History:
|
||||||
--*/
|
--*/
|
||||||
|
|
||||||
#include "classp.h"
|
#include "classp.h"
|
||||||
#include "debug.h"
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* EnqueueDeferredClientIrp
|
* EnqueueDeferredClientIrp
|
||||||
|
|
|
@ -21,9 +21,7 @@ Revision History:
|
||||||
|
|
||||||
--*/
|
--*/
|
||||||
|
|
||||||
#define CLASS_INIT_GUID 0
|
|
||||||
#include "classp.h"
|
#include "classp.h"
|
||||||
#include "debug.h"
|
|
||||||
|
|
||||||
ULONG BreakOnClose = 0;
|
ULONG BreakOnClose = 0;
|
||||||
|
|
||||||
|
|
|
@ -21,9 +21,7 @@ Revision History:
|
||||||
|
|
||||||
--*/
|
--*/
|
||||||
|
|
||||||
|
|
||||||
#include "classp.h"
|
#include "classp.h"
|
||||||
#include "debug.h"
|
|
||||||
|
|
||||||
#if DBG
|
#if DBG
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@ Revision History:
|
||||||
|
|
||||||
--*/
|
--*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
VOID ClassDebugPrint(CLASS_DEBUG_LEVEL DebugPrintLevel, PCCHAR DebugMessage, ...);
|
VOID ClassDebugPrint(CLASS_DEBUG_LEVEL DebugPrintLevel, PCCHAR DebugMessage, ...);
|
||||||
|
|
||||||
|
@ -144,5 +145,3 @@ VOID ClassDebugPrint(CLASS_DEBUG_LEVEL DebugPrintLevel, PCCHAR DebugMessage, ...
|
||||||
#define DBGGETSRBSTATUSSTR(_pSrb)
|
#define DBGGETSRBSTATUSSTR(_pSrb)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
7
reactos/drivers/storage/classpnp/guid.c
Normal file
7
reactos/drivers/storage/classpnp/guid.c
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
|
||||||
|
|
||||||
|
#include <ntdef.h>
|
||||||
|
#include <initguid.h>
|
||||||
|
#include <ioevent.h>
|
||||||
|
|
||||||
|
/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
|
|
@ -23,8 +23,6 @@ Revision History:
|
||||||
--*/
|
--*/
|
||||||
|
|
||||||
#include "classp.h"
|
#include "classp.h"
|
||||||
#include "debug.h"
|
|
||||||
|
|
||||||
|
|
||||||
LONG LockHighWatermark = 0;
|
LONG LockHighWatermark = 0;
|
||||||
LONG LockLowWatermark = 0;
|
LONG LockLowWatermark = 0;
|
||||||
|
|
|
@ -24,7 +24,6 @@ Revision History:
|
||||||
--*/
|
--*/
|
||||||
|
|
||||||
#include "classp.h"
|
#include "classp.h"
|
||||||
#include "debug.h"
|
|
||||||
|
|
||||||
PIRP NTAPI ClassRemoveCScanList(IN PCSCAN_LIST List);
|
PIRP NTAPI ClassRemoveCScanList(IN PCSCAN_LIST List);
|
||||||
VOID NTAPI ClasspInitializeCScanList(IN PCSCAN_LIST List);
|
VOID NTAPI ClasspInitializeCScanList(IN PCSCAN_LIST List);
|
||||||
|
|
|
@ -22,7 +22,6 @@ Revision History:
|
||||||
--*/
|
--*/
|
||||||
|
|
||||||
#include "classp.h"
|
#include "classp.h"
|
||||||
#include "debug.h"
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* InterpretTransferPacketError
|
* InterpretTransferPacketError
|
||||||
|
|
|
@ -22,7 +22,6 @@ Revision History:
|
||||||
--*/
|
--*/
|
||||||
|
|
||||||
#include "classp.h"
|
#include "classp.h"
|
||||||
#include "debug.h"
|
|
||||||
|
|
||||||
#ifdef ALLOC_PRAGMA
|
#ifdef ALLOC_PRAGMA
|
||||||
#pragma alloc_text(PAGE, ClassGetDeviceParameter)
|
#pragma alloc_text(PAGE, ClassGetDeviceParameter)
|
||||||
|
|
|
@ -22,7 +22,6 @@ Revision History:
|
||||||
--*/
|
--*/
|
||||||
|
|
||||||
#include "classp.h"
|
#include "classp.h"
|
||||||
#include "debug.h"
|
|
||||||
|
|
||||||
#ifdef ALLOC_PRAGMA
|
#ifdef ALLOC_PRAGMA
|
||||||
#pragma alloc_text(PAGE, InitializeTransferPackets)
|
#pragma alloc_text(PAGE, InitializeTransferPackets)
|
||||||
|
|
Loading…
Reference in a new issue