diff options
Diffstat (limited to 'xpp')
-rw-r--r-- | xpp/perl_modules/Dahdi/Config/Gen/Xpporder.pm | 2 | ||||
-rw-r--r-- | xpp/perl_modules/Dahdi/Hardware/USB.pm | 61 | ||||
-rw-r--r-- | xpp/perl_modules/Dahdi/Span.pm | 2 | ||||
-rw-r--r-- | xpp/perl_modules/Dahdi/Xpp.pm | 3 |
4 files changed, 55 insertions, 13 deletions
diff --git a/xpp/perl_modules/Dahdi/Config/Gen/Xpporder.pm b/xpp/perl_modules/Dahdi/Config/Gen/Xpporder.pm index a98f912..e7bfb72 100644 --- a/xpp/perl_modules/Dahdi/Config/Gen/Xpporder.pm +++ b/xpp/perl_modules/Dahdi/Config/Gen/Xpporder.pm @@ -111,7 +111,7 @@ HEAD my $label = $xbus->label; my $connector = $xbus->connector; my $name = $xbus->name; - printf "%s\t# %s (%s)\n", $label, $connector, $name; + printf "%s\t# %s #(%s)\n", $label, $connector, $name; } close F; select $old; diff --git a/xpp/perl_modules/Dahdi/Hardware/USB.pm b/xpp/perl_modules/Dahdi/Hardware/USB.pm index af0274f..722b87b 100644 --- a/xpp/perl_modules/Dahdi/Hardware/USB.pm +++ b/xpp/perl_modules/Dahdi/Hardware/USB.pm @@ -77,7 +77,6 @@ sub set_transport($$) { my $xbus = shift || die; my $xbus_dir = shift; my $transportdir = "$xbus_dir/transport"; - my $hwdev; if(! -e "$transportdir/ep_00") { warn "A trasnport in '$transportdir' is not USB"; return undef; @@ -94,25 +93,69 @@ sub set_transport($$) { warn "Bad USB transportdir='$transportdir' usbdev='$usbdev'\n"; } } elsif(-d "$transportdir/usb_endpoint") { - $busnum = readval("$transportdir/busnum"); + $transportdir =~ m|/(\d+)-\d+$|; + $busnum = $1; $devnum = readval("$transportdir/devnum"); } my $usbname = sprintf("%03d/%03d", $busnum, $devnum); #printf STDERR "DEBUG: %03d/%03d\n", $busnum, $devnum; $xbus->{USB_DEVNAME} = $usbname; - $hwdev = Dahdi::Hardware->device_by_hwname("usb:$usbname"); - #print "set_transport: ", $hwdev, "\n"; - $xbus->{TRANSPORT} = $hwdev; - $hwdev->{XBUS} = $xbus; - $hwdev->{LOADED} = 'xpp_usb'; - $xbus->{IS_TWINSTAR} = $hwdev->is_twinstar; + my $hwdev = Dahdi::Hardware->device_by_hwname("usb:$usbname"); + if(defined $hwdev) { + #print "set_transport: ", $hwdev, "\n"; + $xbus->{TRANSPORT} = $hwdev; + $hwdev->{XBUS} = $xbus; + $hwdev->{LOADED} = 'xpp_usb'; + $xbus->{IS_TWINSTAR} = $hwdev->is_twinstar; + } return $hwdev; } +sub _get_attr($) { + my $attr_file = shift; + + open(ATTR, $attr_file) or die "Failed to read SysFS attribute $attr_file\n"; + my $value = <ATTR>; + chomp $value; + return $value; +} + +sub scan_devices_sysfs($) { + my $pack = shift || die; + my @devices = (); + + while (</sys/bus/usb/devices/*-*>) { + next unless -r "$_/idVendor"; # endpoints + + # Older kernels, e.g. 2.6.9, don't have the attribute + # busnum: + m|/(\d+)-\d+$|; + my $busnum = $1 || next; + my $devnum = _get_attr("$_/devnum"); + my $vendor = _get_attr("$_/idVendor"); + my $product = _get_attr("$_/idProduct"); + my $serial = _get_attr("$_/serial"); + my $devname = sprintf("%03d/%03d", $busnum, $devnum); + my $model = $usb_ids{"$vendor:$product"}; + next unless defined $model; + my $d = Dahdi::Hardware::USB->new( + IS_ASTRIBANK => ($model->{DRIVER} eq 'xpp_usb')?1:0, + PRIV_DEVICE_NAME => $devname, + VENDOR => $vendor, + PRODUCT => $product, + SERIAL => $serial, + DESCRIPTION => $model->{DESCRIPTION}, + DRIVER => $model->{DRIVER}, + ); + push(@devices, $d); + } + return @devices; +} + sub scan_devices($) { my $pack = shift || die; my $usb_device_list = "/proc/bus/usb/devices"; - return unless (-r $usb_device_list); + return $pack->scan_devices_sysfs() unless (-r $usb_device_list); my @devices; open(F, $usb_device_list) || die "Failed to open $usb_device_list: $!"; diff --git a/xpp/perl_modules/Dahdi/Span.pm b/xpp/perl_modules/Dahdi/Span.pm index bd5eeee..b7987e1 100644 --- a/xpp/perl_modules/Dahdi/Span.pm +++ b/xpp/perl_modules/Dahdi/Span.pm @@ -131,7 +131,7 @@ sub by_number($) { my @bri_strings = ( 'BRI_(NT|TE)', - '(?:quad|octo)BRI PCI ISDN Card.* \[(NT|TE)\]\ ', + '(?:quad|octo)BRI PCI ISDN Card.* \[(NT|TE)\]', 'octoBRI \[(NT|TE)\] ', 'HFC-S PCI A ISDN.* \[(NT|TE)\] ', '(B4XXP) \(PCI\) Card', # Does not expose NT/TE type diff --git a/xpp/perl_modules/Dahdi/Xpp.pm b/xpp/perl_modules/Dahdi/Xpp.pm index f9e62a5..7ac574b 100644 --- a/xpp/perl_modules/Dahdi/Xpp.pm +++ b/xpp/perl_modules/Dahdi/Xpp.pm @@ -206,10 +206,9 @@ sub add_xpporder(@) { # Overrides from config file foreach my $xbus (@xbuses) { my $label = $xbus->label; - my $connector = '@' . $xbus->connector; my $val; $val = $order{$label}; - $val = $order{$connector} unless defined $val; + $val = $order{$xbus->connector} unless defined $val; $xbus->{XPPORDER} = $val if defined $val; } } |