dahdi-perl: Also get USB loaded driver from usbfs
authorOron Peled <oron.peled@xorcom.com>
Thu, 25 Aug 2011 10:32:17 +0000 (10:32 +0000)
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>
Thu, 25 Aug 2011 10:32:17 +0000 (10:32 +0000)
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

xpp/perl_modules/Dahdi/Hardware/USB.pm

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