[dahdi-commits] tzafrir: branch tools/2.2 r7611 - in /tools/branches/2.2: ./ xpp/

[SVN commits to the DAHDI project]

Author: tzafrir
Date: Thu Nov 19 17:11:35 2009
New Revision: 7611

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7611
Log:
xpp: support loading USB firmware into 1163 devices as well

Demote some messages to debug while we're at it.

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

Modified:
    tools/branches/2.2/   (props changed)
    tools/branches/2.2/xpp/astribank_tool.c
    tools/branches/2.2/xpp/xpp_fxloader

Propchange: tools/branches/2.2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Nov 19 17:11:35 2009
@@ -1,1 +1,1 @@
-/tools/trunk:1-6678,6823,6829-6830,6832-6833,6835,6837-6886,6889-6982,6985-6998,7000-7011,7013-7042,7044,7046-7131,7133,7135-7136,7139-7217,7220-7255,7257-7262,7264-7332,7334-7460,7462,7464-7476
+/tools/trunk:1-6678,6823,6829-6830,6832-6833,6835,6837-6886,6889-6982,6985-6998,7000-7011,7013-7042,7044,7046-7131,7133,7135-7136,7139-7217,7220-7255,7257-7262,7264-7332,7334-7460,7462,7464-7476,7596

Modified: tools/branches/2.2/xpp/astribank_tool.c
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.2/xpp/astribank_tool.c?view=diff&rev=7611&r1=7610&r2=7611
==============================================================================
--- tools/branches/2.2/xpp/astribank_tool.c (original)
+++ tools/branches/2.2/xpp/astribank_tool.c Thu Nov 19 17:11:35 2009
@@ -204,9 +204,9 @@
 	if((astribank = mpp_init(devpath)) == NULL) {
 		ERR("Failed initializing MPP\n");
 #ifdef SUPPORT_OLD_RESET
-		INFO("opt_reset = %s\n", opt_reset);
+		DBG("opt_reset = %s\n", opt_reset);
 		if (opt_reset) {
-			INFO("Trying old reset method\n");
+			DBG("Trying old reset method\n");
 			if ((ret = old_reset(devpath)) != 0) {
 				ERR("Old reset method failed as well: %d\n", ret);
 			}
@@ -223,20 +223,20 @@
 			ERR("Bad reset kind '%s'\n", opt_reset);
 			return 1;
 		}
-		INFO("Reseting (%s)\n", opt_reset);
+		DBG("Reseting (%s)\n", opt_reset);
 		if((ret = mpp_reset(astribank, full_reset)) < 0) {
 			ERR("%s Reseting astribank failed: %d\n",
 				(full_reset) ? "Full" : "Half", ret);
 		}
 	} else if(opt_renumerate) {
-		INFO("Renumerate\n");
+		DBG("Renumerate\n");
 		if((ret = mpp_renumerate(astribank)) < 0) {
 			ERR("Renumerating astribank failed: %d\n", ret);
 		}
 	} else if(opt_watchdog) {
 		int	watchdogstate = strtoul(opt_watchdog, NULL, 0);
 
-		INFO("TWINSTAR: Setting watchdog %s-guard\n",
+		DBG("TWINSTAR: Setting watchdog %s-guard\n",
 			(watchdogstate) ? "on" : "off");
 		if((ret = mpp_tws_setwatchdog(astribank, watchdogstate)) < 0) {
 			ERR("Failed to set watchdog to %d\n", watchdogstate);
@@ -249,7 +249,7 @@
 					? " Same same, never mind..."
 					: "";
 
-		INFO("TWINSTAR: Setting portnum to %d.%s\n", new_portnum, msg);
+		DBG("TWINSTAR: Setting portnum to %d.%s\n", new_portnum, msg);
 		if((ret = mpp_tws_setportnum(astribank, new_portnum)) < 0) {
 			ERR("Failed to set USB portnum to %d\n", new_portnum);
 			return 1;

Modified: tools/branches/2.2/xpp/xpp_fxloader
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.2/xpp/xpp_fxloader?view=diff&rev=7611&r1=7610&r2=7611
==============================================================================
--- tools/branches/2.2/xpp/xpp_fxloader (original)
+++ tools/branches/2.2/xpp/xpp_fxloader Thu Nov 19 17:11:35 2009
@@ -292,6 +292,7 @@
 	load_usb_fw e4e4 1140 $USB_FW
 	load_usb_fw e4e4 1150 $USB_FW
 	load_usb_fw e4e4 1160 $USB_FW
+	load_usb_fw e4e4 1163 $USB_FW
 	wait_renumeration $numdevs e4e4 '11[3456]1'
 	if [ "$1" != 'usb' ]
 	then
@@ -336,7 +337,7 @@
 	$LOGGER "Trying to find what to do for product $PRODUCT, device $DEVICE"
 	prod_id=`echo "$PRODUCT" | cut -d/ -f2`
 	case "$PRODUCT" in
-	e4e4/11[3456]0/*)
+	e4e4/11[3456]0/*|e4e4/1163/*)
 		FIRM_USB="$FIRMWARE_DIR/$USB_FW"
 		$LOGGER "Loading firmware '$FIRM_USB' into '$DEVICE'"
 		run_fxload -D "$DEVICE" -I "$FIRM_USB"