[Pkg-voip-commits] [dahdi-tools] 18/285: dahdi-perl: fix xpp driver in dahdi_hardware

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository dahdi-tools.

commit d765176efdcfc2e023d8cc744215ca69ebb4772d
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Tue Jan 25 10:11:36 2011 +0000

    dahdi-perl: fix xpp driver in dahdi_hardware
    
    Don't require 'dahdi_hardware -v' to show the driver for a USB device.
    Only works when the usbfs is not used (when /proc/bus/usb is not mounted).
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
    
    git-svn-id: http://svn.astersk.org/svn/dahdi/tools/trunk@9699 17933a7a-c749-41c5-a318-cba88f637d49
---
 xpp/perl_modules/Dahdi/Hardware/USB.pm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/xpp/perl_modules/Dahdi/Hardware/USB.pm b/xpp/perl_modules/Dahdi/Hardware/USB.pm
index edc0f4c..60df56b 100644
--- a/xpp/perl_modules/Dahdi/Hardware/USB.pm
+++ b/xpp/perl_modules/Dahdi/Hardware/USB.pm
@@ -140,8 +140,9 @@ sub scan_devices_sysfs($) {
 
 		# Older kernels, e.g. 2.6.9, don't have the attribute
 		# busnum:
-		m|/(\d+)-[\d.]+$|;
-		my $busnum = $1 || next;
+		m|/((\d+)-[\d.]+)$|;
+		my $busnum = $2 || next;
+		my $dev_sys_name = $1;
 		my $vendor = _get_attr("$_/idVendor");
 		my $product = _get_attr("$_/idProduct");
 		my $model = $usb_ids{"$vendor:$product"};
@@ -149,6 +150,12 @@ sub scan_devices_sysfs($) {
 		my $devnum = _get_attr("$_/devnum");
 		my $serial = _get_attr_optional("$_/serial", '');
 		my $devname = sprintf("%03d/%03d", $busnum, $devnum);
+		# Get driver for first interface of the device:
+		my $iface = "$_/$dev_sys_name:1.0";
+		my $loaded = readlink("$iface/driver");
+		if (defined $loaded) {
+			$loaded =~ s|.*/||;
+		}
 		my $d = Dahdi::Hardware::USB->new(
 			IS_ASTRIBANK		=> ($model->{DRIVER} eq 'xpp_usb')?1:0,
 			PRIV_DEVICE_NAME	=> $devname,
@@ -157,6 +164,7 @@ sub scan_devices_sysfs($) {
 			SERIAL			=> $serial,
 			DESCRIPTION		=> $model->{DESCRIPTION},
 			DRIVER			=> $model->{DRIVER},
+			LOADED			=> $loaded,
 			);
 		push(@devices, $d);
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/dahdi-tools.git