started moving tags to a private internal header

svn path=/trunk/; revision=15426

diff --git a/reactos/ntoskrnl/cc/view.c b/reactos/ntoskrnl/cc/view.c
index 172f5f4..35266a1 100644 (file)
--- a/reactos/ntoskrnl/cc/view.c
+++ b/reactos/ntoskrnl/cc/view.c
@@ -49,10 +49,6 @@
 #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
 #define ROUND_DOWN(N, S) (((N) % (S)) ? ROUND_UP(N, S) - S : N)
 
 #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
 #define ROUND_DOWN(N, S) (((N) % (S)) ? ROUND_UP(N, S) - S : N)
 

-#define TAG_CSEG  TAG('C', 'S', 'E', 'G')
-#define TAG_BCB   TAG('B', 'C', 'B', ' ')
-#define TAG_IBCB  TAG('i', 'B', 'C', 'B')
-

 static LIST_ENTRY DirtySegmentListHead;
 static LIST_ENTRY CacheSegmentListHead;
 static LIST_ENTRY CacheSegmentLRUListHead;
 static LIST_ENTRY DirtySegmentListHead;
 static LIST_ENTRY CacheSegmentListHead;
 static LIST_ENTRY CacheSegmentLRUListHead;

diff --git a/reactos/ntoskrnl/ex/resource.c b/reactos/ntoskrnl/ex/resource.c
index ac33636..d7e0434 100644 (file)
--- a/reactos/ntoskrnl/ex/resource.c
+++ b/reactos/ntoskrnl/ex/resource.c
@@ -41,12 +41,6 @@
 #define NDEBUG
 #include <internal/debug.h>
 
 #define NDEBUG
 #include <internal/debug.h>
 

-/* GLOBALS *******************************************************************/
-
-#define TAG_OWNER_TABLE     TAG('R', 'O', 'W', 'N')
-#define TAG_EXCLUSIVE_LOCK  TAG('E', 'R', 'E', 'L')
-#define TAG_SHARED_SEM      TAG('E', 'R', 'S', 'S')
-

 /* FUNCTIONS *****************************************************************/
 
 
 /* FUNCTIONS *****************************************************************/
 
 

diff --git a/reactos/ntoskrnl/fs/notify.c b/reactos/ntoskrnl/fs/notify.c
index 2b02721..527fd8c 100644 (file)
--- a/reactos/ntoskrnl/fs/notify.c
+++ b/reactos/ntoskrnl/fs/notify.c
@@ -16,8 +16,6 @@
 
 PAGED_LOOKASIDE_LIST    NotifyEntryLookaside;
 
 
 PAGED_LOOKASIDE_LIST    NotifyEntryLookaside;
 

