[dahdi-commits] dahdi/linux.git branch "master" updated.

[SVN commits to the DAHDI project]

branch "master" has been updated
       via  bd0366287e90c19cc05c0b26e7eb5c04fff07663 (commit)
       via  f287c0af7f61c85ab9d706c7d8b91ec970f8387e (commit)
       via  7adc74512e614d6408db053694033ffae31cf6a8 (commit)
      from  b993d25c5abe2b5c416922587c66b59ac0af4155 (commit)

Summary of changes:
 drivers/dahdi/xpp/card_global.c      |    6 ++++++
 drivers/dahdi/xpp/firmwares/Makefile |    3 +++
 2 files changed, 9 insertions(+)


- Log -----------------------------------------------------------------
commit bd0366287e90c19cc05c0b26e7eb5c04fff07663
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Wed Nov 6 20:01:55 2013 +0200

    xpp: Fail loading if no module on first slot
    
    The driver assumes that the first slot is not empty. If this is not the
    case, synchronization will not work.
    
    Fail loading if this assertion does not hold.
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

diff --git a/drivers/dahdi/xpp/card_global.c b/drivers/dahdi/xpp/card_global.c
index 3ed82e2..f743e62 100644
--- a/drivers/dahdi/xpp/card_global.c
+++ b/drivers/dahdi/xpp/card_global.c
@@ -511,6 +511,11 @@ HANDLER_DEF(GLOBAL, AB_DESCRIPTION)
 		ret = -EPROTO;
 		goto proto_err;
 	}
+	if (units[0].addr.unit != 0 || units[0].addr.subunit != 0) {
+		XBUS_NOTICE(xbus, "No first module. Astribank unusable.\n");
+		ret = -EPROTO;
+		goto proto_err;
+	}
 	if (!xbus_setstate(xbus, XBUS_STATE_RECVD_DESC)) {
 		ret = -EPROTO;
 		goto proto_err;

commit f287c0af7f61c85ab9d706c7d8b91ec970f8387e
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Wed Nov 6 19:05:00 2013 +0200

    xpp: mark an AB as failed if it gives bad desc
    
    If we fail at handling the device descriptor from the Astribank, mark it
    as in state "failed".
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

diff --git a/drivers/dahdi/xpp/card_global.c b/drivers/dahdi/xpp/card_global.c
index 997ba63..3ed82e2 100644
--- a/drivers/dahdi/xpp/card_global.c
+++ b/drivers/dahdi/xpp/card_global.c
@@ -568,6 +568,7 @@ HANDLER_DEF(GLOBAL, AB_DESCRIPTION)
 	}
 	goto out;
 proto_err:
+	xbus_setstate(xbus, XBUS_STATE_FAIL);
 	dump_packet("AB_DESCRIPTION", pack, DBG_ANY);
 out:
 	return ret;

commit 7adc74512e614d6408db053694033ffae31cf6a8
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Thu Nov 7 17:07:07 2013 +0200

    xpp: USB_FW.202.hex: provide as a symlink
    
    Provide USB_FW.202.hex as a (install-time) symlink to USB_FW.201.hex.
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

diff --git a/drivers/dahdi/xpp/firmwares/Makefile b/drivers/dahdi/xpp/firmwares/Makefile
index d9c24ab..f2be560 100644
--- a/drivers/dahdi/xpp/firmwares/Makefile
+++ b/drivers/dahdi/xpp/firmwares/Makefile
@@ -20,4 +20,7 @@ install:
 	mkdir -p $(TARGET)
 	install $(SCRIPTS) $(TARGET)/
 	install -m 644 ../XppConfig.pm $(FIRMWARES) $(TARGET)/
+	if [ ! -r $(TARGET)/USB_FW.202.hex ]; then \
+		ln -s USB_FW.201.hex $(TARGET)/USB_FW.202.hex;\
+	fi
 

-----------------------------------------------------------------------


-- 
dahdi/linux.git