summaryrefslogtreecommitdiff
path: root/xpp/mpp_funcs.c
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>2009-11-04 16:36:21 +0000
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>2009-11-04 16:36:21 +0000
commitdb77afdbde30d91a64707ef94627cf00938b2664 (patch)
treeda7d141c9bc61fe02fd410808cf571ce0a9a4b1b /xpp/mpp_funcs.c
parent746ff447145a44ea0a8898677be4227bb93a2834 (diff)
Compilation and documentation fixes from trunk
Merged revisions 6842,6898,6902,6976,7131 via svnmerge from http://svn.digium.com/svn/dahdi/tools/trunk ........ r6842 | tzafrir | 2009-07-16 13:19:23 +0300 (Thu, 16 Jul 2009) | 2 lines Document attributes of a Dahdi::Xpp::Xpd object. ........ r6898 | dbrooks | 2009-07-27 22:54:13 +0300 (Mon, 27 Jul 2009) | 6 lines Replaces typos "recieved" with "received" and "initilize" with "initialize". (closes issue #15571) Reported by: alecdavis ........ r6902 | seanbright | 2009-07-28 00:05:16 +0300 (Tue, 28 Jul 2009) | 11 lines Pass correct channel number to DAHDI_GET_PARAMS when passing span numbers to dahdi_scan. When filtering, we weren't taking into account the number of channels in the spans that we were skipping. (closes issue #15553) Reported by: tony Patches: 20090723_issue15553.patch uploaded by seanbright (license 71) Tested by: seanbright ........ r6976 | tzafrir | 2009-08-12 22:21:01 +0300 (Wed, 12 Aug 2009) | 4 lines xpp: cleanup gcc warnings and one real astribank_tool bug xpp rev: 7281 ........ r7131 | tzafrir | 2009-09-15 19:52:58 +0300 (Tue, 15 Sep 2009) | 7 lines Add a missing trailing slash on the install-libs target (closes issue #15793) Reported by: pprindeville Patches: dahdi-tools-makefile.patch uploaded by pprindeville (license 347) ........ git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/branches/2.2@7471 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'xpp/mpp_funcs.c')
-rw-r--r--xpp/mpp_funcs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xpp/mpp_funcs.c b/xpp/mpp_funcs.c
index c52397f..53b1a7a 100644
--- a/xpp/mpp_funcs.c
+++ b/xpp/mpp_funcs.c
@@ -605,9 +605,9 @@ int mpp_eeprom_blk_rd(struct astribank_device *astribank, uint8_t *buf, uint16_t
size = ret;
goto out;
}
+ size = reply->header.len - sizeof(struct mpp_header) - sizeof(struct d_EEPROM_BLK_RD_REPLY);
INFO("size=%d offset=0x%X\n", size, CMD_FIELD(reply, EEPROM_BLK_RD_REPLY, offset));
dump_packet(LOG_DEBUG, "BLK_RD", (char *)reply, ret);
- size = reply->header.len - sizeof(struct mpp_header) - sizeof(struct d_EEPROM_BLK_RD_REPLY);
if(size > len) {
ERR("Truncating reply (was %d, now %d)\n", size, len);
size = len;