-#define FSRTL_NOTIFY_TAG TAG('N','O','T','I')
-

 typedef struct _NOTIFY_ENTRY
 {
    LIST_ENTRY ListEntry;
 typedef struct _NOTIFY_ENTRY
 {
    LIST_ENTRY ListEntry;

diff --git a/reactos/ntoskrnl/include/internal/tag.h b/reactos/ntoskrnl/include/internal/tag.h
new file mode 100644 (file)
index 0000000..e7a36ab
--- /dev/null
+++ b/reactos/ntoskrnl/include/internal/tag.h
@@ -0,0 +1,68 @@
+/*
+ * NTOSKRNL Tag names.
+ * License GPL
+ *
+ * FIXME: Replace with standard GPL Header.
+ * FIXME: Add notes as needed
+ */
+
+#ifndef _NTOSKRNL_TAG_H
+#define _NTOSKRNL_TAG_H
+
+/* formerly located in cc/view.c */
+#define TAG_CSEG  TAG('C', 'S', 'E', 'G')
+#define TAG_BCB   TAG('B', 'C', 'B', ' ')
+#define TAG_IBCB  TAG('i', 'B', 'C', 'B')
+
+/* formerly located in ex/resource.c */
+#define TAG_OWNER_TABLE     TAG('R', 'O', 'W', 'N')
+#define TAG_EXCLUSIVE_LOCK  TAG('E', 'R', 'E', 'L')
+#define TAG_SHARED_SEM      TAG('E', 'R', 'S', 'S')
+
+/* formerly located in fs/notify.c */
+#define FSRTL_NOTIFY_TAG TAG('N','O','T','I')
+
+/* formerly located in io/device.c */
+#define TAG_DEVICE_EXTENSION   TAG('D', 'E', 'X', 'T')
+#define TAG_SHUTDOWN_ENTRY    TAG('S', 'H', 'U', 'T')
+#define TAG_IO_TIMER      TAG('I', 'O', 'T', 'M')
+
+/* formerly located in io/driver.c */
+#define TAG_DRIVER             TAG('D', 'R', 'V', 'R')
+#define TAG_DRIVER_EXTENSION   TAG('D', 'R', 'V', 'E')
+
+/* formerly located in io/file.c */
+#define TAG_SYSB        TAG('S', 'Y', 'S', 'B')
+#define TAG_LOCK        TAG('F','l','c','k')
+#define TAG_FILE_NAME   TAG('F', 'N', 'A', 'M')
+
+/* formerly located in io/fs.c */
+#define TAG_FILE_SYSTEM       TAG('F', 'S', 'Y', 'S')
+#define TAG_FS_CHANGE_NOTIFY  TAG('F', 'S', 'C', 'N')
+
+/* formerly located in io/iocomp.c */
+#define IOC_TAG   TAG('I', 'O', 'C', 'T')
+
+/* formerly located in io/iomgr.c */
+#define TAG_DEVICE_TYPE     TAG('D', 'E', 'V', 'T')
+#define TAG_FILE_TYPE       TAG('F', 'I', 'L', 'E')
+#define TAG_ADAPTER_TYPE    TAG('A', 'D', 'P', 'T')
+#define IO_LARGEIRP         TAG('I', 'r', 'p', 'l')
+#define IO_SMALLIRP         TAG('I', 'r', 'p', 's')
+#define IO_LARGEIRP_CPU     TAG('I', 'r', 'p', 'L')
+#define IO_SMALLIRP_CPU     TAG('I', 'r', 'p', 'S')
+#define IOC_TAG1             TAG('I', 'p', 'c', ' ')
+#define IOC_CPU             TAG('I', 'p', 'c', 'P')
+
+/* formerly located in io/work.c */
+#define TAG_IOWI TAG('I', 'O', 'W', 'I')
+
+/* formerly located in io/irp.c */
+#define TAG_IRP      TAG('I', 'R', 'P', ' ')
+#define TAG_SYS_BUF  TAG('S', 'Y', 'S' , 'B')
+
+/* formerly located in io/irq.c */
+#define TAG_KINTERRUPT   TAG('K', 'I', 'S', 'R')
+
+
+#endif /* _NTOSKRNL_TAG_H */

diff --git a/reactos/ntoskrnl/include/ntoskrnl.h b/reactos/ntoskrnl/include/ntoskrnl.h
index e1ad277..3f2c8ef 100755 (executable)
--- a/reactos/ntoskrnl/include/ntoskrnl.h
+++ b/reactos/ntoskrnl/include/ntoskrnl.h
@@ -62,6 +62,7 @@
 #include <internal/dbgk.h>
 #include <internal/trap.h>
 #include <internal/safe.h>
 #include <internal/dbgk.h>
 #include <internal/trap.h>
 #include <internal/safe.h>

+#include <internal/tag.h>

 #include <internal/test.h>
 #include <napi/core.h>
 #include <napi/dbg.h>
 #include <internal/test.h>
 #include <napi/core.h>
 #include <napi/dbg.h>

diff --git a/reactos/ntoskrnl/io/device.c b/reactos/ntoskrnl/io/device.c
index 4f9dd09..b07bb39 100644 (file)
--- a/reactos/ntoskrnl/io/device.c
+++ b/reactos/ntoskrnl/io/device.c
@@ -16,10 +16,6 @@
 
 /* GLOBALS ********************************************************************/
 
 
 /* GLOBALS ********************************************************************/
 

-#define TAG_DEVICE_EXTENSION   TAG('D', 'E', 'X', 'T')
-#define TAG_SHUTDOWN_ENTRY    TAG('S', 'H', 'U', 'T')
-#define TAG_IO_TIMER      TAG('I', 'O', 'T', 'M')
-

 static ULONG IopDeviceObjectNumber = 0;
 
 typedef struct _SHUTDOWN_ENTRY
 static ULONG IopDeviceObjectNumber = 0;
 
 typedef struct _SHUTDOWN_ENTRY

diff --git a/reactos/ntoskrnl/io/driver.c b/reactos/ntoskrnl/io/driver.c
index 8164b4e..a95a142 100644 (file)
--- a/reactos/ntoskrnl/io/driver.c
+++ b/reactos/ntoskrnl/io/driver.c
@@ -76,9 +76,6 @@ static UNICODE_STRING IopHardwareDatabaseKey =
 
 POBJECT_TYPE EXPORTED IoDriverObjectType = NULL;
 
 
 POBJECT_TYPE EXPORTED IoDriverObjectType = NULL;
 

-#define TAG_DRIVER             TAG('D', 'R', 'V', 'R')
-#define TAG_DRIVER_EXTENSION   TAG('D', 'R', 'V', 'E')
-

 /* DECLARATIONS ***************************************************************/
 
 VOID STDCALL
 /* DECLARATIONS ***************************************************************/
 
 VOID STDCALL

diff --git a/reactos/ntoskrnl/io/file.c b/reactos/ntoskrnl/io/file.c
index 0154378..4002e1c 100644 (file)
--- a/reactos/ntoskrnl/io/file.c
+++ b/reactos/ntoskrnl/io/file.c
@@ -16,10 +16,6 @@
 
 /* GLOBALS *******************************************************************/
 
 
 /* GLOBALS *******************************************************************/
 

-#define TAG_SYSB        TAG('S', 'Y', 'S', 'B')
-#define TAG_LOCK        TAG('F','l','c','k')
-#define TAG_FILE_NAME   TAG('F', 'N', 'A', 'M')
-

 extern GENERIC_MAPPING IopFileMapping;
 
 NTSTATUS
 extern GENERIC_MAPPING IopFileMapping;
 
 NTSTATUS

diff --git a/reactos/ntoskrnl/io/fs.c b/reactos/ntoskrnl/io/fs.c
index 7478551..d92d325 100644 (file)
--- a/reactos/ntoskrnl/io/fs.c
+++ b/reactos/ntoskrnl/io/fs.c
@@ -38,10 +38,6 @@ static LIST_ENTRY FileSystemListHead;
 static KGUARDED_MUTEX FsChangeNotifyListLock;
 static LIST_ENTRY FsChangeNotifyListHead;
 
 static KGUARDED_MUTEX FsChangeNotifyListLock;
 static LIST_ENTRY FsChangeNotifyListHead;
 

-#define TAG_FILE_SYSTEM       TAG('F', 'S', 'Y', 'S')
-#define TAG_FS_CHANGE_NOTIFY  TAG('F', 'S', 'C', 'N')
-
-

 static VOID
 IopNotifyFileSystemChange(PDEVICE_OBJECT DeviceObject,
                          BOOLEAN DriverActive);
 static VOID
 IopNotifyFileSystemChange(PDEVICE_OBJECT DeviceObject,
                          BOOLEAN DriverActive);

diff --git a/reactos/ntoskrnl/io/iocomp.c b/reactos/ntoskrnl/io/iocomp.c
index b6e1e03..01adc74 100644 (file)
--- a/reactos/ntoskrnl/io/iocomp.c
+++ b/reactos/ntoskrnl/io/iocomp.c
@@ -13,8 +13,6 @@
 #define NDEBUG
 #include <internal/debug.h>
 
 #define NDEBUG
 #include <internal/debug.h>
 

-#define IOC_TAG   TAG('I', 'O', 'C', 'T')
-

 POBJECT_TYPE IoCompletionType;
 
 NPAGED_LOOKASIDE_LIST IoCompletionPacketLookaside;
 POBJECT_TYPE IoCompletionType;
 
 NPAGED_LOOKASIDE_LIST IoCompletionPacketLookaside;

diff --git a/reactos/ntoskrnl/io/iomgr.c b/reactos/ntoskrnl/io/iomgr.c
index 52a8a9d..dd2d0b4 100644 (file)
--- a/reactos/ntoskrnl/io/iomgr.c
+++ b/reactos/ntoskrnl/io/iomgr.c
@@ -13,18 +13,6 @@
 #define NDEBUG
 #include <internal/debug.h>
 
 #define NDEBUG
 #include <internal/debug.h>
 

-/* GLOBALS *******************************************************************/
-
-#define TAG_DEVICE_TYPE     TAG('D', 'E', 'V', 'T')
-#define TAG_FILE_TYPE       TAG('F', 'I', 'L', 'E')
-#define TAG_ADAPTER_TYPE    TAG('A', 'D', 'P', 'T')
-#define IO_LARGEIRP         TAG('I', 'r', 'p', 'l')
-#define IO_SMALLIRP         TAG('I', 'r', 'p', 's')
-#define IO_LARGEIRP_CPU     TAG('I', 'r', 'p', 'L')
-#define IO_SMALLIRP_CPU     TAG('I', 'r', 'p', 'S')
-#define IOC_TAG             TAG('I', 'p', 'c', ' ')
-#define IOC_CPU             TAG('I', 'p', 'c', 'P')
-

 /* DATA ********************************************************************/
 
 POBJECT_TYPE EXPORTED IoDeviceObjectType = NULL;
 /* DATA ********************************************************************/
 
 POBJECT_TYPE EXPORTED IoDeviceObjectType = NULL;


@@ -105,7 +93,7 @@ IopInitLookasideLists(VOID)
                                     NULL,
                                     0,
                                     sizeof(IO_COMPLETION_PACKET),
                                     NULL,
                                     0,
                                     sizeof(IO_COMPLETION_PACKET),

-                                    IOC_TAG,
+                                    IOC_TAG1,

                                     0);
                                     
     /* Now allocate the per-processor lists */
                                     0);
                                     
     /* Now allocate the per-processor lists */

