← Back to branch summary

~morphis/phablet-extras/ofono-sms-status-report

« back to all changes in this revision

Viewing changes to drivers/huaweimodem/voicecall.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-08-22 19:59:08 UTC
  • mfrom: (1.3.3) (6.1.5 experimental)
  • Revision ID: package-import@ubuntu.com-20120822195908-0bmmk1hlh989bgk6
Tags: 1.9-1ubuntu1
https://launchpad.net/bugs/600501
* Merge with Debian experimental; remaining changes:
  - debian/control: explicitly Conflicts with modemmanager: having both
    installed / running at the same time causes issues causes issues with
    both claiming modem devices.
  - debian/patches/02-dont-handle-stacktraces.patch: stop catching stacktraces
    and printing the information internally, so apport can catch and report
    the possible bugs.
  - debian/ofono.postinst: on configure, notify the user that a reboot is
    required (so ofono can get started by upstart). (LP: #600501)
  - debian/rules: pass --no-restart-on-upgrade so ofono isn't automatically
    restarted when upgrades.
  - Adding upstart config / Removing standard init script
  - Adding Apport support
  - Patch for recognizing special Huawei devices with weird serial
  - Override lintian to avoid script-in-etc-init.d... warnings.
  - Update debian/compat to 7
* debian/series: add our patches to debian/patches/series now that the package
  uses quilt.
* debian/patches/02-dont-handle-stacktraces.patch: refreshed.
* debian/ofono-dev.install, debian/ofono.install:
  - Install usr/sbin/dundee and ofono.pc to the proper packages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/huaweimodem/voicecall.c
2
2
 *
3
3
 *  oFono - Open Source Telephony
4
4
 *
5
 
 *  Copyright (C) 2008-2010  Intel Corporation. All rights reserved.
 
5
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
6
6
 *
7
7
 *  This program is free software; you can redistribute it and/or modify
8
8
 *  it under the terms of the GNU General Public License version 2 as
78
78
 
79
79
        d->calls = g_slist_insert_sorted(d->calls, call, at_util_call_compare);
80
80
 
81
 
        g_at_chat_send(d->chat, "AT^DDSETEX=2", none_prefix,
82
 
                                                NULL, NULL, NULL);
83
 
 
84
81
        return call;
85
82
}
86
83
 
116
113
                                enum ofono_clir_option clir,
117
114
                                ofono_voicecall_cb_t cb, void *data)
118
115
{
 
116
        struct voicecall_data *vd = ofono_voicecall_get_data(vc);
119
117
        char buf[256];
120
118
 
121
119
        if (ph->type == 145)
137
135
        strcat(buf, ";");
138
136
 
139
137
        huawei_template(vc, buf, cb, data);
 
138
 
 
139
        g_at_chat_send(vd->chat, "AT^DDSETEX=2", none_prefix,
 
140
                                                NULL, NULL, NULL);
140
141
}
141
142
 
142
143
static void huawei_answer(struct ofono_voicecall *vc,
143
144
                                ofono_voicecall_cb_t cb, void *data)
144
145
{
 
146
        struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 
147
 
145
148
        huawei_template(vc, "ATA", cb, data);
 
149
 
 
150
        g_at_chat_send(vd->chat, "AT^DDSETEX=2", none_prefix,
 
151
                                                NULL, NULL, NULL);
146
152
}
147
153
 
148
154
static void huawei_hangup(struct ofono_voicecall *vc,