Modified: trunk/reactos/ntoskrnl/cc/view.c
Modified: trunk/reactos/ntoskrnl/ex/resource.c
Modified: trunk/reactos/ntoskrnl/fs/notify.c
Added: trunk/reactos/ntoskrnl/include/internal/tag.h
Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h
Modified: trunk/reactos/ntoskrnl/io/device.c
Modified: trunk/reactos/ntoskrnl/io/driver.c
Modified: trunk/reactos/ntoskrnl/io/file.c
Modified: trunk/reactos/ntoskrnl/io/fs.c
Modified: trunk/reactos/ntoskrnl/io/iocomp.c
Modified: trunk/reactos/ntoskrnl/io/iomgr.c
Modified: trunk/reactos/ntoskrnl/io/iowork.c
Modified: trunk/reactos/ntoskrnl/io/irp.c
Modified: trunk/reactos/ntoskrnl/io/irq.c
Modified: trunk/reactos/ntoskrnl/io/rawfs.c
--- trunk/reactos/ntoskrnl/cc/view.c 2005-05-20 02:46:26 UTC (rev 15425)
+++ trunk/reactos/ntoskrnl/cc/view.c 2005-05-20 03:50:13 UTC (rev 15426)
@@ -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 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;
--- trunk/reactos/ntoskrnl/ex/resource.c 2005-05-20 02:46:26 UTC (rev 15425)
+++ trunk/reactos/ntoskrnl/ex/resource.c 2005-05-20 03:50:13 UTC (rev 15426)
@@ -41,12 +41,6 @@
#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 *****************************************************************/
--- trunk/reactos/ntoskrnl/fs/notify.c 2005-05-20 02:46:26 UTC (rev 15425)
+++ trunk/reactos/ntoskrnl/fs/notify.c 2005-05-20 03:50:13 UTC (rev 15426)
@@ -16,8 +16,6 @@
PAGED_LOOKASIDE_LIST NotifyEntryLookaside;
-#define FSRTL_NOTIFY_TAG TAG('N','O','T','I')
-
typedef struct _NOTIFY_ENTRY
{
LIST_ENTRY ListEntry;
--- trunk/reactos/ntoskrnl/include/internal/tag.h 2005-05-20 02:46:26 UTC (rev 15425)
+++ trunk/reactos/ntoskrnl/include/internal/tag.h 2005-05-20 03:50:13 UTC (rev 15426)
@@ -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 */
--- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-05-20 02:46:26 UTC (rev 15425)
+++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-05-20 03:50:13 UTC (rev 15426)
@@ -62,6 +62,7 @@
#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>
--- trunk/reactos/ntoskrnl/io/device.c 2005-05-20 02:46:26 UTC (rev 15425)
+++ trunk/reactos/ntoskrnl/io/device.c 2005-05-20 03:50:13 UTC (rev 15426)
@@ -16,10 +16,6 @@
/* 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
--- trunk/reactos/ntoskrnl/io/driver.c 2005-05-20 02:46:26 UTC (rev 15425)
+++ trunk/reactos/ntoskrnl/io/driver.c 2005-05-20 03:50:13 UTC (rev 15426)
@@ -76,9 +76,6 @@
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
--- trunk/reactos/ntoskrnl/io/file.c 2005-05-20 02:46:26 UTC (rev 15425)
+++ trunk/reactos/ntoskrnl/io/file.c 2005-05-20 03:50:13 UTC (rev 15426)
@@ -16,10 +16,6 @@
/* 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
--- trunk/reactos/ntoskrnl/io/fs.c 2005-05-20 02:46:26 UTC (rev 15425)
+++ trunk/reactos/ntoskrnl/io/fs.c 2005-05-20 03:50:13 UTC (rev 15426)
@@ -38,10 +38,6 @@
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);
--- trunk/reactos/ntoskrnl/io/iocomp.c 2005-05-20 02:46:26 UTC (rev 15425)
+++ trunk/reactos/ntoskrnl/io/iocomp.c 2005-05-20 03:50:13 UTC (rev 15426)
@@ -13,8 +13,6 @@
#define NDEBUG
#include <internal/debug.h>
-#define IOC_TAG TAG('I', 'O', 'C', 'T')
-
POBJECT_TYPE IoCompletionType;
NPAGED_LOOKASIDE_LIST IoCompletionPacketLookaside;
--- trunk/reactos/ntoskrnl/io/iomgr.c 2005-05-20 02:46:26 UTC (rev 15425)
+++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-05-20 03:50:13 UTC (rev 15426)
@@ -13,18 +13,6 @@
#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;
@@ -105,7 +93,7 @@
NULL,
0,
sizeof(IO_COMPLETION_PACKET),
- IOC_TAG,
+ IOC_TAG1,
0);
/* Now allocate the per-processor lists */
--- trunk/reactos/ntoskrnl/io/iowork.c 2005-05-20 02:46:26 UTC (rev 15425)
+++ trunk/reactos/ntoskrnl/io/iowork.c 2005-05-20 03:50:13 UTC (rev 15426)
@@ -25,10 +25,6 @@
PVOID Context;
} IO_WORKITEM;
-/* GLOBALS ******************************************************************/
-
-#define TAG_IOWI TAG('I', 'O', 'W', 'I')
-
/* FUNCTIONS ****************************************************************/
VOID STATIC STDCALL
--- trunk/reactos/ntoskrnl/io/irp.c 2005-05-20 02:46:26 UTC (rev 15425)
+++ trunk/reactos/ntoskrnl/io/irp.c 2005-05-20 03:50:13 UTC (rev 15426)
@@ -15,11 +15,6 @@
#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
--- trunk/reactos/ntoskrnl/io/irq.c 2005-05-20 02:46:26 UTC (rev 15425)
+++ trunk/reactos/ntoskrnl/io/irq.c 2005-05-20 03:50:13 UTC (rev 15426)
@@ -14,10 +14,6 @@
#define NDEBUG
#include <internal/debug.h>
-/* GLOBALS *****************************************************************/
-
-#define TAG_KINTERRUPT TAG('K', 'I', 'S', 'R')
-
/* FUNCTIONS *****************************************************************/
/*
--- trunk/reactos/ntoskrnl/io/rawfs.c 2005-05-20 02:46:26 UTC (rev 15425)
+++ trunk/reactos/ntoskrnl/io/rawfs.c 2005-05-20 03:50:13 UTC (rev 15426)
@@ -90,8 +90,6 @@
/* GLOBALS ******************************************************************/
-#define TAG_IRP TAG('R', 'I', 'R', 'P')
-
static PDRIVER_OBJECT RawFsDriverObject;
static PDEVICE_OBJECT DiskDeviceObject;
static PDEVICE_OBJECT CdromDeviceObject;