diff --git a/reactos/ntoskrnl/io/iowork.c b/reactos/ntoskrnl/io/iowork.c
index f27c176..838d2a9 100644 (file)
--- a/reactos/ntoskrnl/io/iowork.c
+++ b/reactos/ntoskrnl/io/iowork.c
@@ -25,10 +25,6 @@ typedef struct _IO_WORKITEM
   PVOID           Context;
 } IO_WORKITEM;
 
   PVOID           Context;
 } IO_WORKITEM;
 

-/* GLOBALS ******************************************************************/
-
-#define TAG_IOWI TAG('I', 'O', 'W', 'I')
-

 /* FUNCTIONS ****************************************************************/
 
 VOID STATIC STDCALL
 /* FUNCTIONS ****************************************************************/
 
 VOID STATIC STDCALL

diff --git a/reactos/ntoskrnl/io/irp.c b/reactos/ntoskrnl/io/irp.c
index 71b748e..af9c36c 100644 (file)
--- a/reactos/ntoskrnl/io/irp.c
+++ b/reactos/ntoskrnl/io/irp.c
@@ -15,11 +15,6 @@
 #define NDEBUG
 #include <internal/debug.h>
 
 #define NDEBUG
 #include <internal/debug.h>
 

-/* GLOBALS *******************************************************************/
-
-#define TAG_IRP      TAG('I', 'R', 'P', ' ')
-#define TAG_SYS_BUF  TAG('S', 'Y', 'S' , 'B')
-

 /* PRIVATE FUNCTIONS  ********************************************************/
 
 VOID
 /* PRIVATE FUNCTIONS  ********************************************************/
 
 VOID

