move "special" drivers & wrappers up a level

30 files changed, 16 insertions, 18 deletions

diff --git a/.appveyor/build.ps1 b/.appveyor/build.ps1
index 18e7cc6..a98c4f0 100644
--- a/.appveyor/build.ps1
+++ b/.appveyor/build.ps1
@@ -115,7 +115,7 @@ function Build-ProjectKernelMode {
         [string] $DriverTargetOS
     )
 
-    $drivers = 'minimal', 'simple', 'special\nt_namespace'
+    $drivers = 'minimal', 'simple', 'nt_namespace'
 
     foreach ($driver in $drivers) {
         Build-Driver                      `
diff --git a/km/build/wdk8.1update/special/nt_namespace/.gitignore b/km/build/wdk8.1update/nt_namespace/.gitignore
index 4ded7c4..4ded7c4 100644
--- a/km/build/wdk8.1update/special/nt_namespace/.gitignore
+++ b/km/build/wdk8.1update/nt_namespace/.gitignore
diff --git a/km/build/wdk8.1update/special/nt_namespace/nt_namespace.vs12.sln b/km/build/wdk8.1update/nt_namespace/nt_namespace.vs12.sln
index 7b06101..7b06101 100644
--- a/km/build/wdk8.1update/special/nt_namespace/nt_namespace.vs12.sln
+++ b/km/build/wdk8.1update/nt_namespace/nt_namespace.vs12.sln
diff --git a/km/build/wdk8.1update/special/nt_namespace/nt_namespace.vs12.vcxproj b/km/build/wdk8.1update/nt_namespace/nt_namespace.vs12.vcxproj
index 9b33bb0..6e4fe96 100644
--- a/km/build/wdk8.1update/special/nt_namespace/nt_namespace.vs12.vcxproj
+++ b/km/build/wdk8.1update/nt_namespace/nt_namespace.vs12.vcxproj
@@ -217,16 +217,16 @@
     <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\special\nt_namespace\control_codes.h" />
-    <ClInclude Include="..\..\..\..\src\special\nt_namespace\device.h" />
-    <ClInclude Include="..\..\..\..\src\special\nt_namespace\nt2dos.h" />
+    <ClInclude Include="..\..\..\src\nt_namespace\control_codes.h" />
+    <ClInclude Include="..\..\..\src\nt_namespace\device.h" />
+    <ClInclude Include="..\..\..\src\nt_namespace\nt2dos.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\special\nt_namespace\device.c" />
-    <ClCompile Include="..\..\..\..\src\special\nt_namespace\main.c" />
-    <ClCompile Include="..\..\..\..\src\special\nt_namespace\nt2dos.c" />
+    <ClCompile Include="..\..\..\src\nt_namespace\device.c" />
+    <ClCompile Include="..\..\..\src\nt_namespace\main.c" />
+    <ClCompile Include="..\..\..\src\nt_namespace\nt2dos.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/km/build/wdk8.1update/special/sysenter/.gitignore b/km/build/wdk8.1update/sysenter/.gitignore
index 4ded7c4..4ded7c4 100644
--- a/km/build/wdk8.1update/special/sysenter/.gitignore
+++ b/km/build/wdk8.1update/sysenter/.gitignore
diff --git a/km/build/wdk8.1update/special/sysenter/sysenter.vs12.sln b/km/build/wdk8.1update/sysenter/sysenter.vs12.sln
index ec3ab31..ec3ab31 100644
--- a/km/build/wdk8.1update/special/sysenter/sysenter.vs12.sln
+++ b/km/build/wdk8.1update/sysenter/sysenter.vs12.sln
diff --git a/km/build/wdk8.1update/special/sysenter/sysenter.vs12.vcxproj b/km/build/wdk8.1update/sysenter/sysenter.vs12.vcxproj
index 966eb6a..4576a18 100644
--- a/km/build/wdk8.1update/special/sysenter/sysenter.vs12.vcxproj
+++ b/km/build/wdk8.1update/sysenter/sysenter.vs12.vcxproj
@@ -57,9 +57,9 @@
     <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\special\sysenter\main.c" />
+    <ClCompile Include="..\..\..\src\sysenter\main.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/km/src/dirs b/km/src/dirs
index a32bc1d..7824a20 100644
--- a/km/src/dirs
+++ b/km/src/dirs
@@ -1 +1 @@
-DIRS = minimal simple special
+DIRS = minimal nt_namespace simple
diff --git a/km/src/special/nt_namespace/control_codes.h b/km/src/nt_namespace/control_codes.h
index 3fb2aff..3fb2aff 100644
--- a/km/src/special/nt_namespace/control_codes.h
+++ b/km/src/nt_namespace/control_codes.h
diff --git a/km/src/special/nt_namespace/device.c b/km/src/nt_namespace/device.c
index 6d88dc4..6d88dc4 100644
--- a/km/src/special/nt_namespace/device.c
+++ b/km/src/nt_namespace/device.c
diff --git a/km/src/special/nt_namespace/device.h b/km/src/nt_namespace/device.h
index 4f117e9..4f117e9 100644
--- a/km/src/special/nt_namespace/device.h
+++ b/km/src/nt_namespace/device.h
diff --git a/km/src/special/nt_namespace/main.c b/km/src/nt_namespace/main.c
index a1c08e8..a1c08e8 100644
--- a/km/src/special/nt_namespace/main.c
+++ b/km/src/nt_namespace/main.c
diff --git a/km/src/special/nt_namespace/makefile b/km/src/nt_namespace/makefile
index 5acbbd2..5acbbd2 100644
--- a/km/src/special/nt_namespace/makefile
+++ b/km/src/nt_namespace/makefile
diff --git a/km/src/special/nt_namespace/nt2dos.c b/km/src/nt_namespace/nt2dos.c
index d1bdb3d..d1bdb3d 100644
--- a/km/src/special/nt_namespace/nt2dos.c
+++ b/km/src/nt_namespace/nt2dos.c
diff --git a/km/src/special/nt_namespace/nt2dos.h b/km/src/nt_namespace/nt2dos.h
index ce0b690..ce0b690 100644
--- a/km/src/special/nt_namespace/nt2dos.h
+++ b/km/src/nt_namespace/nt2dos.h
diff --git a/km/src/special/nt_namespace/sources b/km/src/nt_namespace/sources
index 7629a23..7629a23 100644
--- a/km/src/special/nt_namespace/sources
+++ b/km/src/nt_namespace/sources
diff --git a/km/src/special/dirs b/km/src/special/dirs
deleted file mode 100644
index 6492e74..0000000
--- a/km/src/special/dirs
+++ /dev/null
@@ -1 +0,0 @@
-DIRS = nt_namespace sysenter
diff --git a/km/src/special/sysenter/main.c b/km/src/sysenter/main.c
index 9eb9b28..9eb9b28 100644
--- a/km/src/special/sysenter/main.c
+++ b/km/src/sysenter/main.c
diff --git a/km/src/special/sysenter/makefile b/km/src/sysenter/makefile
index 5acbbd2..5acbbd2 100644
--- a/km/src/special/sysenter/makefile
+++ b/km/src/sysenter/makefile
diff --git a/km/src/special/sysenter/sources b/km/src/sysenter/sources
index d6371b3..d6371b3 100644
--- a/km/src/special/sysenter/sources
+++ b/km/src/sysenter/sources
diff --git a/um/README.md b/um/README.md
index 9a81633..1ed9fdd 100644
--- a/um/README.md
+++ b/um/README.md
@@ -10,8 +10,8 @@ A couple of usage examples are included along with the drivers.
 [libservice]: service/README.md
 [libsimple]: wrappers/simple/README.md
 [simple]: ../km/src/simple
-[libnt_namespace]: wrappers/special/nt_namespace/README.md
-[nt_namespace]: ../km/src/special/nt_namespace
+[libnt_namespace]: wrappers/nt_namespace/README.md
+[nt_namespace]: ../km/src/nt_namespace
 
 Building
 --------
diff --git a/um/wrappers/CMakeLists.txt b/um/wrappers/CMakeLists.txt
index 834a76b..d7baf64 100644
--- a/um/wrappers/CMakeLists.txt
+++ b/um/wrappers/CMakeLists.txt
@@ -1,2 +1,2 @@
+add_subdirectory(nt_namespace)
 add_subdirectory(simple)
-add_subdirectory(special)
diff --git a/um/wrappers/special/nt_namespace/CMakeLists.txt b/um/wrappers/nt_namespace/CMakeLists.txt
index dc99170..dc99170 100644
--- a/um/wrappers/special/nt_namespace/CMakeLists.txt
+++ b/um/wrappers/nt_namespace/CMakeLists.txt
diff --git a/um/wrappers/special/nt_namespace/README.md b/um/wrappers/nt_namespace/README.md
index c9fbe3e..d0c786e 100644
--- a/um/wrappers/special/nt_namespace/README.md
+++ b/um/wrappers/nt_namespace/README.md
@@ -1,7 +1,7 @@
 nt_namespace
 ============
 
-[nt_namespace](../../../../km/src/special/nt_namespace): usage examples.
+[nt_namespace](../../../km/src/nt_namespace): usage examples.
 
 Usage
 -----
@@ -22,4 +22,4 @@ For example:
 See also
 --------
 
-* [Building](../../../README.md#building)
+* [Building](../../README.md#building)
diff --git a/um/wrappers/special/nt_namespace/include/nt_namespace/all.hpp b/um/wrappers/nt_namespace/include/nt_namespace/all.hpp
index 474b802..474b802 100644
--- a/um/wrappers/special/nt_namespace/include/nt_namespace/all.hpp
+++ b/um/wrappers/nt_namespace/include/nt_namespace/all.hpp
diff --git a/um/wrappers/special/nt_namespace/include/nt_namespace/device.hpp b/um/wrappers/nt_namespace/include/nt_namespace/device.hpp
index a3d725c..a3d725c 100644
--- a/um/wrappers/special/nt_namespace/include/nt_namespace/device.hpp
+++ b/um/wrappers/nt_namespace/include/nt_namespace/device.hpp
diff --git a/um/wrappers/special/nt_namespace/src/device.cpp b/um/wrappers/nt_namespace/src/device.cpp
index 4f9021b..4f9021b 100644
--- a/um/wrappers/special/nt_namespace/src/device.cpp
+++ b/um/wrappers/nt_namespace/src/device.cpp
diff --git a/um/wrappers/special/nt_namespace/utils/CMakeLists.txt b/um/wrappers/nt_namespace/utils/CMakeLists.txt
index 46e9b5e..46e9b5e 100644
--- a/um/wrappers/special/nt_namespace/utils/CMakeLists.txt
+++ b/um/wrappers/nt_namespace/utils/CMakeLists.txt
diff --git a/um/wrappers/special/nt_namespace/utils/convert_nt_path.cpp b/um/wrappers/nt_namespace/utils/convert_nt_path.cpp
index ec215dc..ec215dc 100644
--- a/um/wrappers/special/nt_namespace/utils/convert_nt_path.cpp
+++ b/um/wrappers/nt_namespace/utils/convert_nt_path.cpp
diff --git a/um/wrappers/special/CMakeLists.txt b/um/wrappers/special/CMakeLists.txt
deleted file mode 100644
index 40b32f6..0000000
--- a/um/wrappers/special/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(nt_namespace)