From d61645339b4515d0873288d908fbdb920b5b43d5 Mon Sep 17 00:00:00 2001
From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Date: Thu, 19 Nov 2009 23:11:35 +0000
Subject: 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


git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/branches/2.2@7611 a0bf4364-ded3-4de4-8d8a-66a801d63aff
---
 xpp/astribank_tool.c | 12 ++++++------
 xpp/xpp_fxloader     |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/xpp/astribank_tool.c b/xpp/astribank_tool.c
index 475aba8..db0b7a3 100644
--- a/xpp/astribank_tool.c
+++ b/xpp/astribank_tool.c
@@ -204,9 +204,9 @@ int main(int argc, char *argv[])
 	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 @@ int main(int argc, char *argv[])
 			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 @@ int main(int argc, char *argv[])
 					? " 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;
diff --git a/xpp/xpp_fxloader b/xpp/xpp_fxloader
index 790b0fd..402f9af 100644
--- a/xpp/xpp_fxloader
+++ b/xpp/xpp_fxloader
@@ -292,6 +292,7 @@ xppdetect|load|usb)
 	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 @@ then
 	$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"
-- 
cgit v1.2.3