diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-11-04 17:33:46 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-11-04 17:33:46 +0000 |
| commit | 1588ee041e01dc31a75046dcf442da2fdc68ed66 (patch) | |
| tree | cd5f0859df3d28f7b17bc7629dff3f9574a8e504 /xpp/mpp_funcs.c | |
| parent | 91dfb30679d4412323565cb8ea61795c2d78264a (diff) | |
xpp: reduce the clutter of firmware loading
Make the new XPP tools much less verbose:
* demote messages to be debug
* Convert multi-line messages to be single-line messages
Making xpp_fxloader run in debug mode can be done by setting
DEBUG=yes
in /etc/dahdi/init.conf
Merged revisions 7221 via svnmerge from
http://svn.digium.com/svn/dahdi/tools/trunk
git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/branches/2.2@7474 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'xpp/mpp_funcs.c')
| -rw-r--r-- | xpp/mpp_funcs.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/xpp/mpp_funcs.c b/xpp/mpp_funcs.c index 53b1a7a..04b93d6 100644 --- a/xpp/mpp_funcs.c +++ b/xpp/mpp_funcs.c @@ -239,7 +239,7 @@ int send_command(struct astribank_device *astribank, struct mpp_command *cmd, in #endif ret = send_usb(astribank, (char *)cmd, len, timeout); if(ret < 0) { - ERR("send_usb failed ret=%d\n", ret); + DBG("send_usb failed ret=%d\n", ret); } astribank->tx_sequenceno++; return ret; @@ -277,6 +277,7 @@ err: } +__attribute__((warn_unused_result)) int process_command(struct astribank_device *astribank, struct mpp_command *cmd, struct mpp_command **reply_ref) { struct mpp_command *reply = NULL; @@ -291,14 +292,14 @@ int process_command(struct astribank_device *astribank, struct mpp_command *cmd, expected = get_command_desc(reply_op); //printf("%s: len=%d\n", __FUNCTION__, cmd->header.len); ret = send_command(astribank, cmd, TIMEOUT); - if(ret < 0) { - ERR("send_command failed: %d\n", ret); - goto out; - } if(!reply_ref) { DBG("No reply requested\n"); goto out; } + if(ret < 0) { + ERR("send_command failed: %d\n", ret); + goto out; + } reply = recv_command(astribank, TIMEOUT); if(!reply) { ERR("recv_command failed\n"); @@ -400,7 +401,8 @@ int mpp_proto_query(struct astribank_device *astribank) ret = -EPROTO; goto out; } - INFO("Protocol version: %02x\n", astribank->mpp_proto_version); + DBG("Protocol version: %02x\n", astribank->mpp_proto_version); + ret = astribank->mpp_proto_version; free_command(reply); out: return ret; |