aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/telephony
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/telephony')
-rw-r--r--drivers/telephony/ixj.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
index c7b0a357b04a..49cd9793404f 100644
--- a/drivers/telephony/ixj.c
+++ b/drivers/telephony/ixj.c
@@ -3453,7 +3453,6 @@ static void ixj_write_frame(IXJ *j)
3453{ 3453{
3454 int cnt, frame_count, dly; 3454 int cnt, frame_count, dly;
3455 IXJ_WORD dat; 3455 IXJ_WORD dat;
3456 BYTES blankword;
3457 3456
3458 frame_count = 0; 3457 frame_count = 0;
3459 if(j->flags.cidplay) { 3458 if(j->flags.cidplay) {
@@ -3501,6 +3500,8 @@ static void ixj_write_frame(IXJ *j)
3501 } 3500 }
3502 if (frame_count >= 1) { 3501 if (frame_count >= 1) {
3503 if (j->ver.low == 0x12 && j->play_mode && j->flags.play_first_frame) { 3502 if (j->ver.low == 0x12 && j->play_mode && j->flags.play_first_frame) {
3503 BYTES blankword;
3504
3504 switch (j->play_mode) { 3505 switch (j->play_mode) {
3505 case PLAYBACK_MODE_ULAW: 3506 case PLAYBACK_MODE_ULAW:
3506 case PLAYBACK_MODE_ALAW: 3507 case PLAYBACK_MODE_ALAW:
@@ -3508,6 +3509,7 @@ static void ixj_write_frame(IXJ *j)
3508 break; 3509 break;
3509 case PLAYBACK_MODE_8LINEAR: 3510 case PLAYBACK_MODE_8LINEAR:
3510 case PLAYBACK_MODE_16LINEAR: 3511 case PLAYBACK_MODE_16LINEAR:
3512 default:
3511 blankword.low = blankword.high = 0x00; 3513 blankword.low = blankword.high = 0x00;
3512 break; 3514 break;
3513 case PLAYBACK_MODE_8LINEAR_WSS: 3515 case PLAYBACK_MODE_8LINEAR_WSS:
@@ -3531,6 +3533,8 @@ static void ixj_write_frame(IXJ *j)
3531 j->flags.play_first_frame = 0; 3533 j->flags.play_first_frame = 0;
3532 } else if (j->play_codec == G723_63 && j->flags.play_first_frame) { 3534 } else if (j->play_codec == G723_63 && j->flags.play_first_frame) {
3533 for (cnt = 0; cnt < 24; cnt++) { 3535 for (cnt = 0; cnt < 24; cnt++) {
3536 BYTES blankword;
3537
3534 if(cnt == 12) { 3538 if(cnt == 12) {
3535 blankword.low = 0x02; 3539 blankword.low = 0x02;
3536 blankword.high = 0x00; 3540 blankword.high = 0x00;
@@ -4868,6 +4872,7 @@ static char daa_CR_read(IXJ *j, int cr)
4868 bytes.high = 0xB0 + cr; 4872 bytes.high = 0xB0 + cr;
4869 break; 4873 break;
4870 case SOP_PU_PULSEDIALING: 4874 case SOP_PU_PULSEDIALING:
4875 default:
4871 bytes.high = 0xF0 + cr; 4876 bytes.high = 0xF0 + cr;
4872 break; 4877 break;
4873 } 4878 }