Author: akhaldi Date: Thu Feb 6 10:59:19 2014 New Revision: 62005
URL: http://svn.reactos.org/svn/reactos?rev=62005&view=rev Log: [FS_REC] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716
Modified: trunk/reactos/drivers/filesystems/fs_rec/blockdev.c trunk/reactos/drivers/filesystems/fs_rec/cdfs.c trunk/reactos/drivers/filesystems/fs_rec/ext2.c trunk/reactos/drivers/filesystems/fs_rec/fat.c trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h trunk/reactos/drivers/filesystems/fs_rec/ntfs.c trunk/reactos/drivers/filesystems/fs_rec/udfs.c
Modified: trunk/reactos/drivers/filesystems/fs_rec/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec/... ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/blockdev.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/blockdev.c [iso-8859-1] Thu Feb 6 10:59:19 2014 @@ -10,6 +10,10 @@ /* INCLUDES *****************************************************************/
#include "fs_rec.h" + +#include <ntdddisk.h> +#include <ntddcdrm.h> + #define NDEBUG #include <debug.h>
@@ -221,4 +225,3 @@ /* All went well */ return TRUE; } -
Modified: trunk/reactos/drivers/filesystems/fs_rec/cdfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec/... ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/cdfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/cdfs.c [iso-8859-1] Thu Feb 6 10:59:19 2014 @@ -10,6 +10,7 @@ /* INCLUDES *****************************************************************/
#include "fs_rec.h" + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/filesystems/fs_rec/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec/... ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/ext2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/ext2.c [iso-8859-1] Thu Feb 6 10:59:19 2014 @@ -9,6 +9,7 @@ /* INCLUDES *****************************************************************/
#include "fs_rec.h" + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/filesystems/fs_rec/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec/... ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fat.c [iso-8859-1] Thu Feb 6 10:59:19 2014 @@ -10,6 +10,7 @@ /* INCLUDES *****************************************************************/
#include "fs_rec.h" + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec/... ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c [iso-8859-1] Thu Feb 6 10:59:19 2014 @@ -10,6 +10,7 @@ /* INCLUDES *****************************************************************/
#include "fs_rec.h" + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec/... ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] Thu Feb 6 10:59:19 2014 @@ -7,36 +7,23 @@ * Eric Kohl */
-// -// IFS Headers -// #include <ntifs.h> -#include <ntdddisk.h> -#include <ntddcdrm.h> - -// -// Tag for memory allocations -// + +/* Tag for memory allocations */ #define FSREC_TAG 'cRsF'
-// -// UDFS Offsets -// +/* UDFS Offsets */ #define UDFS_VRS_START_OFFSET 32768 #define UDFS_AVDP_SECTOR 256
-// -// Non-standard rounding macros -// +/* Non-standard rounding macros */ #define ROUND_UP(n, align) \ ROUND_DOWN(((ULONG)n) + (align) - 1, (align))
#define ROUND_DOWN(n, align) \ (((ULONG)n) & ~((align) - 1l))
-// -// Conversion types and macros taken from internal ntifs headers -// +/* Conversion types and macros taken from internal ntifs headers */ typedef union _UCHAR1 { UCHAR Uchar[1]; @@ -82,9 +69,7 @@ CopyUchar4(&(Bios)->LargeSectors, &(Pbios)->LargeSectors[0] ); \ }
-// -// Packed versions of the BPB and Boot Sector -// +/* Packed versions of the BPB and Boot Sector */ typedef struct _PACKED_BIOS_PARAMETER_BLOCK { UCHAR BytesPerSector[2]; @@ -114,9 +99,7 @@ UCHAR SystemId[8]; } PACKED_BOOT_SECTOR, *PPACKED_BOOT_SECTOR;
-// -// Unpacked version of the BPB -// +/* Unpacked version of the BPB */ typedef struct BIOS_PARAMETER_BLOCK { USHORT BytesPerSector; @@ -149,9 +132,7 @@ USHORT BackupBootSector; } BIOS_PARAMETER_BLOCK, *PBIOS_PARAMETER_BLOCK;
-// -// UDFS Structures -// +/* UDFS Structures */ #include <pshpack1.h> typedef struct _TAG { @@ -179,9 +160,7 @@ } AVDP, *PAVDP; #include <poppack.h>
-// -// Filesystem Types -// +/* Filesystem Types */ typedef enum _FILE_SYSTEM_TYPE { FS_TYPE_UNUSED, @@ -192,9 +171,7 @@ FS_TYPE_EXT2, } FILE_SYSTEM_TYPE, *PFILE_SYSTEM_TYPE;
-// -// FS Recognizer State -// +/* FS Recognizer State */ typedef enum _FS_REC_STATE { Pending, @@ -202,9 +179,7 @@ Unloading } FS_REC_STATE, *PFS_REC_STATE;
-// -// Device extension -// +/* Device extension */ typedef struct _DEVICE_EXTENSION { FS_REC_STATE State; @@ -212,9 +187,7 @@ PDEVICE_OBJECT Alternate; } DEVICE_EXTENSION, *PDEVICE_EXTENSION;
-// -// Prototypes -// +/* Prototypes */ NTSTATUS NTAPI FsRecCdfsFsControl(
Modified: trunk/reactos/drivers/filesystems/fs_rec/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec/... ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/ntfs.c [iso-8859-1] Thu Feb 6 10:59:19 2014 @@ -10,6 +10,7 @@ /* INCLUDES *****************************************************************/
#include "fs_rec.h" + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/filesystems/fs_rec/udfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec/... ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/udfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/udfs.c [iso-8859-1] Thu Feb 6 10:59:19 2014 @@ -10,6 +10,7 @@ /* INCLUDES *****************************************************************/
#include "fs_rec.h" + #define NDEBUG #include <debug.h>