From 6bc1dbffe9f77eb3c85a655ffeaff64d963c6b43 Mon Sep 17 00:00:00 2001 From: tzafrir Date: Tue, 16 Oct 2007 17:55:05 +0000 Subject: xpp r4892: * Zaptel/Hardware perl modules: - Use sysfs directly. Don't rely on lspci/lsusb. - Each device has a description and driver name. - Zaptel::Hardware::drivers() to show the list of required drivers for this system (see zaptel_drivers). - zaptel_hardware shows a description and a (suggested?) driver. * zt_registration sorts by Serial first and only then by connector. * USB_FW.hex replaces all the USB_11x0.hex . - Separate USB interface for the management processor. - Hence fpga_load can now work even with drivers loaded. * Fix firmware upgrading. * Fix manual firmware loading while auto-loading. git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3142 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- xpp/utils/zconf/Zaptel/Xpp/Xbus.pm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'xpp/utils/zconf/Zaptel/Xpp') diff --git a/xpp/utils/zconf/Zaptel/Xpp/Xbus.pm b/xpp/utils/zconf/Zaptel/Xpp/Xbus.pm index 0dd6d84..7951d98 100644 --- a/xpp/utils/zconf/Zaptel/Xpp/Xbus.pm +++ b/xpp/utils/zconf/Zaptel/Xpp/Xbus.pm @@ -70,12 +70,7 @@ sub new($$) { chomp $head; close F; $head =~ s/^device: +([^, ]+)/$1/i or die; - my ($usb_bus, $usb_dev) = split('/', $head); - die unless defined($usb_bus) && defined($usb_dev); - $usb_bus =~ s/^0*//; - $usb_dev =~ s/^0*//; - $self->{USB_BUS} = $usb_bus; - $self->{USB_DEV} = $usb_dev; + $self->{USB_DEVNAME} = $head; } @{$self->{XPDS}} = (); foreach my $fqn (glob "$prefix/XPD-??") { -- cgit v1.2.3