FGCOM/dahdi-tools
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi-perl: Also get USB loaded driver from usbfs

Browse Source 
Signed-off-by: Oron Peled <oron.peled@xorcom.com>
Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>

git-svn-id: http://svn.astersk.org/svn/dahdi/tools/trunk@10153 17933a7a-c749-41c5-a318-cba88f637d49
This commit is contained in:
Oron Peled 2011-08-25 10:32:17 +00:00 committed by Tzafrir Cohen
parent a5c6e58b6e
commit b23f3ca5a9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xpp/perl_modules/Dahdi/Hardware/USB.pm
View File

@ -183,6 +183,7 @@ sub scan_devices($) {
my @lines = split(/\n/); my @lines = split(/\n/);
my ($tline) = grep(/^T/, @lines); my ($tline) = grep(/^T/, @lines);
my ($pline) = grep(/^P/, @lines); my ($pline) = grep(/^P/, @lines);
my ($dline) = grep(/^I/, @lines);
my ($sline) = grep(/^S:.*SerialNumber=/, @lines); my ($sline) = grep(/^S:.*SerialNumber=/, @lines);
my ($busnum,$devnum) = ($tline =~ /Bus=(\w+)\W.*Dev#=\s*(\w+)\W/); my ($busnum,$devnum) = ($tline =~ /Bus=(\w+)\W.*Dev#=\s*(\w+)\W/);
my $devname = sprintf("%03d/%03d", $busnum, $devnum); my $devname = sprintf("%03d/%03d", $busnum, $devnum);
@ -193,6 +194,10 @@ sub scan_devices($) {
$serial = $1; $serial = $1;
#$serial =~ s/[[:^print:]]/_/g; #$serial =~ s/[[:^print:]]/_/g;
} }
my $loaded;
if ($dline =~ /Driver=(\w+)/) {
$loaded = $1;
}
my $model = $usb_ids{"$vendor:$product"}; my $model = $usb_ids{"$vendor:$product"};
next unless defined $model; next unless defined $model;
my $d = Dahdi::Hardware::USB->new( my $d = Dahdi::Hardware::USB->new(
@ -203,6 +208,7 @@ sub scan_devices($) {
SERIAL => $serial, SERIAL => $serial,
DESCRIPTION => $model->{DESCRIPTION}, DESCRIPTION => $model->{DESCRIPTION},
DRIVER => $model->{DRIVER}, DRIVER => $model->{DRIVER},
LOADED => $loaded,
); );
push(@devices, $d); push(@devices, $d);
} }