Moved files on Windows (preparation for shmem)

Change-Id: I56a58bb29ac5fa937d1b520a2fa2081ef3a7b4a6 Partial-Bug: #1737177
Juniper · Jan 17, 2018 · eec6545 · eec6545
1 parent 095889a
commit eec6545
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 12 deletions.
diff --git a/utils/flow.c b/utils/flow.c
@@ -38,7 +38,7 @@
 
 #ifdef _WIN32
 #include <winioctl.h>
-#include "windows_flow_ioctl.h"
+#include "windows_shmem_ioctl.h"
 #endif
 
 #include "vr_types.h"

diff --git a/windows/precomp.h b/windows/precomp.h
@@ -7,5 +7,5 @@
 #include <wdmsec.h>
 
 #include "vr_windows.h"
-#include "windows_mem.h"
+#include "windows_shmem.h"
 #include "windows_devices.h"
diff --git a/windows/vRouter.vcxproj b/windows/vRouter.vcxproj
@@ -495,12 +495,12 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="vr_driver.c" />
-    <ClCompile Include="vr_flow_device.c" />
+    <ClCompile Include="vr_shmem_devices.c" />
     <ClCompile Include="vr_ksync.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="vr_host_interface.c" />
-    <ClCompile Include="vr_mem.c">
+    <ClCompile Include="vr_shmem.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="vr_nbl.c" />

diff --git a/windows/vRouter.vcxproj.filters b/windows/vRouter.vcxproj.filters
@@ -243,7 +243,7 @@
     <ClCompile Include="dp-core\vr_bitmap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="windows\vr_mem.c">
+    <ClCompile Include="windows\vr_shmem.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="windows\vr_pkt0.c">
@@ -285,7 +285,7 @@
     <ClCompile Include="windows\vr_nbl.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="windows\vr_flow_device.c">
+    <ClCompile Include="windows\vr_shmem_devices.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

diff --git a/windows/vr_driver.c b/windows/vr_driver.c
@@ -4,7 +4,6 @@
 #include "precomp.h"
 #include "vr_windows.h"
 #include "windows_devices.h"
-#include "windows_mem.h"
 #include "windows_nbl.h"
 
 #include "vrouter.h"

diff --git a/windows/vr_mem.c → windows/vr_shmem.c b/windows/vr_mem.c → windows/vr_shmem.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2017 Juniper Networks, Inc. All rights reserved.
  */
 #include "precomp.h"
-#include "windows_mem.h"
+#include "windows_shmem.h"
 
 #include "vrouter.h"
 #include "vr_flow.h"

diff --git a/windows/vr_flow_device.c → windows/vr_shmem_devices.c b/windows/vr_flow_device.c → windows/vr_shmem_devices.c
@@ -4,9 +4,9 @@
 #include "precomp.h"
 
 #include "windows_devices.h"
-#include "windows_flow_ioctl.h"
+#include "windows_shmem_ioctl.h"
 #include "windows_ksync.h"
-#include "windows_mem.h"
+#include "windows_shmem.h"
 
 static const WCHAR FlowDeviceName[]    = L"\\Device\\vrouterFlow";
 static const WCHAR FlowDeviceSymLink[] = L"\\DosDevices\\vrouterFlow";

diff --git a/windows/windows_mem.h → windows/windows_shmem.h b/windows/windows_mem.h → windows/windows_shmem.h
@@ -1,5 +1,5 @@
 /*
- * windows_mem.h -- definitions used in shared memmory handling on Windows
+ * windows_shmem.h -- definitions used in shared memmory handling on Windows
  *
  * Copyright (c) 2017 Juniper Networks, Inc. All rights reserved.
  */

diff --git a/windows/windows_flow_ioctl.h → windows/windows_shmem_ioctl.h b/windows/windows_flow_ioctl.h → windows/windows_shmem_ioctl.h
@@ -1,5 +1,5 @@
 /*
- * windows_flow_ioctl.h -- definitions used in flow device DeviceIoControl calls
+ * windows_shmem_ioctl.h -- definitions used in flow device DeviceIoControl calls
  *
  * Copyright (c) 2017 Juniper Networks, Inc. All rights reserved.
  */