diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-12-10 17:26:04 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-12-10 17:26:04 +0000 |
| commit | 3487a5e3307be13cc40a2b21bd425ec2fb0e9775 (patch) | |
| tree | dbdf2d51ee34cc7f008bc6fb5a88bc186193c7dd /wctc4xxp | |
| parent | 275e64dd87da798fc6758b6ec5d72f5525ace25c (diff) | |
Merged revisions 3389 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r3389 | kpfleming | 2007-12-10 11:24:59 -0600 (Mon, 10 Dec 2007) | 2 lines
remove explicit references to 5.3kb/s mode in wctc4xxp driver, as the driver can now accept both 5.3kb/s and 6.3kb/s (but will still only generate 6.3kb/s)
........
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@3390 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wctc4xxp')
| -rw-r--r-- | wctc4xxp/base.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/wctc4xxp/base.c b/wctc4xxp/base.c index 4ecb1cc..3dcb1f4 100644 --- a/wctc4xxp/base.c +++ b/wctc4xxp/base.c @@ -1771,27 +1771,20 @@ static int __devinit wcdte_init_one(struct pci_dev *pdev, const struct pci_devic /* Setup Encoders and Decoders */ - if (!mode || strlen(mode) < 4) - { - sprintf(wc->complexname, "g.729a / g.723.1 5.3kbps"); + if (!mode || strlen(mode) < 4) { + sprintf(wc->complexname, "G.729a / G.723.1"); complexfmts = ZT_FORMAT_G729A | ZT_FORMAT_G723_1; wc->numchannels = min_numchannels; - } - else if (mode[3] == '9') /* "g729" */ - { - sprintf(wc->complexname, "g.729a"); + } else if (mode[3] == '9') { /* "G.729" */ + sprintf(wc->complexname, "G.729a"); complexfmts = ZT_FORMAT_G729A; wc->numchannels = g729_numchannels; - } - else if (mode[3] == '3') /* "g723" */ - { - sprintf(wc->complexname, "g.723.1 5.3kbps"); + } else if (mode[3] == '3') { /* "G.723.1" */ + sprintf(wc->complexname, "G.723.1"); complexfmts = ZT_FORMAT_G723_1; wc->numchannels = g723_numchannels; - } - else - { - sprintf(wc->complexname, "g.729a / g.723.1 5.3kbps"); + } else { + sprintf(wc->complexname, "G.729a / G.723.1"); complexfmts = ZT_FORMAT_G729A | ZT_FORMAT_G723_1; wc->numchannels = min_numchannels; } |