diff options
author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-07-13 08:22:28 +0000 |
---|---|---|
committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-07-13 08:22:28 +0000 |
commit | 19e3ffa8c89deac7a5cb3818ef7b5dc8051d412b (patch) | |
tree | 8bdf816f7d57d6f0c60f15140b4e05187c075ec4 /xpp/utils/zconf/Zaptel/Hardware.pm | |
parent | a75ba7a302fff4a63320e3856ef8d9566ecc8f22 (diff) |
Merge xpp r4372:
* Update to zaptel-1.2.18 and zaptel-1.4.3 (r4308 onward)
* Fix a critical race with zaptel synchronization (r4362)
* Added a /proc/xpp/cmds for statistics about command timing (r4360)
* Fix a digit mapping bug with hardware dtmf detection (r4357)
* In xpp/utils/Makefile add perl syntax checks to our scripts (r4337)
* Better USB data error checking (r4336)
* udev rules (xpp.rules) avoid false calls from wrong nodes (r4331)
* Improve hardware detection and reporting in lszaptel,
zaptel_hardware. zapconf is basically functional.
* Leds are blinked synchronously on all Astribanks now (r4262)
* Fix a BRI bug if OPTIMIZE_CHANMUTE was compiled into zaptel (r4258)
(This feature was not yet accepted into official zaptel)
* Removed compile warning about HZ != 1000 (r4218)
* Firmware updates.
* fpga_load now supports USB pathes without zeros (r4211)
* XPD numbers have changed to '<Unit><Subunit>' (r4196)
* Proper support for ZT_VMWI ioctl, if used in zaptel (r4092)
* Fix FXO power denial detection (r4054)
* FXO could accidentally go off-hook with some compilers (r4048)
(From branches/1.2 r2732, r2735)
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@2736 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp/utils/zconf/Zaptel/Hardware.pm')
-rw-r--r-- | xpp/utils/zconf/Zaptel/Hardware.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xpp/utils/zconf/Zaptel/Hardware.pm b/xpp/utils/zconf/Zaptel/Hardware.pm index 321292a..39305fb 100644 --- a/xpp/utils/zconf/Zaptel/Hardware.pm +++ b/xpp/utils/zconf/Zaptel/Hardware.pm @@ -34,7 +34,11 @@ sub devices($) { return @zaptel_devices; } -Zaptel::Hardware::USB->scan_devices; -Zaptel::Hardware::PCI->scan_devices; +sub scan_hardware($) { + my $pack = shift || die; + + Zaptel::Hardware::USB->scan_devices; + Zaptel::Hardware::PCI->scan_devices; +} 1; |