From 5a240fdcbeafbc7a964fe2ad3c7a912b4d622f8a Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Fri, 11 Mar 2016 16:52:35 -0800
Subject: [PATCH] sys: DeviceExtensionKindSym

---
 src/sys/debug.c  | 15 +++++++++++++++
 src/sys/driver.h |  7 ++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/sys/debug.c b/src/sys/debug.c
index 5aee230e..be0d66df 100644
--- a/src/sys/debug.c
+++ b/src/sys/debug.c
@@ -264,6 +264,21 @@ const char *FsInformationClassSym(FS_INFORMATION_CLASS FsInformationClass)
     }
 }
 
+const char *DeviceExtensionKindSym(UINT32 Kind)
+{
+    switch (Kind)
+    {
+    case FspFsctlDeviceExtensionKind:
+        return "Ctl";
+    case FspFsvrtDeviceExtensionKind:
+        return "Vrt";
+    case FspFsvolDeviceExtensionKind:
+        return "Vol";
+    default:
+        return "***";
+    }
+}
+
 ULONG DebugRandom(VOID)
 {
     static KSPIN_LOCK SpinLock = 0;
diff --git a/src/sys/driver.h b/src/sys/driver.h
index f8799e93..d94307b3 100644
--- a/src/sys/driver.h
+++ b/src/sys/driver.h
@@ -162,7 +162,7 @@ extern __declspec(selectany) int fsp_dt = 1;
                 FSP_STATUS_IOQ_POST == Result || FSP_STATUS_IOQ_POST_BEST_EFFORT == Result);\
             FSP_DEBUGLOG_("%p, %s%c, %s%s, " fmt, " = %s[%lld]",\
                 Irp,                    \
-                (const char *)&FspDeviceExtension(IrpSp->DeviceObject)->Kind,\
+                DeviceExtensionKindSym(FspDeviceExtension(IrpSp->DeviceObject)->Kind),\
                 Irp->RequestorMode == KernelMode ? 'K' : 'U',\
                 IrpMajorFunctionSym(IrpSp->MajorFunction),\
                 IrpMinorFunctionSym(IrpSp->MajorFunction, IrpSp->MinorFunction),\
@@ -197,7 +197,7 @@ extern __declspec(selectany) int fsp_dt = 1;
             ASSERT(0 == (FSP_STATUS_PRIVATE_BIT & Result));\
             FSP_DEBUGLOG_NOCRIT_("%p, %s%c, %s%s, " fmt, " = %s[%lld]",\
                 Irp,                    \
-                (const char *)&FspDeviceExtension(IrpSp->DeviceObject)->Kind,\
+                DeviceExtensionKindSym(FspDeviceExtension(IrpSp->DeviceObject)->Kind),\
                 Irp->RequestorMode == KernelMode ? 'K' : 'U',\
                 IrpMajorFunctionSym(IrpSp->MajorFunction),\
                 IrpMinorFunctionSym(IrpSp->MajorFunction, IrpSp->MinorFunction),\
@@ -866,6 +866,7 @@ const char *IrpMinorFunctionSym(UCHAR MajorFunction, UCHAR MinorFunction);
 const char *IoctlCodeSym(ULONG ControlCode);
 const char *FileInformationClassSym(FILE_INFORMATION_CLASS FileInformationClass);
 const char *FsInformationClassSym(FS_INFORMATION_CLASS FsInformationClass);
+const char *DeviceExtensionKindSym(UINT32 Kind);
 ULONG DebugRandom(VOID);
 static inline
 VOID FspDebugLogIrp(const char *func, PIRP Irp, NTSTATUS Result)
@@ -875,7 +876,7 @@ VOID FspDebugLogIrp(const char *func, PIRP Irp, NTSTATUS Result)
         KeGetCurrentIrql(),
         func,
         Irp,
-        (const char *)&FspDeviceExtension(IrpSp->DeviceObject)->Kind,
+        DeviceExtensionKindSym(FspDeviceExtension(IrpSp->DeviceObject)->Kind),
         Irp->RequestorMode == KernelMode ? 'K' : 'U',
         IrpMajorFunctionSym(IrpSp->MajorFunction),
         IrpMinorFunctionSym(IrpSp->MajorFunction, IrpSp->MinorFunction),