windows: Rename windows_usb.h/c windows_winusb.h/c

Signed-off-by: Dmitry Fleytman <dfleytma@redhat.com>
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>

diff --git a/libusb/Makefile.am b/libusb/Makefile.am
index bd495ce..4990ada 100644 (file)
--- a/libusb/Makefile.am
+++ b/libusb/Makefile.am
@@ -16,7 +16,7 @@ COMMON_WINDOWS_SRC = os/windows_nt_common.h \
                      os/windows_nt_common.c \
                      os/windows_common.h \
                      libusb-1.0.rc libusb-1.0.def
-WINDOWS_USB_SRC = os/windows_usb.h os/windows_usb.c $(COMMON_WINDOWS_SRC)
+WINDOWS_USB_SRC = os/windows_winusb.h os/windows_winusb.c $(COMMON_WINDOWS_SRC)
 WINCE_USB_SRC = os/wince_usb.h os/wince_usb.c
 HAIKU_USB_SRC = os/haiku_usb.h os/haiku_usb_backend.cpp \
                os/haiku_usb_raw.h os/haiku_usb_raw.cpp os/haiku_pollfs.cpp

diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_winusb.c
similarity index 99%
rename from libusb/os/windows_usb.c
rename to libusb/os/windows_winusb.c
index f73ad6f..34ce461 100644 (file)
--- a/libusb/os/windows_usb.c
+++ b/libusb/os/windows_winusb.c
@@ -37,7 +37,7 @@
 
 #include "libusbi.h"
 #include "poll_windows.h"
-#include "windows_usb.h"
+#include "windows_winusb.h"
 
 // The 2 macros below are used in conjunction with safe loops.
 #define LOOP_CHECK(fcall) { r=fcall; if (r != LIBUSB_SUCCESS) continue; }