diff --git a/reactos/ntoskrnl/io/irq.c b/reactos/ntoskrnl/io/irq.c
index ecb75fc..d80f7c0 100644 (file)
--- a/reactos/ntoskrnl/io/irq.c
+++ b/reactos/ntoskrnl/io/irq.c
@@ -14,10 +14,6 @@
 #define NDEBUG
 #include <internal/debug.h>
 
 #define NDEBUG
 #include <internal/debug.h>
 

-/* GLOBALS *****************************************************************/
-
-#define TAG_KINTERRUPT   TAG('K', 'I', 'S', 'R')
-

 /* FUNCTIONS *****************************************************************/
 
 /*
 /* FUNCTIONS *****************************************************************/
 
 /*

diff --git a/reactos/ntoskrnl/io/rawfs.c b/reactos/ntoskrnl/io/rawfs.c
index b19e58e..6881de8 100755 (executable)
--- a/reactos/ntoskrnl/io/rawfs.c
+++ b/reactos/ntoskrnl/io/rawfs.c
@@ -90,8 +90,6 @@ typedef struct _RAWFS_CCB
 
 /* GLOBALS ******************************************************************/
 
 
 /* GLOBALS ******************************************************************/
 

-#define TAG_IRP TAG('R', 'I', 'R', 'P')
-

 static PDRIVER_OBJECT RawFsDriverObject;
 static PDEVICE_OBJECT DiskDeviceObject;
 static PDEVICE_OBJECT CdromDeviceObject;
 static PDRIVER_OBJECT RawFsDriverObject;
 static PDEVICE_OBJECT DiskDeviceObject;
 static PDEVICE_OBJECT CdromDeviceObject;