lagertonne/nut
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Imported Upstream version 2.6.1

Browse source
This commit is contained in:
Arnaud Quette 2011-06-01 22:31:49 +02:00
parent 459aaf9392
commit a367d9bc54
178 changed files with 4651 additions and 3279 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tools/Makefile.in
View file

@ -38,7 +38,6 @@ subdir = tools
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 \

13
tools/nut-usbinfo.pl
View file

@ -196,7 +196,9 @@ sub find_usbdevs
my $VendorName="";
# special thing for backward declaration using #DEFINE
# Format: #define VENDORID 0x???? /* vendor name */
# Format:
# /* vendor name */
# #define VENDORID 0x????
if(!($VendorID=~/\dx(\d|\w)+/))
{
open my $fh,$nameFile or die "error open file $nameFile";
@ -228,9 +230,12 @@ sub find_usbdevs
die "In file $nameFile, for product $ProductID, can't find the declaration of the constant";
}
}
# store date (to be optimized)
$vendorName{$VendorID}=trim($VendorName);
# store data (to be optimized)
if (($vendorName{$VendorID} eq "") && ($VendorName))
{
$vendorName{$VendorID}=trim($VendorName);
}
$vendor{$VendorID}{$ProductID}{"comment"}=$lastComment;
# process the driver name
my $driver=$nameFile;