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

[SVN commits to the DAHDI project]

branch "master" has been updated
       via  62879540871bd5837359f3525499912346563a1b (commit)
       via  b978e35636b23d4bff95c5bd2c8a379e10794d22 (commit)
       via  5c072d5bce2df7f93ce52af334e60a8eee79ecb6 (commit)
      from  1559db9d1ae03780788788c07334ca54cdd1253a (commit)

Summary of changes:
 Makefile                                   |    3 ++-
 drivers/dahdi/xpp/firmwares/USB_FW.201.hex |    6 +++---
 drivers/dahdi/xpp/firmwares/USB_FW.hex     |    6 +++---
 drivers/dahdi/xpp/xproto.c                 |    3 ++-
 4 files changed, 10 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit 62879540871bd5837359f3525499912346563a1b
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Mon Mar 30 15:35:09 2015 +0300

    xpp: USB_FW*: fix incorrect chan num with 2FXS6FXO
    
    New USB firmware that fix mis-reporting of the number of channels (or
    rather: licenses) in the Astribank when a 2FXS6FXO module is used in
    conjunction with another module.
    
    USB_FW.hex: rev. 11452
    USB_FW.201.hex: rev. 11453
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

diff --git a/drivers/dahdi/xpp/firmwares/USB_FW.201.hex b/drivers/dahdi/xpp/firmwares/USB_FW.201.hex
index 3e55a28..2320826 100644
--- a/drivers/dahdi/xpp/firmwares/USB_FW.201.hex
+++ b/drivers/dahdi/xpp/firmwares/USB_FW.201.hex
@@ -1,5 +1,5 @@
 #
-# $Id: USB_FW.201.hex 10402 2012-02-15 15:34:50Z dima $
+# $Id: USB_FW.201.hex 11453 2015-03-29 18:27:25Z dima $
 #
 :03004300021F0099
 :03005300021F0089
@@ -27,7 +27,7 @@
 :050FF6000300000000F3
 :100F3C0041E0370041E0B60042E0B1000041E0384A
 :100F4C0000021BE0850218E07943E0B30000004D7D
-:0F0F5C00E03931303339354D202020202020005E
+:0F0F5C00E03931313435314D2020202020200064
 :101D71008B538A548955E5581558AE57700215573B
 :101D81004E6014AB530555E555AA54700205541421
 :081D9100F9ED12077780DF2253
@@ -164,7 +164,7 @@
 :100B7E00AB45AA46A9477401120777E4F550E55034
 :100B8E00C454F0AB45AA46A94790000112078985C7
 :100B9E004858854959854A5A755B08121A95AB48CB
-:100BAE00AA49A94A90000212074AFE5403FFEE54C6
+:100BAE00AA49A94A90000212074AFE5407FFEE54C2
 :100BBE0070F55124E0602924F0604B24F0605D2430
 :100BCE00F0606F24406003020C5675410185184297
 :100BDE00851943EF24FE600624FE703B801C801FA7
diff --git a/drivers/dahdi/xpp/firmwares/USB_FW.hex b/drivers/dahdi/xpp/firmwares/USB_FW.hex
index dc68d08..1e2f001 100644
--- a/drivers/dahdi/xpp/firmwares/USB_FW.hex
+++ b/drivers/dahdi/xpp/firmwares/USB_FW.hex
@@ -1,5 +1,5 @@
 # 
-# $Id: USB_FW.hex 10401 2012-02-15 15:30:24Z dima $
+# $Id: USB_FW.hex 11452 2015-03-29 18:21:13Z dima $
 # 
 :03004300021F0099
 :03005300021F0089
@@ -27,7 +27,7 @@
 :051EF1000300000000E9
 :1011F50041E0370041E0B70042E0B2000041E0388D
 :1012050000021BE0860218E07A43E0B40000004EBD
-:10121500E03931303339354D502020202020200051
+:10121500E03931313435314D502020202020200057
 :101D9A008B518A528953E5561556AE557002155520
 :101DAA004E6014AB510553E553AA52700205521402
 :081DBA00F9ED12077180DF2230
@@ -165,7 +165,7 @@
 :100B7800AB43AA44A9457401120771E4F54EE54E4A
 :100B8800C454F0AB43AA44A94590000112078385D9
 :100B98004656854757854858755908121A94AB46E2
-:100BA800AA47A948900002120744FE5403FFEE54D6
+:100BA800AA47A948900002120744FE5407FFEE54D2
 :100BB80070F54F24E0602924F0604B24F0605D2438
 :100BC800F0606F24406003020C50753F01851840A7
 :100BD800851941EF24FE600624FE703B801C801FAF

commit b978e35636b23d4bff95c5bd2c8a379e10794d22
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Mon Mar 2 19:44:02 2015 +0200

    README: use file time for reproducable build
    
    https://bugs.debian.org/776622 asks to avoid using the build time in the
    generated result to help make the build reproducable.
    
    This fix uses the timestamp of README for generating the timestamp in
    the footer of README.html.
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

diff --git a/Makefile b/Makefile
index 1cf2ccd..d246865 100644
--- a/Makefile
+++ b/Makefile
@@ -196,7 +196,8 @@ test:
 docs: $(GENERATED_DOCS)
 
 README.html: README
-	$(ASCIIDOC_CMD) -o $@ $<
+	date=`stat -c "%y" $<`
+	$(ASCIIDOC_CMD)  -a revdate="$$date" -o $@ $<
 
 dahdi-api.html: drivers/dahdi/dahdi-base.c
 	build_tools/kernel-doc --kernel $(KSRC) $^ >$@

commit 5c072d5bce2df7f93ce52af334e60a8eee79ecb6
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Mon Mar 2 18:33:35 2015 +0200

    xpp: module_refcount is back to int on 3.19
    
    Commit d5db139ab3764640e0882a1746e7b9fdee33fd87 "module: make
    module_refcount() a signed integer." included in 3.19 makes this
    condition slightly more complex.
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

diff --git a/drivers/dahdi/xpp/xproto.c b/drivers/dahdi/xpp/xproto.c
index 25618fa..1fd130c 100644
--- a/drivers/dahdi/xpp/xproto.c
+++ b/drivers/dahdi/xpp/xproto.c
@@ -80,7 +80,8 @@ static const xproto_table_t *xproto_table(xpd_type_t cardtype)
 	return xprotocol_tables[cardtype];
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) || \
+	LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
 #define MODULE_REFCOUNT_FORMAT "%s refcount was %d\n"
 #else
 #define MODULE_REFCOUNT_FORMAT "%s refcount was %lu\n"

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


-- 
dahdi/linux.git