- Build cdfs, ntfs, vfatfs with PCH - Remove core.h and disable diskdump driver (never worked, was told it's an abandonned, obsolete driver and I tend to agree.) - Rename ROS ntifs.h to ccros.h and moved to root include directory (where all the "temporary" includes are for now). - Moved ROS class2.h to drivers/storage/include, per my own and other's recommendation, to make it clear that it's a ros-intenral file only useful for low-level storage drivers (no 3rd party driver needs this, which is why MS doesn't export it). Modified: trunk/reactos/drivers/fs/cdfs/cdfs.c Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h Modified: trunk/reactos/drivers/fs/cdfs/cdfs.xml Modified: trunk/reactos/drivers/fs/cdfs/cleanup.c Modified: trunk/reactos/drivers/fs/cdfs/close.c Modified: trunk/reactos/drivers/fs/cdfs/common.c Modified: trunk/reactos/drivers/fs/cdfs/create.c Modified: trunk/reactos/drivers/fs/cdfs/dirctl.c Modified: trunk/reactos/drivers/fs/cdfs/fcb.c Modified: trunk/reactos/drivers/fs/cdfs/finfo.c Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c Modified: trunk/reactos/drivers/fs/cdfs/misc.c Modified: trunk/reactos/drivers/fs/cdfs/rw.c Modified: trunk/reactos/drivers/fs/cdfs/volinfo.c Modified: trunk/reactos/drivers/fs/ntfs/attrib.c Modified: trunk/reactos/drivers/fs/ntfs/blockdev.c Modified: trunk/reactos/drivers/fs/ntfs/close.c Modified: trunk/reactos/drivers/fs/ntfs/create.c Modified: trunk/reactos/drivers/fs/ntfs/dirctl.c Modified: trunk/reactos/drivers/fs/ntfs/fcb.c Modified: trunk/reactos/drivers/fs/ntfs/finfo.c Modified: trunk/reactos/drivers/fs/ntfs/fsctl.c Modified: trunk/reactos/drivers/fs/ntfs/mft.c Modified: trunk/reactos/drivers/fs/ntfs/ntfs.c Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h Modified: trunk/reactos/drivers/fs/ntfs/ntfs.xml Modified: trunk/reactos/drivers/fs/vfat/fat.c Modified: trunk/reactos/drivers/fs/vfat/fcb.c Modified: trunk/reactos/drivers/fs/vfat/fsctl.c Modified: trunk/reactos/drivers/fs/vfat/vfat.h Modified: trunk/reactos/drivers/fs/vfat/vfatfs.xml Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/cdrom/cdrom.xml Modified: trunk/reactos/drivers/storage/class2/class2.c Modified: trunk/reactos/drivers/storage/class2/class2.xml Modified: trunk/reactos/drivers/storage/directory.xml Modified: trunk/reactos/drivers/storage/disk/disk.c Modified: trunk/reactos/drivers/storage/disk/disk.xml Added: trunk/reactos/drivers/storage/include/ Added: trunk/reactos/drivers/storage/include/class2.h Added: trunk/reactos/include/ccros.h Deleted: trunk/reactos/include/ddk/class2.h Deleted: trunk/reactos/include/ddk/core.h Deleted: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h _____
Modified: trunk/reactos/drivers/fs/cdfs/cdfs.c --- trunk/reactos/drivers/fs/cdfs/cdfs.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/cdfs.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,16 +28,13 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "cdfs.h"
#define NDEBUG #include <debug.h>
-#include "cdfs.h" +/* FUNCTIONS ****************************************************************/
- -/* GLOBALS *****************************************************************/ - PCDFS_GLOBAL_DATA CdfsGlobalData;
_____
Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h --- trunk/reactos/drivers/fs/cdfs/cdfs.h 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/cdfs.h 2005-07-20 02:52:52 UTC (rev 16656) @@ -1,7 +1,10 @@
#ifndef CDFS_H #define CDFS_H
+#include <ddk/ntddk.h> #include <ddk/ntifs.h> +#include <ntddcdrm.h> +#include <ccros.h>
#define USE_ROS_CC_AND_FS
_____
Modified: trunk/reactos/drivers/fs/cdfs/cdfs.xml --- trunk/reactos/drivers/fs/cdfs/cdfs.xml 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/cdfs.xml 2005-07-20 02:52:52 UTC (rev 16656) @@ -17,4 +17,5 @@
<file>rw.c</file> <file>volinfo.c</file> <file>cdfs.rc</file> + <pch>cdfs.h</pch> </module> _____
Modified: trunk/reactos/drivers/fs/cdfs/cleanup.c --- trunk/reactos/drivers/fs/cdfs/cleanup.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/cleanup.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,14 +28,11 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "cdfs.h"
#define NDEBUG #include <debug.h>
-#include "cdfs.h" - - /* FUNCTIONS ****************************************************************/
static NTSTATUS _____
Modified: trunk/reactos/drivers/fs/cdfs/close.c --- trunk/reactos/drivers/fs/cdfs/close.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/close.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,14 +28,11 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "cdfs.h"
#define NDEBUG #include <debug.h>
-#include "cdfs.h" - - /* FUNCTIONS ****************************************************************/
NTSTATUS _____
Modified: trunk/reactos/drivers/fs/cdfs/common.c --- trunk/reactos/drivers/fs/cdfs/common.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/common.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,14 +28,11 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "cdfs.h"
#define NDEBUG #include <debug.h>
-#include "cdfs.h" - - /* FUNCTIONS ****************************************************************/
NTSTATUS _____
Modified: trunk/reactos/drivers/fs/cdfs/create.c --- trunk/reactos/drivers/fs/cdfs/create.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/create.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,15 +28,11 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> -#include <ntddcdrm.h> +#include "cdfs.h"
#define NDEBUG #include <debug.h>
-#include "cdfs.h" - - /* FUNCTIONS ****************************************************************/
static NTSTATUS _____
Modified: trunk/reactos/drivers/fs/cdfs/dirctl.c --- trunk/reactos/drivers/fs/cdfs/dirctl.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/dirctl.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -29,15 +29,13 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "cdfs.h"
#define NDEBUG #include <debug.h>
-#include "cdfs.h" +/* FUNCTIONS ****************************************************************/
-/* DEFINES ******************************************************************/ - #define ROUND_DOWN(N, S) (((N) / (S)) * (S)) #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
_____
Modified: trunk/reactos/drivers/fs/cdfs/fcb.c --- trunk/reactos/drivers/fs/cdfs/fcb.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/fcb.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,16 +28,13 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "cdfs.h"
#define NDEBUG #include <debug.h>
-#include "cdfs.h" +/* FUNCTIONS ****************************************************************/
- -/* MACROS *******************************************************************/ - #define TAG_FCB TAG('I', 'F', 'C', 'B')
#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) _____
Modified: trunk/reactos/drivers/fs/cdfs/finfo.c --- trunk/reactos/drivers/fs/cdfs/finfo.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/finfo.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -29,14 +29,11 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "cdfs.h"
#define NDEBUG #include <debug.h>
-#include "cdfs.h" - - /* FUNCTIONS ****************************************************************/
/* _____
Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c --- trunk/reactos/drivers/fs/cdfs/fsctl.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/fsctl.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,15 +28,11 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> -#include <ntddcdrm.h> +#include "cdfs.h"
#define NDEBUG #include <debug.h>
-#include "cdfs.h" - - /* FUNCTIONS ****************************************************************/
static inline _____
Modified: trunk/reactos/drivers/fs/cdfs/misc.c --- trunk/reactos/drivers/fs/cdfs/misc.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/misc.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,14 +28,11 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "cdfs.h"
#define NDEBUG #include <debug.h>
-#include "cdfs.h" - - /* FUNCTIONS ****************************************************************/
VOID _____
Modified: trunk/reactos/drivers/fs/cdfs/rw.c --- trunk/reactos/drivers/fs/cdfs/rw.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/rw.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,16 +28,13 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "cdfs.h"
#define NDEBUG #include <debug.h>
-#include "cdfs.h" +/* FUNCTIONS ****************************************************************/
- -/* GLOBALS *******************************************************************/ - #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #define ROUND_DOWN(N, S) ((N) - ((N) % (S)))
_____
Modified: trunk/reactos/drivers/fs/cdfs/volinfo.c --- trunk/reactos/drivers/fs/cdfs/volinfo.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/cdfs/volinfo.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,14 +28,11 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "cdfs.h"
#define NDEBUG #include <debug.h>
-#include "cdfs.h" - - /* FUNCTIONS ****************************************************************/
static NTSTATUS _____
Modified: trunk/reactos/drivers/fs/ntfs/attrib.c --- trunk/reactos/drivers/fs/ntfs/attrib.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/attrib.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,13 +28,12 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "ntfs.h"
- #define NDEBUG #include <debug.h>
-#include "ntfs.h" +/* GLOBALS *****************************************************************/
/* FUNCTIONS ****************************************************************/ _____
Modified: trunk/reactos/drivers/fs/ntfs/blockdev.c --- trunk/reactos/drivers/fs/ntfs/blockdev.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/blockdev.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -27,12 +27,12 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "ntfs.h"
#define NDEBUG #include <debug.h>
-#include "ntfs.h" +/* GLOBALS *****************************************************************/
/* FUNCTIONS ****************************************************************/ _____
Modified: trunk/reactos/drivers/fs/ntfs/close.c --- trunk/reactos/drivers/fs/ntfs/close.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/close.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,12 +28,12 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "ntfs.h"
#define NDEBUG #include <debug.h>
-#include "ntfs.h" +/* GLOBALS *****************************************************************/
/* FUNCTIONS ****************************************************************/ _____
Modified: trunk/reactos/drivers/fs/ntfs/create.c --- trunk/reactos/drivers/fs/ntfs/create.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/create.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -27,12 +27,12 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "ntfs.h"
#define NDEBUG #include <debug.h>
-#include "ntfs.h" +/* GLOBALS *****************************************************************/
/* FUNCTIONS ****************************************************************/ _____
Modified: trunk/reactos/drivers/fs/ntfs/dirctl.c --- trunk/reactos/drivers/fs/ntfs/dirctl.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/dirctl.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -27,12 +27,12 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "ntfs.h"
#define NDEBUG #include <debug.h>
-#include "ntfs.h" +/* GLOBALS *****************************************************************/
/* FUNCTIONS ****************************************************************/ _____
Modified: trunk/reactos/drivers/fs/ntfs/fcb.c --- trunk/reactos/drivers/fs/ntfs/fcb.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/fcb.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -32,8 +32,10 @@
#define NDEBUG #include <debug.h>
+/* GLOBALS *****************************************************************/
+ /* MACROS *******************************************************************/
#define TAG_FCB TAG('I', 'F', 'C', 'B') _____
Modified: trunk/reactos/drivers/fs/ntfs/finfo.c --- trunk/reactos/drivers/fs/ntfs/finfo.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/finfo.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -27,12 +27,12 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "ntfs.h"
#define NDEBUG #include <debug.h>
-#include "ntfs.h" +/* GLOBALS *****************************************************************/
/* FUNCTIONS ****************************************************************/ _____
Modified: trunk/reactos/drivers/fs/ntfs/fsctl.c --- trunk/reactos/drivers/fs/ntfs/fsctl.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/fsctl.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -29,11 +29,12 @@
/* INCLUDES *****************************************************************/
#include "ntfs.h" -#include <ntdddisk.h>
-//#define NDEBUG +#define NDEBUG #include <debug.h>
+/* GLOBALS *****************************************************************/ + /* FUNCTIONS ****************************************************************/
static NTSTATUS _____
Modified: trunk/reactos/drivers/fs/ntfs/mft.c --- trunk/reactos/drivers/fs/ntfs/mft.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/mft.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -28,17 +28,14 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "ntfs.h"
#define NDEBUG #include <debug.h>
-#include "ntfs.h" +/* GLOBALS *****************************************************************/
-//#define __min(a,b) (((a) < (b)) ? (a) : (b)) - - /* FUNCTIONS ****************************************************************/
_____
Modified: trunk/reactos/drivers/fs/ntfs/ntfs.c --- trunk/reactos/drivers/fs/ntfs/ntfs.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/ntfs.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -27,14 +27,11 @@
/* INCLUDES *****************************************************************/
-#include <ddk/ntddk.h> +#include "ntfs.h"
#define NDEBUG #include <debug.h>
-#include "ntfs.h" - - /* GLOBALS *****************************************************************/
PNTFS_GLOBAL_DATA NtfsGlobalData; _____
Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h --- trunk/reactos/drivers/fs/ntfs/ntfs.h 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/ntfs.h 2005-07-20 02:52:52 UTC (rev 16656) @@ -1,7 +1,10 @@
#ifndef NTFS_H #define NTFS_H
+#include <ddk/ntddk.h> #include <ddk/ntifs.h> +#include <ddk/ntdddisk.h> +#include <ccros.h>
#define USE_ROS_CC_AND_FS
_____
Modified: trunk/reactos/drivers/fs/ntfs/ntfs.xml --- trunk/reactos/drivers/fs/ntfs/ntfs.xml 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/ntfs/ntfs.xml 2005-07-20 02:52:52 UTC (rev 16656) @@ -17,4 +17,5 @@
<file>rw.c</file> <file>volinfo.c</file> <file>ntfs.rc</file> + <pch>ntfs.h</pch> </module> _____
Modified: trunk/reactos/drivers/fs/vfat/fat.c --- trunk/reactos/drivers/fs/vfat/fat.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/vfat/fat.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -17,8 +17,6 @@
/* GLOBALS ******************************************************************/
-#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) - #define CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \ (pDeviceExt)->FatInfo.BytesPerCluster : PAGE_SIZE)
_____
Modified: trunk/reactos/drivers/fs/vfat/fcb.c --- trunk/reactos/drivers/fs/vfat/fcb.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/vfat/fcb.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -22,8 +22,6 @@
#define TAG_FCB TAG('V', 'F', 'C', 'B')
-#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) - /* -------------------------------------------------------- PUBLICS */
ULONG vfatNameHash(ULONG hash, PUNICODE_STRING NameU) _____
Modified: trunk/reactos/drivers/fs/vfat/fsctl.c --- trunk/reactos/drivers/fs/vfat/fsctl.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/vfat/fsctl.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -34,6 +34,7 @@
#define CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \ (pDeviceExt)->FatInfo.BytesPerCluster : PAGE_SIZE)
+#define VOLUME_IS_DIRTY 0x00000001
static NTSTATUS VfatHasFileSystem(PDEVICE_OBJECT DeviceToMount, _____
Modified: trunk/reactos/drivers/fs/vfat/vfat.h --- trunk/reactos/drivers/fs/vfat/vfat.h 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/vfat/vfat.h 2005-07-20 02:52:52 UTC (rev 16656) @@ -2,32 +2,14 @@
#include <ddk/ntifs.h> #include <ddk/ntdddisk.h> +#include <ndk/ntndk.h> +#include <reactos/helper.h> +#include <ccros.h> #include <limits.h> #include <debug.h>
#define USE_ROS_CC_AND_FS
-/* FIXME */ -#ifdef __USE_W32API -NTSTATUS NTAPI RtlOemStringToUnicodeString(PUNICODE_STRING, CONST STRING *, BOOLEAN); -NTSTATUS NTAPI RtlDowncaseUnicodeString(PUNICODE_STRING, PCUNICODE_STRING, BOOLEAN); -NTSTATUS NTAPI RtlUnicodeStringToOemString(POEM_STRING, PCUNICODE_STRING, BOOLEAN); -#undef DeleteFile /* FIXME */ -#define VOLUME_IS_DIRTY 0x00000001 /* FIXME */ -#endif - -#ifdef USE_ROS_CC_AND_FS -#ifndef __INCLUDE_DDK_NTIFS_H -NTSTATUS STDCALL CcRosInitializeFileCache(PFILE_OBJECT, ULONG); -NTSTATUS STDCALL CcRosReleaseFileCache(PFILE_OBJECT); -#define FSCTL_ROS_QUERY_LCN_MAPPING CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS) -typedef struct _ROS_QUERY_LCN_MAPPING { LARGE_INTEGER LcnDiskOffset; } ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING; -#endif -#endif - -#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) -#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) - #include <pshpack1.h> struct _BootSector { _____
Modified: trunk/reactos/drivers/fs/vfat/vfatfs.xml --- trunk/reactos/drivers/fs/vfat/vfatfs.xml 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/fs/vfat/vfatfs.xml 2005-07-20 02:52:52 UTC (rev 16656) @@ -26,4 +26,5 @@
<file>string.c</file> <file>volume.c</file> <file>vfatfs.rc</file> + <pch>vfat.h</pch> </module> _____
Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c --- trunk/reactos/drivers/storage/cdrom/cdrom.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/storage/cdrom/cdrom.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -38,7 +38,7 @@
#include <ddk/ntddscsi.h> #include <ddk/ntdddisk.h> #include <ddk/ntddcdrm.h> -#include <ddk/class2.h> +#include <include/class2.h> #include <stdio.h>
#define NDEBUG _____
Modified: trunk/reactos/drivers/storage/cdrom/cdrom.xml --- trunk/reactos/drivers/storage/cdrom/cdrom.xml 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/storage/cdrom/cdrom.xml 2005-07-20 02:52:52 UTC (rev 16656) @@ -4,6 +4,7 @@
<library>ntoskrnl</library> <library>hal</library> <library>class2</library> + <include base="cdrom">..</include> <file>cdrom.c</file> <file>cdrom.rc</file> </module> _____
Modified: trunk/reactos/drivers/storage/class2/class2.c --- trunk/reactos/drivers/storage/class2/class2.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/storage/class2/class2.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -35,7 +35,7 @@
#include <ddk/ntddk.h> #include <ddk/ntdddisk.h> #include <ddk/scsi.h> -#include <ddk/class2.h> +#include <include/class2.h> #include <stdio.h>
#define NDEBUG _____
Modified: trunk/reactos/drivers/storage/class2/class2.xml --- trunk/reactos/drivers/storage/class2/class2.xml 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/storage/class2/class2.xml 2005-07-20 02:52:52 UTC (rev 16656) @@ -4,6 +4,7 @@
<importlibrary definition="class2.def" /> <library>ntoskrnl</library> <library>hal</library> + <include base="class2">..</include> <file>class2.c</file> <file>class2.rc</file> </module> _____
Modified: trunk/reactos/drivers/storage/directory.xml --- trunk/reactos/drivers/storage/directory.xml 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/storage/directory.xml 2005-07-20 02:52:52 UTC (rev 16656) @@ -10,9 +10,6 @@
<directory name="disk"> <xi:include href="disk/disk.xml" /> </directory> -<directory name="diskdump"> - <xi:include href="diskdump/diskdump.xml" /> -</directory> <directory name="floppy"> <xi:include href="floppy/floppy.xml" /> </directory> _____
Modified: trunk/reactos/drivers/storage/disk/disk.c --- trunk/reactos/drivers/storage/disk/disk.c 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/storage/disk/disk.c 2005-07-20 02:52:52 UTC (rev 16656) @@ -30,8 +30,8 @@
#include <ddk/ntddk.h> #include <ddk/ntdddisk.h> #include <ddk/scsi.h> -#include <ddk/class2.h> #include <ddk/ntddscsi.h> +#include <include/class2.h> #include <stdio.h>
#define NDEBUG _____
Modified: trunk/reactos/drivers/storage/disk/disk.xml --- trunk/reactos/drivers/storage/disk/disk.xml 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/drivers/storage/disk/disk.xml 2005-07-20 02:52:52 UTC (rev 16656) @@ -5,6 +5,7 @@
<library>ntoskrnl</library> <library>hal</library> <library>class2</library> + <include base="disk">..</include> <file>disk.c</file> <file>disk.rc</file> </module> _____
Copied: trunk/reactos/drivers/storage/include/class2.h (from rev 16628, trunk/reactos/include/ddk/class2.h) _____
Added: trunk/reactos/include/ccros.h --- trunk/reactos/include/ccros.h 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/include/ccros.h 2005-07-20 02:52:52 UTC (rev 16656) @@ -0,0 +1,18 @@
+#ifndef __INCLUDE_DDK_NTIFS_H +#define __INCLUDE_DDK_NTIFS_H + +NTSTATUS STDCALL +CcRosInitializeFileCache (PFILE_OBJECT FileObject, + ULONG CacheSegmentSize); +NTSTATUS STDCALL +CcRosReleaseFileCache (PFILE_OBJECT FileObject); + +#define FSCTL_ROS_QUERY_LCN_MAPPING \ + CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS) + +typedef struct _ROS_QUERY_LCN_MAPPING +{ + LARGE_INTEGER LcnDiskOffset; +} ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING; + +#endif /* __INCLUDE_DDK_NTIFS_H */ _____
Deleted: trunk/reactos/include/ddk/class2.h --- trunk/reactos/include/ddk/class2.h 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/include/ddk/class2.h 2005-07-20 02:52:52 UTC (rev 16656) @@ -1,233 +0,0 @@
-/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: services/storage/include/class2.h - * PURPOSE: SCSI class driver definitions - * PROGRAMMER: Eric Kohl (ekohl@rz-online.de) - */ - -#ifndef __INCLUDE_DDK_CLASS2_H -#define __INCLUDE_DDK_CLASS2_H - -#include "ntddscsi.h" -#include "srb.h" - -#define MAXIMUM_RETRIES 15 -#define RETRY_WAIT 2000000 /* 200 ms in units of 100 ns */ - -struct _CLASS_INIT_DATA; - -typedef VOID STDCALL -(*PCLASS_ERROR)(IN PDEVICE_OBJECT DeviceObject, - IN PSCSI_REQUEST_BLOCK Srb, - IN OUT NTSTATUS *Status, - IN OUT BOOLEAN *Retry); - -typedef BOOLEAN STDCALL -(*PCLASS_DEVICE_CALLBACK)(IN PINQUIRYDATA); - -typedef NTSTATUS STDCALL -(*PCLASS_READ_WRITE)(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -typedef BOOLEAN STDCALL -(*PCLASS_FIND_DEVICES)(IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath, - IN struct _CLASS_INIT_DATA *InitializationData, - IN PDEVICE_OBJECT PortDeviceObject, - IN ULONG PortNumber); - -typedef NTSTATUS STDCALL -(*PCLASS_DEVICE_CONTROL)(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -typedef NTSTATUS STDCALL -(*PCLASS_SHUTDOWN_FLUSH)(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -typedef NTSTATUS STDCALL -(*PCLASS_CREATE_CLOSE)(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - - -typedef struct _CLASS_INIT_DATA -{ - ULONG InitializationDataSize; - ULONG DeviceExtensionSize; - DEVICE_TYPE DeviceType; - ULONG DeviceCharacteristics; - PCLASS_ERROR ClassError; - PCLASS_READ_WRITE ClassReadWriteVerification; - PCLASS_DEVICE_CALLBACK ClassFindDeviceCallBack; - PCLASS_FIND_DEVICES ClassFindDevices; - PCLASS_DEVICE_CONTROL ClassDeviceControl; - PCLASS_SHUTDOWN_FLUSH ClassShutdownFlush; - PCLASS_CREATE_CLOSE ClassCreateClose; - PDRIVER_STARTIO ClassStartIo; -} CLASS_INIT_DATA, *PCLASS_INIT_DATA; - - -typedef struct _DEVICE_EXTENSION -{ - PDEVICE_OBJECT DeviceObject; - PDEVICE_OBJECT PortDeviceObject; - LARGE_INTEGER PartitionLength; - LARGE_INTEGER StartingOffset; - ULONG DMByteSkew; - ULONG DMSkew; - BOOLEAN DMActive; - PCLASS_ERROR ClassError; - PCLASS_READ_WRITE ClassReadWriteVerification; - PCLASS_FIND_DEVICES ClassFindDevices; - PCLASS_DEVICE_CONTROL ClassDeviceControl; - PCLASS_SHUTDOWN_FLUSH ClassShutdownFlush; - PCLASS_CREATE_CLOSE ClassCreateClose; - PDRIVER_STARTIO ClassStartIo; - PIO_SCSI_CAPABILITIES PortCapabilities; - PDISK_GEOMETRY DiskGeometry; - PDEVICE_OBJECT PhysicalDevice; - PSENSE_DATA SenseData; - ULONG TimeOutValue; - ULONG DeviceNumber; - ULONG SrbFlags; - ULONG ErrorCount; - KSPIN_LOCK SplitRequestSpinLock; - NPAGED_LOOKASIDE_LIST SrbLookasideListHead; - LONG LockCount; - UCHAR PortNumber; - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - UCHAR SectorShift; - UCHAR ReservedByte; - USHORT DeviceFlags; - PKEVENT MediaChangeEvent; - HANDLE MediaChangeEventHandle; - BOOLEAN MediaChangeNoMedia; - ULONG MediaChangeCount; -} DEVICE_EXTENSION, *PDEVICE_EXTENSION; - - -typedef struct _COMPLETION_CONTEXT -{ - PDEVICE_OBJECT DeviceObject; - SCSI_REQUEST_BLOCK Srb; -} COMPLETION_CONTEXT, *PCOMPLETION_CONTEXT; - - -/* FUNCTIONS ****************************************************************/ - -NTSTATUS STDCALL -ScsiClassAsynchronousCompletion(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context); - -VOID STDCALL -ScsiClassBuildRequest(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -NTSTATUS STDCALL -ScsiClassClaimDevice(IN PDEVICE_OBJECT PortDeviceObject, - IN PSCSI_INQUIRY_DATA LunInfo, - IN BOOLEAN Release, - OUT PDEVICE_OBJECT *NewPortDeviceObject OPTIONAL); - -NTSTATUS STDCALL -ScsiClassCreateDeviceObject(IN PDRIVER_OBJECT DriverObject, - IN PCCHAR ObjectNameBuffer, - IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL, - IN OUT PDEVICE_OBJECT *DeviceObject, - IN PCLASS_INIT_DATA InitializationData); - -NTSTATUS STDCALL -ScsiClassDeviceControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -PVOID STDCALL -ScsiClassFindModePage(IN PCHAR ModeSenseBuffer, - IN ULONG Length, - IN UCHAR PageMode, - IN BOOLEAN Use6Byte); - -ULONG STDCALL -ScsiClassFindUnclaimedDevices(IN PCLASS_INIT_DATA InitializationData, - OUT PSCSI_ADAPTER_BUS_INFO AdapterInformation); - -NTSTATUS STDCALL -ScsiClassGetCapabilities(IN PDEVICE_OBJECT PortDeviceObject, - OUT PIO_SCSI_CAPABILITIES *PortCapabilities); - -NTSTATUS STDCALL -ScsiClassGetInquiryData(IN PDEVICE_OBJECT PortDeviceObject, - OUT PSCSI_ADAPTER_BUS_INFO *ConfigInfo); - -ULONG STDCALL -ScsiClassInitialize(IN PVOID Argument1, - IN PVOID Argument2, - IN PCLASS_INIT_DATA InitializationData); - -VOID STDCALL -ScsiClassInitializeSrbLookasideList(IN PDEVICE_EXTENSION DeviceExtension, - IN ULONG NumberElements); - -NTSTATUS STDCALL -ScsiClassInternalIoControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -BOOLEAN STDCALL -ScsiClassInterpretSenseInfo(IN PDEVICE_OBJECT DeviceObject, - IN PSCSI_REQUEST_BLOCK Srb, - IN UCHAR MajorFunctionCode, - IN ULONG IoDeviceCode, - IN ULONG RetryCount, - OUT NTSTATUS *Status); - -NTSTATUS STDCALL -ScsiClassIoComplete(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context); - -NTSTATUS STDCALL -ScsiClassIoCompleteAssociated(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context); - -ULONG STDCALL -ScsiClassModeSense(IN PDEVICE_OBJECT DeviceObject, - IN PCHAR ModeSenseBuffer, - IN ULONG Length, - IN UCHAR PageMode); - -ULONG STDCALL -ScsiClassQueryTimeOutRegistryValue(IN PUNICODE_STRING RegistryPath); - -NTSTATUS STDCALL -ScsiClassReadDriveCapacity(IN PDEVICE_OBJECT DeviceObject); - -VOID STDCALL -ScsiClassReleaseQueue(IN PDEVICE_OBJECT DeviceObject); - -NTSTATUS STDCALL -ScsiClassSendSrbAsynchronous(PDEVICE_OBJECT DeviceObject, - PSCSI_REQUEST_BLOCK Srb, - PIRP Irp, - PVOID BufferAddress, - ULONG BufferLength, - BOOLEAN WriteToDevice); - -NTSTATUS STDCALL -ScsiClassSendSrbSynchronous(PDEVICE_OBJECT DeviceObject, - PSCSI_REQUEST_BLOCK Srb, - PVOID BufferAddress, - ULONG BufferLength, - BOOLEAN WriteToDevice); - -VOID STDCALL -ScsiClassSplitRequest(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN ULONG MaximumBytes); - -#endif /* __INCLUDE_DDK_CLASS2_H */ - -/* EOF */ _____
Deleted: trunk/reactos/include/ddk/core.h --- trunk/reactos/include/ddk/core.h 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/include/ddk/core.h 2005-07-20 02:52:52 UTC (rev 16656) @@ -1,30 +0,0 @@
-#ifndef __INCLUDE_NAPI_CORE_H -#define __INCLUDE_NAPI_CORE_H - -#define MM_CORE_DUMP_HEADER_MAGIC (0xdeafbead) -#define MM_CORE_DUMP_HEADER_VERSION (0x1) - -#include <ddk/ntddscsi.h> -#include <ndk/ketypes.h> -typedef struct _MM_CORE_DUMP_HEADER -{ - ULONG Magic; - ULONG Version; - ULONG Type; - KTRAP_FRAME TrapFrame; - ULONG BugCheckCode; - ULONG BugCheckParameters[4]; - PVOID FaultingStackBase; - ULONG FaultingStackSize; - ULONG PhysicalMemorySize; -} MM_CORE_DUMP_HEADER, *PMM_CORE_DUMP_HEADER; - -typedef struct MM_CORE_DUMP_FUNCTIONS -{ - NTSTATUS (STDCALL *DumpPrepare)(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers); - NTSTATUS (STDCALL *DumpInit)(VOID); - NTSTATUS (STDCALL *DumpWrite)(LARGE_INTEGER Address, PMDL Mdl); - NTSTATUS (STDCALL *DumpFinish)(VOID); -} MM_CORE_DUMP_FUNCTIONS, *PMM_CORE_DUMP_FUNCTIONS; - -#endif /* __INCLUDE_NAPI_CORE_H */ _____
Deleted: trunk/reactos/include/ddk/ntifs.h --- trunk/reactos/include/ddk/ntifs.h 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/include/ddk/ntifs.h 2005-07-20 02:52:52 UTC (rev 16656) @@ -1,20 +0,0 @@
-#ifndef __INCLUDE_DDK_NTIFS_H -#define __INCLUDE_DDK_NTIFS_H - -#include_next <ddk/ntifs.h> - -NTSTATUS STDCALL -CcRosInitializeFileCache (PFILE_OBJECT FileObject, - ULONG CacheSegmentSize); -NTSTATUS STDCALL -CcRosReleaseFileCache (PFILE_OBJECT FileObject); - -#define FSCTL_ROS_QUERY_LCN_MAPPING \ - CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS) - -typedef struct _ROS_QUERY_LCN_MAPPING -{ - LARGE_INTEGER LcnDiskOffset; -} ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING; - -#endif /* __INCLUDE_DDK_NTIFS_H */ _____
Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-07-20 00:33:06 UTC (rev 16655) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-07-20 02:52:52 UTC (rev 16656)
[truncated at 1000 lines; 82 more skipped]