@@ -4107,7 +4107,7 @@ static int composite_reset_device(int sub_api, struct libusb_device_handle *dev_
 {
        struct windows_device_priv *priv = _device_priv(dev_handle->dev);
        int r;
-       uint8_t i; 
+       uint8_t i;
        bool available[SUB_API_MAX];
        for (i = 0; i<SUB_API_MAX; i++) {
                available[i] = false;

diff --git a/libusb/os/windows_usb.h b/libusb/os/windows_winusb.h
similarity index 99%
rename from libusb/os/windows_usb.h
rename to libusb/os/windows_winusb.h
index e201762..85baf11 100644 (file)
--- a/libusb/os/windows_usb.h
+++ b/libusb/os/windows_winusb.h
@@ -98,7 +98,7 @@ const GUID GUID_DEVINTERFACE_LIBUSB0_FILTER = { 0xF9F3FF14, 0xAE21, 0x48A0, {0x8
 #define USB_API_HID         4
 #define USB_API_MAX         5
 // The following is used to indicate if the HID or composite extra props have already been set.
-#define USB_API_SET         (1<<USB_API_MAX) 
+#define USB_API_SET         (1<<USB_API_MAX)
 
 // Sub-APIs for WinUSB-like driver APIs (WinUSB, libusbK, libusb-win32 through the libusbK DLL)
 // Must have the same values as the KUSB_DRVID enum from libusbk.h
@@ -807,7 +807,7 @@ typedef enum _KUSB_FNID
        KUSB_FNID_GetOverlappedResult,
        KUSB_FNID_GetProperty,
        KUSB_FNID_COUNT,
-} KUSB_FNID; 
+} KUSB_FNID;
 
 typedef struct _KLIB_VERSION {
        INT Major;

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 523f71c..36ec18e 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11028
+#define LIBUSB_NANO 11029

diff --git a/msvc/libusb_dll.dsp b/msvc/libusb_dll.dsp
index f2b15f0..4e3d4cb 100644 (file)
--- a/msvc/libusb_dll.dsp
+++ b/msvc/libusb_dll.dsp
@@ -135,7 +135,7 @@ SOURCE=..\libusb\os\threads_windows.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libusb\os\windows_usb.c
+SOURCE=..\libusb\os\windows_winusb.c
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -179,7 +179,7 @@ SOURCE=..\libusb\os\threads_windows.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libusb\os\windows_usb.h
+SOURCE=..\libusb\os\windows_winusb.h
 # End Source File
 # Begin Source File
 

diff --git a/msvc/libusb_dll_2005.vcproj b/msvc/libusb_dll_2005.vcproj
index 82e5af5..668b282 100644 (file)
--- a/msvc/libusb_dll_2005.vcproj
+++ b/msvc/libusb_dll_2005.vcproj
@@ -374,7 +374,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\libusb\os\windows_usb.c"
+                               RelativePath="..\libusb\os\windows_winusb.c"
                                >
                        </File>
                </Filter>
@@ -408,7 +408,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\libusb\os\windows_usb.h"
+                               RelativePath="..\libusb\os\windows_winusb.h"
                                >
                        </File>
                        <File

diff --git a/msvc/libusb_dll_2010.vcxproj b/msvc/libusb_dll_2010.vcxproj
index 6925b1b..9e5629e 100644 (file)
--- a/msvc/libusb_dll_2010.vcxproj
+++ b/msvc/libusb_dll_2010.vcxproj
@@ -146,7 +146,7 @@
     <ClCompile Include="..\libusb\strerror.c" />
     <ClCompile Include="..\libusb\sync.c" />
     <ClCompile Include="..\libusb\os\threads_windows.c" />
-    <ClCompile Include="..\libusb\os\windows_usb.c" />
+    <ClCompile Include="..\libusb\os\windows_winusb.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include=".\config.h" />
@@ -155,7 +155,7 @@
     <ClInclude Include="..\libusb\libusbi.h" />
     <ClInclude Include="..\libusb\os\poll_windows.h" />
     <ClInclude Include="..\libusb\os\threads_windows.h" />
-    <ClInclude Include="..\libusb\os\windows_usb.h" />
+    <ClInclude Include="..\libusb\os\windows_winusb.h" />
     <ClInclude Include="..\libusb\os\windows_common.h" />
   </ItemGroup>
   <ItemGroup>

diff --git a/msvc/libusb_dll_2010.vcxproj.filters b/msvc/libusb_dll_2010.vcxproj.filters
index 7a4578c..c77654b 100644 (file)
--- a/msvc/libusb_dll_2010.vcxproj.filters
+++ b/msvc/libusb_dll_2010.vcxproj.filters
@@ -38,7 +38,7 @@
     <ClCompile Include="..\libusb\os\threads_windows.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\libusb\os\windows_usb.c">
+    <ClCompile Include="..\libusb\os\windows_winusb.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -61,7 +61,7 @@
     <ClInclude Include="..\libusb\os\threads_windows.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\libusb\os\windows_usb.h">
+    <ClInclude Include="..\libusb\os\windows_winusb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\libusb\os\windows_common.h">

diff --git a/msvc/libusb_dll_2012.vcxproj b/msvc/libusb_dll_2012.vcxproj
index adcad4a..65e1a34 100644 (file)
--- a/msvc/libusb_dll_2012.vcxproj
+++ b/msvc/libusb_dll_2012.vcxproj
@@ -150,7 +150,7 @@
     <ClCompile Include="..\libusb\strerror.c" />
     <ClCompile Include="..\libusb\sync.c" />
     <ClCompile Include="..\libusb\os\threads_windows.c" />
-    <ClCompile Include="..\libusb\os\windows_usb.c" />
+    <ClCompile Include="..\libusb\os\windows_winusb.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\libusb\hotplug.h" />
@@ -161,7 +161,7 @@
     <ClInclude Include="..\libusb\libusbi.h" />
     <ClInclude Include="..\libusb\os\poll_windows.h" />
     <ClInclude Include="..\libusb\os\threads_windows.h" />
-    <ClInclude Include="..\libusb\os\windows_usb.h" />
+    <ClInclude Include="..\libusb\os\windows_winusb.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\libusb\libusb-1.0.def" />

diff --git a/msvc/libusb_dll_2012.vcxproj.filters b/msvc/libusb_dll_2012.vcxproj.filters
index ccada70..6120953 100644 (file)
--- a/msvc/libusb_dll_2012.vcxproj.filters
+++ b/msvc/libusb_dll_2012.vcxproj.filters
@@ -35,7 +35,7 @@
     <ClCompile Include="..\libusb\os\threads_windows.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\libusb\os\windows_usb.c">
+    <ClCompile Include="..\libusb\os\windows_winusb.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\libusb\hotplug.c">
@@ -58,7 +58,7 @@
     <ClInclude Include="..\libusb\os\threads_windows.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\libusb\os\windows_usb.h">
+    <ClInclude Include="..\libusb\os\windows_winusb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\libusb\version.h">

diff --git a/msvc/libusb_dll_2013.vcxproj b/msvc/libusb_dll_2013.vcxproj
index d2ee675..6f79468 100644 (file)
--- a/msvc/libusb_dll_2013.vcxproj
+++ b/msvc/libusb_dll_2013.vcxproj
@@ -151,7 +151,7 @@
     <ClCompile Include="..\libusb\strerror.c" />
     <ClCompile Include="..\libusb\sync.c" />
     <ClCompile Include="..\libusb\os\threads_windows.c" />
-    <ClCompile Include="..\libusb\os\windows_usb.c" />
+    <ClCompile Include="..\libusb\os\windows_winusb.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\libusb\hotplug.h" />
@@ -163,7 +163,7 @@
     <ClInclude Include="..\libusb\libusbi.h" />
     <ClInclude Include="..\libusb\os\poll_windows.h" />
     <ClInclude Include="..\libusb\os\threads_windows.h" />
-    <ClInclude Include="..\libusb\os\windows_usb.h" />
+    <ClInclude Include="..\libusb\os\windows_winusb.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\libusb\libusb-1.0.def" />

diff --git a/msvc/libusb_dll_2015.vcxproj b/msvc/libusb_dll_2015.vcxproj
index 85d9823..44ea250 100644 (file)
--- a/msvc/libusb_dll_2015.vcxproj
+++ b/msvc/libusb_dll_2015.vcxproj
@@ -151,7 +151,7 @@
     <ClCompile Include="..\libusb\strerror.c" />
     <ClCompile Include="..\libusb\sync.c" />
     <ClCompile Include="..\libusb\os\threads_windows.c" />
-    <ClCompile Include="..\libusb\os\windows_usb.c" />
+    <ClCompile Include="..\libusb\os\windows_winusb.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\libusb\hotplug.h" />
@@ -163,7 +163,7 @@
     <ClInclude Include="..\libusb\libusbi.h" />
     <ClInclude Include="..\libusb\os\poll_windows.h" />
     <ClInclude Include="..\libusb\os\threads_windows.h" />
-    <ClInclude Include="..\libusb\os\windows_usb.h" />
+    <ClInclude Include="..\libusb\os\windows_winusb.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\libusb\libusb-1.0.def" />

diff --git a/msvc/libusb_sources b/msvc/libusb_sources
index f9718cf..a0387d9 100644 (file)
--- a/msvc/libusb_sources
+++ b/msvc/libusb_sources
@@ -34,6 +34,6 @@ SOURCES=..\core.c \
        ..\hotplug.c \
        threads_windows.c \
        poll_windows.c \
-       windows_usb.c \
+       windows_winusb.c \
        windows_nt_common.c \
        ..\libusb-1.0.rc

diff --git a/msvc/libusb_static.dsp b/msvc/libusb_static.dsp
index afdbbed..7eddf79 100644 (file)
--- a/msvc/libusb_static.dsp
+++ b/msvc/libusb_static.dsp
@@ -119,7 +119,7 @@ SOURCE=..\libusb\os\threads_windows.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libusb\os\windows_usb.c
+SOURCE=..\libusb\os\windows_winusb.c
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -163,7 +163,7 @@ SOURCE=..\libusb\os\threads_windows.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libusb\os\windows_usb.h
+SOURCE=..\libusb\os\windows_winusb.h
 # End Source File
 # Begin Source File
 

diff --git a/msvc/libusb_static_2005.vcproj b/msvc/libusb_static_2005.vcproj
index f7b8e45..5ba6819 100644 (file)
--- a/msvc/libusb_static_2005.vcproj
+++ b/msvc/libusb_static_2005.vcproj
@@ -314,7 +314,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\libusb\os\windows_usb.c"
+                               RelativePath="..\libusb\os\windows_winusb.c"
                                >
                        </File>
                </Filter>
@@ -348,7 +348,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\libusb\os\windows_usb.h"
+                               RelativePath="..\libusb\os\windows_winusb.h"
                                >
                        </File>
                        <File

diff --git a/msvc/libusb_static_2010.vcxproj b/msvc/libusb_static_2010.vcxproj
index 1958d11..c4c49ad 100644 (file)
--- a/msvc/libusb_static_2010.vcxproj
+++ b/msvc/libusb_static_2010.vcxproj
@@ -136,7 +136,7 @@
     <ClCompile Include="..\libusb\strerror.c" />
     <ClCompile Include="..\libusb\sync.c" />
     <ClCompile Include="..\libusb\os\threads_windows.c" />
-    <ClCompile Include="..\libusb\os\windows_usb.c" />
+    <ClCompile Include="..\libusb\os\windows_winusb.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include=".\config.h" />
@@ -147,7 +147,7 @@
     <ClInclude Include="..\libusb\libusbi.h" />
     <ClInclude Include="..\libusb\os\poll_windows.h" />
     <ClInclude Include="..\libusb\os\threads_windows.h" />
-    <ClInclude Include="..\libusb\os\windows_usb.h" />
+    <ClInclude Include="..\libusb\os\windows_winusb.h" />
     <ClInclude Include="..\libusb\os\windows_common.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/msvc/libusb_static_2010.vcxproj.filters b/msvc/libusb_static_2010.vcxproj.filters
index 5cd8060..cce8001 100644 (file)
--- a/msvc/libusb_static_2010.vcxproj.filters
+++ b/msvc/libusb_static_2010.vcxproj.filters
@@ -32,7 +32,7 @@
     <ClCompile Include="..\libusb\os\threads_windows.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\libusb\os\windows_usb.c">
+    <ClCompile Include="..\libusb\os\windows_winusb.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\libusb\hotplug.c">
@@ -55,7 +55,7 @@
     <ClInclude Include="..\libusb\os\threads_windows.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\libusb\os\windows_usb.h">
+    <ClInclude Include="..\libusb\os\windows_winusb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\libusb\os\windows_common.h">

diff --git a/msvc/libusb_static_2012.vcxproj b/msvc/libusb_static_2012.vcxproj
index 88605ba..5cce2b8 100644 (file)
--- a/msvc/libusb_static_2012.vcxproj
+++ b/msvc/libusb_static_2012.vcxproj
@@ -140,7 +140,7 @@
     <ClCompile Include="..\libusb\strerror.c" />
     <ClCompile Include="..\libusb\sync.c" />
     <ClCompile Include="..\libusb\os\threads_windows.c" />
-    <ClCompile Include="..\libusb\os\windows_usb.c" />
+    <ClCompile Include="..\libusb\os\windows_winusb.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\libusb\hotplug.h" />
@@ -151,7 +151,7 @@
     <ClInclude Include="..\libusb\libusbi.h" />
     <ClInclude Include="..\libusb\os\poll_windows.h" />
     <ClInclude Include="..\libusb\os\threads_windows.h" />
-    <ClInclude Include="..\libusb\os\windows_usb.h" />
+    <ClInclude Include="..\libusb\os\windows_winusb.h" />
     <ClInclude Include="..\libusb\os\windows_common.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/msvc/libusb_static_2012.vcxproj.filters b/msvc/libusb_static_2012.vcxproj.filters
index 5cd8060..cce8001 100644 (file)
--- a/msvc/libusb_static_2012.vcxproj.filters
+++ b/msvc/libusb_static_2012.vcxproj.filters
@@ -32,7 +32,7 @@
     <ClCompile Include="..\libusb\os\threads_windows.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\libusb\os\windows_usb.c">
+    <ClCompile Include="..\libusb\os\windows_winusb.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\libusb\hotplug.c">
@@ -55,7 +55,7 @@
     <ClInclude Include="..\libusb\os\threads_windows.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\libusb\os\windows_usb.h">
+    <ClInclude Include="..\libusb\os\windows_winusb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\libusb\os\windows_common.h">

diff --git a/msvc/libusb_static_2013.vcxproj b/msvc/libusb_static_2013.vcxproj
index f980ae3..4ea706f 100644 (file)
--- a/msvc/libusb_static_2013.vcxproj
+++ b/msvc/libusb_static_2013.vcxproj
@@ -141,7 +141,7 @@
     <ClCompile Include="..\libusb\strerror.c" />
     <ClCompile Include="..\libusb\sync.c" />
     <ClCompile Include="..\libusb\os\threads_windows.c" />
-    <ClCompile Include="..\libusb\os\windows_usb.c" />
+    <ClCompile Include="..\libusb\os\windows_winusb.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\libusb\hotplug.h" />
@@ -153,7 +153,7 @@
     <ClInclude Include="..\libusb\libusbi.h" />
     <ClInclude Include="..\libusb\os\poll_windows.h" />
     <ClInclude Include="..\libusb\os\threads_windows.h" />
-    <ClInclude Include="..\libusb\os\windows_usb.h" />
+    <ClInclude Include="..\libusb\os\windows_winusb.h" />
     <ClInclude Include="..\libusb\os\windows_common.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/msvc/libusb_static_2015.vcxproj b/msvc/libusb_static_2015.vcxproj
index b50cdf2..510ef5c 100644 (file)
--- a/msvc/libusb_static_2015.vcxproj
+++ b/msvc/libusb_static_2015.vcxproj
@@ -145,7 +145,7 @@
     <ClCompile Include="..\libusb\strerror.c" />
     <ClCompile Include="..\libusb\sync.c" />
     <ClCompile Include="..\libusb\os\threads_windows.c" />
-    <ClCompile Include="..\libusb\os\windows_usb.c" />
+    <ClCompile Include="..\libusb\os\windows_winusb.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\libusb\hotplug.h" />
@@ -157,7 +157,7 @@
     <ClInclude Include="..\libusb\libusbi.h" />
     <ClInclude Include="..\libusb\os\poll_windows.h" />
     <ClInclude Include="..\libusb\os\threads_windows.h" />
-    <ClInclude Include="..\libusb\os\windows_usb.h" />
+    <ClInclude Include="..\libusb\os\windows_winusb.h" />
     <ClInclude Include="..\libusb\os\windows_common.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />