From a5a859587a7c29d03aa027310aa35d0388cb72e8 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Mon, 16 Nov 2015 16:44:25 -0800
Subject: [PATCH] sys: minor reorg

---
 build/VStudio/winfsp.vcxproj.filters | 48 ++++++++++++++--------------
 src/sys/driver.c                     |  4 +--
 src/sys/driver.h                     |  3 ++
 src/sys/security.c                   |  2 +-
 4 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/build/VStudio/winfsp.vcxproj.filters b/build/VStudio/winfsp.vcxproj.filters
index ac1c488d..8e67bd2f 100644
--- a/build/VStudio/winfsp.vcxproj.filters
+++ b/build/VStudio/winfsp.vcxproj.filters
@@ -15,9 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\sys\driver.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\sys\cleanup.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -27,43 +24,46 @@
     <ClCompile Include="..\..\src\sys\create.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\sys\read.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sys\write.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\sys\devctrl.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\sys\dirctrl.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\sys\fsctrl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sys\flush.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sys\lockctrl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sys\fileinfo.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sys\volinfo.c">
+    <ClCompile Include="..\..\src\sys\driver.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\sys\ea.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\sys\shutdown.c">
+    <ClCompile Include="..\..\src\sys\fastio.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sys\fileinfo.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sys\flush.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sys\fsctrl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sys\lockctrl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sys\read.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\sys\security.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\sys\fastio.c">
+    <ClCompile Include="..\..\src\sys\shutdown.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sys\volinfo.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sys\write.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/src/sys/driver.c b/src/sys/driver.c
index c3cca897..b63cbf69 100644
--- a/src/sys/driver.c
+++ b/src/sys/driver.c
@@ -6,8 +6,6 @@
 
 #include <sys/driver.h>
 
-PDEVICE_OBJECT FspDeviceObject;
-
 DRIVER_INITIALIZE DriverEntry;
 DRIVER_UNLOAD FspUnload;
 
@@ -105,3 +103,5 @@ FspUnload(
 {
     UNREFERENCED_PARAMETER(DriverObject);
 }
+
+PDEVICE_OBJECT FspDeviceObject;
diff --git a/src/sys/driver.h b/src/sys/driver.h
index dd258a77..b9d9d2c4 100644
--- a/src/sys/driver.h
+++ b/src/sys/driver.h
@@ -42,4 +42,7 @@ DRIVER_DISPATCH FspWrite;
 /* fast I/O */
 FAST_IO_CHECK_IF_POSSIBLE FspFastIoCheckIfPossible;
 
+/* extern */
+PDEVICE_OBJECT FspDeviceObject;
+
 #endif
diff --git a/src/sys/security.c b/src/sys/security.c
index 06b62364..d1807c8e 100644
--- a/src/sys/security.c
+++ b/src/sys/security.c
@@ -1,5 +1,5 @@
 /**
- * @file sys/seinfo.c
+ * @file sys/security.c
  *
  * @copyright 2015 Bill Zissimopoulos
  */