- Get rid of ccros.h, deprecated by revision 42175
authorStefan Ginsberg <stefanginsberg@gmail.com>
Fri, 24 Jul 2009 17:35:28 +0000 (17:35 +0000)
committerStefan Ginsberg <stefanginsberg@gmail.com>
Fri, 24 Jul 2009 17:35:28 +0000 (17:35 +0000)
svn path=/trunk/; revision=42176

reactos/drivers/filesystems/fastfat/fsctl.c
reactos/drivers/filesystems/fastfat/vfat.h
reactos/include/reactos/ccros.h [deleted file]
reactos/lib/fslib/vfatlib/check/vfat.h
reactos/ntoskrnl/include/internal/cc.h
reactos/ntoskrnl/include/precomp.h

index 05e2629..973c122 100644 (file)
@@ -773,30 +773,6 @@ VfatMoveFile(PVFAT_IRP_CONTEXT IrpContext)
    return STATUS_INVALID_DEVICE_REQUEST;
 }
 
-#ifdef USE_ROS_CC_AND_FS
-static NTSTATUS
-VfatRosQueryLcnMapping(PVFAT_IRP_CONTEXT IrpContext)
-{
-   PDEVICE_EXTENSION DeviceExt;
-   PROS_QUERY_LCN_MAPPING LcnQuery;
-   PIO_STACK_LOCATION Stack;
-
-   DPRINT("VfatRosQueryLcnMapping(IrpContext %p)\n", IrpContext);
-
-   DeviceExt = IrpContext->DeviceExt;
-   Stack = IrpContext->Stack;
-   if (IrpContext->Irp->AssociatedIrp.SystemBuffer == NULL ||
-       Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ROS_QUERY_LCN_MAPPING))
-   {
-      return STATUS_BUFFER_TOO_SMALL;
-   }
-   LcnQuery = (PROS_QUERY_LCN_MAPPING)(IrpContext->Irp->AssociatedIrp.SystemBuffer);
-   LcnQuery->LcnDiskOffset.QuadPart = DeviceExt->FatInfo.dataStart * DeviceExt->FatInfo.BytesPerSector;
-   IrpContext->Irp->IoStatus.Information = sizeof(ROS_QUERY_LCN_MAPPING);
-   return(STATUS_SUCCESS);
-}
-#endif
-
 static NTSTATUS
 VfatIsVolumeDirty(PVFAT_IRP_CONTEXT IrpContext)
 {
@@ -877,11 +853,6 @@ NTSTATUS VfatFileSystemControl(PVFAT_IRP_CONTEXT IrpContext)
             case FSCTL_MOVE_FILE:
                Status = VfatMoveFile(IrpContext);
                break;
-#ifdef USE_ROS_CC_AND_FS
-            case FSCTL_ROS_QUERY_LCN_MAPPING:
-               Status = VfatRosQueryLcnMapping(IrpContext);
-               break;
-#endif
             case FSCTL_IS_VOLUME_DIRTY:
                Status = VfatIsVolumeDirty(IrpContext);
                break;
index 0a5deb5..ac02d26 100644 (file)
@@ -2,8 +2,6 @@
 #include <ntdddisk.h>
 #include <debug.h>
 
-#include <ccros.h>
-
 #define USE_ROS_CC_AND_FS
 
 #define ROUND_DOWN(n, align) \
diff --git a/reactos/include/reactos/ccros.h b/reactos/include/reactos/ccros.h
deleted file mode 100644 (file)
index 989ba47..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __INCLUDE_DDK_NTIFS_H
-#define __INCLUDE_DDK_NTIFS_H
-
-NTSTATUS NTAPI
-CcRosInitializeFileCache(PFILE_OBJECT FileObject,
-                         ULONG CacheSegmentSize,
-                         PCACHE_MANAGER_CALLBACKS CallBacks,
-                         PVOID LazyWriterContext);
-
-NTSTATUS NTAPI
-CcRosReleaseFileCache (PFILE_OBJECT    FileObject);
-
-struct _BCB;
-
-VOID
-NTAPI
-CcRosTraceCacheMap (
-       struct _BCB* Bcb,
-       BOOLEAN Trace );
-
-#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 */
index 25b79d6..79e2357 100755 (executable)
@@ -3,7 +3,6 @@
 #include <ddk/ntifs.h>
 #include <ddk/ntdddisk.h>
 #include <ndk/ntndk.h>
-#include <ccros.h>
 #include <limits.h>
 #include <debug.h>
 
index f04e197..a2d769b 100644 (file)
@@ -297,6 +297,21 @@ CcRosRequestCacheSegment(
     CACHE_SEGMENT **CacheSeg
 );
 
+NTSTATUS
+NTAPI
+CcRosInitializeFileCache(
+    PFILE_OBJECT FileObject,
+    ULONG CacheSegmentSize,
+    PCACHE_MANAGER_CALLBACKS CallBacks,
+    PVOID LazyWriterContext
+);
+
+NTSTATUS
+NTAPI
+CcRosReleaseFileCache(
+    PFILE_OBJECT FileObject
+);
+
 NTSTATUS
 NTAPI
 CcTryToInitializeFileCache(PFILE_OBJECT FileObject);
index b6ebb02..9057f20 100644 (file)
@@ -28,8 +28,7 @@
 #define TEXT(s) L##s
 #include <regstr.h>
 
-/* FIXME: Temporary until CC Ros is gone */
-#include <ccros.h>
+/* FIXME: Temporary until Winldr is used */
 #include <rosldr.h>
 
 /* Disk Dump Driver Header */