Rename the lsusb example program to listdevs

This is intended to reduce confusion with the much more significant
lsusb utility which is part of the usbutils package.

diff --git a/.gitignore b/.gitignore
index 673b645..88ea6d4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,7 @@ config.status
 config.sub
 *.swp
 doxygen.cfg
-lsusb
+listdevs
 dpfp
 dpfp_threaded
 *.exe

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 0a62aea..c7630d2 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,8 +1,8 @@
 INCLUDES = -I$(top_srcdir)/libusb
-noinst_PROGRAMS = lsusb
+noinst_PROGRAMS = listdevs
 
-lsusb_SOURCES = lsusb.c
-lsusb_LDADD = ../libusb/libusb-1.0.la
+listdevs_SOURCES = listdevs.c
+listdevs_LDADD = ../libusb/libusb-1.0.la
 
 if HAVE_SIGACTION
 dpfp_SOURCES = dpfp.c

diff --git a/examples/lsusb.c b/examples/listdevs.c
similarity index 100%
rename from examples/lsusb.c
rename to examples/listdevs.c

diff --git a/msvc/ddk_build.cmd b/msvc/ddk_build.cmd
index fa79b82..ed9b8a8 100644 (file)
--- a/msvc/ddk_build.cmd
+++ b/msvc/ddk_build.cmd
@@ -66,23 +66,23 @@ copy %srcPath%\libusb-%version%.lib %dstPath%\lib
 
 @echo off
 
-if exist examples\lsusb_ddkbuild goto md7
-md examples\lsusb_ddkbuild
+if exist examples\listdevs_ddkbuild goto md7
+md examples\listdevs_ddkbuild
 :md7
 
-cd examples\lsusb_ddkbuild
-copy ..\..\msvc\lsusb_sources sources >NUL 2>&1
+cd examples\listdevs_ddkbuild
+copy ..\..\msvc\listdevs_sources sources >NUL 2>&1
 @echo on
 build -cwgZ
 @echo off
-if errorlevel 1 goto buildlsusberror
+if errorlevel 1 goto buildlistdevserror
 cd ..\..
 
-set srcPath=examples\lsusb_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir%
+set srcPath=examples\listdevs_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir%
 @echo on
 
-copy %srcPath%\lsusb.exe %dstPath%\examples
-copy %srcPath%\lsusb.pdb %dstPath%\examples
+copy %srcPath%\listdevs.exe %dstPath%\examples
+copy %srcPath%\listdevs.pdb %dstPath%\examples
 
 cd msvc
 goto done
@@ -93,9 +93,9 @@ cd ..\..\msvc
 echo Build failed
 goto done
 
-:buildlsusberror
+:buildlistdevserror
 cd ..\..\msvc
-echo lsusb build failed
+echo listdevs build failed
 goto done
 
 :usage

diff --git a/msvc/libusb.dsw b/msvc/libusb.dsw
index e4de346..fbe3015 100644 (file)
--- a/msvc/libusb.dsw
+++ b/msvc/libusb.dsw
@@ -27,7 +27,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "lsusb"=".\lsusb.dsp" - Package Owner=<4>
+Project: "listdevs"=".\listdevs.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{

diff --git a/msvc/libusb.sln b/msvc/libusb.sln
index 0aa6de2..4c29bbf 100644 (file)
--- a/msvc/libusb.sln
+++ b/msvc/libusb.sln
@@ -13,7 +13,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (dll)", "libusb_
                Release.AspNetCompiler.Debug = "False"
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lsusb", "lsusb.vcproj", "{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "listdevs", "listdevs.vcproj", "{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}"
        ProjectSection(WebsiteProperties) = preProject
                Debug.AspNetCompiler.Debug = "True"
                Release.AspNetCompiler.Debug = "False"

diff --git a/msvc/lsusb.dsp b/msvc/listdevs.dsp
similarity index 84%
rename from msvc/lsusb.dsp
rename to msvc/listdevs.dsp
index 8cc8fcb..93a93e4 100644 (file)
--- a/msvc/lsusb.dsp
+++ b/msvc/listdevs.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="lsusb" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="listdevs" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=lsusb - Win32 Debug
+CFG=listdevs - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "lsusb.mak".
+!MESSAGE NMAKE /f "listdevs.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "lsusb.mak" CFG="lsusb - Win32 Debug"
+!MESSAGE NMAKE /f "listdevs.mak" CFG="listdevs - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "lsusb - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "lsusb - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "listdevs - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "listdevs - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=lsusb - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "lsusb - Win32 Release"
+!IF  "$(CFG)" == "listdevs - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -38,7 +38,7 @@ RSC=rc.exe
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "../Win32/Release/examples"
-# PROP Intermediate_Dir "../Win32/Release/examples/lsusb"
+# PROP Intermediate_Dir "../Win32/Release/examples/listdevs"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
@@ -52,7 +52,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
 
-!ELSEIF  "$(CFG)" == "lsusb - Win32 Debug"
+!ELSEIF  "$(CFG)" == "listdevs - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -62,7 +62,7 @@ LINK32=link.exe
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "../Win32/Debug/examples"
-# PROP Intermediate_Dir "../Win32/Debug/examples/lsusb"
+# PROP Intermediate_Dir "../Win32/Debug/examples/listdevs"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /GZ /c
@@ -81,14 +81,14 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "lsusb - Win32 Release"
-# Name "lsusb - Win32 Debug"
+# Name "listdevs - Win32 Release"
+# Name "listdevs - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\examples\lsusb.c
+SOURCE=..\examples\listdevs.c
 # End Source File
 # End Group
 # Begin Group "Header Files"

diff --git a/msvc/lsusb.vcproj b/msvc/listdevs.vcproj
similarity index 99%
rename from msvc/lsusb.vcproj
rename to msvc/listdevs.vcproj
index ead8f2b..06e2dff 100644 (file)
--- a/msvc/lsusb.vcproj
+++ b/msvc/listdevs.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="lsusb"
+       Name="listdevs"
        ProjectGUID="{98CFD8FA-EE20-40D5-AF13-F8C4856D6CA5}"
        RootNamespace="examples"
        Keyword="Win32Proj"
@@ -334,7 +334,7 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
                        <File
-                               RelativePath="..\examples\lsusb.c"
+                               RelativePath="..\examples\listdevs.c"
                                >
                                <FileConfiguration
                                        Name="Release|Win32"

diff --git a/msvc/lsusb_sources b/msvc/listdevs_sources
similarity index 88%
rename from msvc/lsusb_sources
rename to msvc/listdevs_sources
index dbfefbb..97a5723 100644 (file)
--- a/msvc/lsusb_sources
+++ b/msvc/listdevs_sources
@@ -1,4 +1,4 @@
-TARGETNAME=lsusb
+TARGETNAME=listdevs
 TARGETTYPE=PROGRAM
 386_STDCALL=0
 
@@ -16,4 +16,4 @@ USE_MSVCRT=1
 UMTYPE=console
 INCLUDES=..\..\libusb;$(DDK_INC_PATH)
 UMLIBS=..\..\libusb\os\obj$(BUILD_ALT_DIR)\*\libusb-1.0.lib
-SOURCES=..\lsusb.c
+SOURCES=..\listdevs.c