[svn-commits] tzafrir: branch tools/2.2 r7469 - in /tools/branches/2.2: ./ xpp/ xpp/perl_mo...

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Wed Nov  4 07:39:15 2009
New Revision: 7469

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7469
Log:
xpp: typos and such. Whitespace fixes in PCI.pm

Merged revisions 6832 via svnmerge from 
http://svn.digium.com/svn/dahdi/tools/trunk

Modified:
    tools/branches/2.2/   (props changed)
    tools/branches/2.2/xpp/README.Astribank
    tools/branches/2.2/xpp/perl_modules/Dahdi/Hardware/PCI.pm
    tools/branches/2.2/xpp/twinstar_hook

Propchange: tools/branches/2.2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Nov  4 07:39:15 2009
@@ -1,1 +1,1 @@
-/tools/trunk:1-6678,6823,6829-6830,6833,6835,6837-6841,6843-6855,6857-6886,6889-6897,6899-6901,6903-6974,6977-6982,6985-6986,6988-6992,6994-6998,7001-7011,7013,7015,7017,7020-7021
+/tools/trunk:1-6678,6823,6829-6830,6832-6833,6835,6837-6841,6843-6855,6857-6886,6889-6897,6899-6901,6903-6974,6977-6982,6985-6986,6988-6992,6994-6998,7001-7011,7013,7015,7017,7020-7021

Modified: tools/branches/2.2/xpp/README.Astribank
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.2/xpp/README.Astribank?view=diff&rev=7469&r1=7468&r2=7469
==============================================================================
--- tools/branches/2.2/xpp/README.Astribank (original)
+++ tools/branches/2.2/xpp/README.Astribank Wed Nov  4 07:39:15 2009
@@ -909,7 +909,7 @@
   A standard program that is typically part either of package 'fxload' 
   or 'hotplug-utils' . 
 /dev/bus/usb::
-  On some old systems it is mmissing . /proc/bus/usb (usbfs) could be
+  On some old systems it is missing . /proc/bus/usb (usbfs) could be
   used instead.
 MMM::
   the first number (bus number)
@@ -1056,7 +1056,7 @@
 xpd_fxo if you have only Astribank FXS.
 
 Once an Astribank device connected and the firmware is loaded, the
-Vendor-ID/Product-ID of the device will be  e4e4/1152 . The handler for that
+Vendor-ID/Product-ID of the device will be  e4e4/11x2 . The handler for that
 combination is listed as the kernel module xpp_usb. Therefore, the system
 runs 'modprobe xpp_usb' if that module is not already loaded.
 

Modified: tools/branches/2.2/xpp/perl_modules/Dahdi/Hardware/PCI.pm
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.2/xpp/perl_modules/Dahdi/Hardware/PCI.pm?view=diff&rev=7469&r1=7468&r2=7469
==============================================================================
--- tools/branches/2.2/xpp/perl_modules/Dahdi/Hardware/PCI.pm (original)
+++ tools/branches/2.2/xpp/perl_modules/Dahdi/Hardware/PCI.pm Wed Nov  4 07:39:15 2009
@@ -85,7 +85,7 @@
 	'd161:8001'		=> { DRIVER => 'wcte12xp', DESCRIPTION => 'Wildcard TE122' },
 
 	# from wcb4xxp
-	'd161:b410'             => { DRIVER => 'wcb4xxp', DESCRIPTION => 'Digium Wildcard B410P' },
+	'd161:b410'		=> { DRIVER => 'wcb4xxp', DESCRIPTION => 'Digium Wildcard B410P' },
 
 	# from tor2
 	'10b5:9030'		=> { DRIVER => 'tor2', DESCRIPTION => 'PLX 9030' },

Modified: tools/branches/2.2/xpp/twinstar_hook
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.2/xpp/twinstar_hook?view=diff&rev=7469&r1=7468&r2=7469
==============================================================================
--- tools/branches/2.2/xpp/twinstar_hook (original)
+++ tools/branches/2.2/xpp/twinstar_hook Wed Nov  4 07:39:15 2009
@@ -101,9 +101,9 @@
 		xpp_blink bzzt xpd "$XBUS_NUM"
 		ports=`twinstar ports`
 		if [ "$ports" = 0 ]; then
-			play /usr/share/zaptel/primary-pbx-is-ready.wav || :
+			play /usr/share/dahdi/primary-pbx-is-ready.wav || :
 		elif [ "$ports" = 1 ]; then
-			play /usr/share/zaptel/backup-pbx-is-ready.wav || :
+			play /usr/share/dahdi/backup-pbx-is-ready.wav || :
 		fi
 		echo "online: READY" | $LOGGER
 	fi