Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-19 04:07:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CDROM_NEW]

Browse source 
* 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
This commit is contained in:
Amine Khaldi 2014-02-03 10:39:05 +00:00
parent e35722df39
commit 559482f259
9 changed files with 11 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/drivers/storage/class/cdrom_new/CMakeLists.txt
View file

@ -1,4 +1,5 @@
include_directories(..)
include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/class)
list(APPEND SOURCE list(APPEND SOURCE
cdrom.c cdrom.c

10
reactos/drivers/storage/class/cdrom_new/cdrom.c
View file

@ -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" #include "cdrom.h"
#ifdef ALLOC_PRAGMA #ifdef ALLOC_PRAGMA

8
reactos/drivers/storage/class/cdrom_new/cdrom.h
View file

@ -28,7 +28,11 @@ Revision History:
#ifndef __CDROMP_H__ #ifndef __CDROMP_H__
#define __CDROMP_H__ #define __CDROMP_H__
#include "ntddmmc.h" #include <ntddk.h>
#include <ntddcdvd.h>
#include <classpnp.h>
#include <ntddmmc.h>
#include "trace.h" #include "trace.h"
extern CLASSPNP_SCAN_FOR_SPECIAL_INFO CdromHackItems[]; extern CLASSPNP_SCAN_FOR_SPECIAL_INFO CdromHackItems[];
@ -872,4 +876,4 @@ CdRompFlushDelayedList(
IN BOOLEAN CalledFromWorkItem IN BOOLEAN CalledFromWorkItem
); );
#endif // __CDROMP_H__ #endif /* __CDROMP_H__ */

4
reactos/drivers/storage/class/cdrom_new/data.c
View file

@ -17,9 +17,7 @@ Revision History:
--*/ --*/
#include "ntddk.h" #include "cdrom.h"
#include "classpnp.h"
#include "trace.h"
#ifdef ALLOC_DATA_PRAGMA #ifdef ALLOC_DATA_PRAGMA
#pragma data_seg("PAGE") #pragma data_seg("PAGE")

11
reactos/drivers/storage/class/cdrom_new/ioctl.c
View file

@ -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" #include "cdrom.h"
#if DBG #if DBG
PUCHAR READ_DVD_STRUCTURE_FORMAT_STRINGS[DvdMaxDescriptor+1] = { PUCHAR READ_DVD_STRUCTURE_FORMAT_STRINGS[DvdMaxDescriptor+1] = {
"Physical", "Physical",

2
reactos/drivers/storage/class/cdrom_new/mmc.c
View file

@ -24,8 +24,6 @@ Revision History:
--*/ --*/
#include "ntddk.h"
#include "classpnp.h"
#include "cdrom.h" #include "cdrom.h"
NTSTATUS NTSTATUS

3
reactos/drivers/storage/class/cdrom_new/sec.c
View file

@ -4,8 +4,7 @@ Copyright (C) Microsoft Corporation, 1999
--*/ --*/
#include "cdrom.h"
#include "sec.h"
NTSTATUS NTSTATUS
NTAPI NTAPI

9
reactos/drivers/storage/class/cdrom_new/sec.h
View file

@ -1,9 +0,0 @@
/*--
Copyright (C) Microsoft Corporation, 1999
--*/
#include "ntddk.h"
#include "classpnp.h"
#include "cdrom.h"

3
reactos/drivers/storage/class/cdrom_new/trace.h
View file

@ -8,6 +8,7 @@
*/ */
#pragma once
#define TraceLogger(x, ...) DbgPrint(__VA_ARGS__) #define TraceLogger(x, ...) DbgPrint(__VA_ARGS__)
#define TraceLog(x) TraceLogger x #define TraceLog(x) TraceLogger x
@ -49,5 +50,3 @@
WPP_DEFINE_BIT(CdromSecError) /* bit 30 = 0x00000000 */ \ WPP_DEFINE_BIT(CdromSecError) /* bit 30 = 0x00000000 */ \
WPP_DEFINE_BIT(CdromSecInfo) /* bit 31 = 0x00000000 */ \ WPP_DEFINE_BIT(CdromSecInfo) /* bit 31 = 0x00000000 */ \
) )