sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Evolve the voicecall driver

This commit is contained in:
Denis Kenzior 2009-08-19 17:22:02 -05:00
parent 73bba4b83b
commit 04c12038ba
6 changed files with 586 additions and 521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Makefile.am
View File

@ -5,7 +5,7 @@ include_HEADERS = log.h plugin.h history.h dbus.h modem.h \
types.h call-barring.h call-forwarding.h \
call-meter.h call-settings.h phonebook.h \
ssn.h ussd.h sms.h sim.h message-waiting.h \
netreg.h
netreg.h voicecall.h
nodist_include_HEADERS = version.h

16
include/types.h
View File

@ -53,6 +53,13 @@ enum ofono_error_type {
OFONO_ERROR_TYPE_FAILURE
};
enum ofono_disconnect_reason {
OFONO_DISCONNECT_REASON_UNKNOWN = 0,
OFONO_DISCONNECT_REASON_LOCAL_HANGUP,
OFONO_DISCONNECT_REASON_REMOTE_HANGUP,
OFONO_DISCONNECT_REASON_ERROR,
};
struct ofono_error {
enum ofono_error_type type;
int error;
@ -65,6 +72,15 @@ struct ofono_phone_number {
int type;
};
struct ofono_call {
unsigned id;
int type;
int direction;
int status;
struct ofono_phone_number phone_number;
int clip_validity;
};
#ifdef __cplusplus
}
#endif

108
include/voicecall.h Normal file
View File

@ -0,0 +1,108 @@
/*
*
* oFono - Open Source Telephony
*
* Copyright (C) 2008-2009 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#ifndef __OFONO_VOICECALL_H
#define __OFONO_VOICECALL_H
#ifdef __cplusplus
extern "C" {
#endif
#include <ofono/types.h>
struct ofono_voicecall;
typedef void (*ofono_voicecall_cb_t)(const struct ofono_error *error,
void *data);
typedef void (*ofono_call_list_cb_t)(const struct ofono_error *error,
int numcalls,
const struct ofono_call *call_list,
void *data);
/* Voice call related functionality, including ATD, ATA, +CHLD, CTFR, CLCC
* and VTS.
*
* It is up to the plugin to implement polling of CLCC if the modem does
* not support vendor extensions for call progress indication.
*/
struct ofono_voicecall_driver {
const char *name;
int (*probe)(struct ofono_voicecall *vc);
int (*remove)(struct ofono_voicecall *vc);
void (*dial)(struct ofono_voicecall *vc,
const struct ofono_phone_number *number,
enum ofono_clir_option clir, enum ofono_cug_option cug,
ofono_voicecall_cb_t cb, void *data);
void (*answer)(struct ofono_voicecall *vc,
ofono_voicecall_cb_t cb, void *data);
void (*hangup)(struct ofono_voicecall *vc,
ofono_voicecall_cb_t cb, void *data);
void (*list_calls)(struct ofono_voicecall *vc,
ofono_call_list_cb_t cb, void *data);
void (*hold_all_active)(struct ofono_voicecall *vc,
ofono_voicecall_cb_t cb, void *data);
void (*release_all_held)(struct ofono_voicecall *vc,
ofono_voicecall_cb_t cb, void *data);
void (*set_udub)(struct ofono_voicecall *vc,
ofono_voicecall_cb_t cb, void *data);
void (*release_all_active)(struct ofono_voicecall *vc,
ofono_voicecall_cb_t cb, void *data);
void (*release_specific)(struct ofono_voicecall *vc, int id,
ofono_voicecall_cb_t cb, void *data);
void (*private_chat)(struct ofono_voicecall *vc, int id,
ofono_voicecall_cb_t cb, void *data);
void (*create_multiparty)(struct ofono_voicecall *vc,
ofono_voicecall_cb_t cb, void *data);
void (*transfer)(struct ofono_voicecall *vc,
ofono_voicecall_cb_t cb, void *data);
void (*deflect)(struct ofono_voicecall *vc,
const struct ofono_phone_number *ph,
ofono_voicecall_cb_t cb, void *data);
void (*swap_without_accept)(struct ofono_voicecall *vc,
ofono_voicecall_cb_t cb, void *data);
void (*send_tones)(struct ofono_voicecall *vc, const char *tones,
ofono_voicecall_cb_t cb, void *data);
};
void ofono_voicecall_notify(struct ofono_voicecall *vc,
const struct ofono_call *call);
void ofono_voicecall_disconnected(struct ofono_voicecall *vc, int id,
enum ofono_disconnect_reason reason,
const struct ofono_error *error);
int ofono_voicecall_driver_register(const struct ofono_voicecall_driver *d);
void ofono_voicecall_driver_unregister(const struct ofono_voicecall_driver *d);
struct ofono_voicecall *ofono_voicecall_create(struct ofono_modem *modem,
const char *driver, void *data);
void ofono_voicecall_register(struct ofono_voicecall *vc);
void ofono_voicecall_remove(struct ofono_voicecall *vc);
void ofono_voicecall_set_data(struct ofono_voicecall *vc, void *data);
void *ofono_voicecall_get_data(struct ofono_voicecall *vc);
#ifdef __cplusplus
}
#endif
#endif /* __OFONO_VOICECALL_H */

80
src/driver.h
View File

@ -23,36 +23,6 @@
struct ofono_modem;
enum ofono_disconnect_reason {
OFONO_DISCONNECT_REASON_UNKNOWN = 0,
OFONO_DISCONNECT_REASON_LOCAL_HANGUP,
OFONO_DISCONNECT_REASON_REMOTE_HANGUP,
OFONO_DISCONNECT_REASON_ERROR,
};
struct ofono_call {
unsigned id;
int type;
int direction;
int status;
struct ofono_phone_number phone_number;
int clip_validity;
};
/* Notification functions, the integer values here should map to
* values obtained from the modem. The enumerations are the same
* as the values for the fields found in 3GPP TS 27.007
*
* Pass in the integer value -1 if the value is not known
* Pass in NULL string value if the value is not known
*/
typedef void (*ofono_generic_cb_t)(const struct ofono_error *error,
void *data);
typedef void (*ofono_call_list_cb_t)(const struct ofono_error *error,
int numcalls,
const struct ofono_call *call_list,
void *data);
typedef void (*ofono_modem_attribute_query_cb_t)(const struct ofono_error *error,
const char *attribute, void *data);
@ -71,53 +41,3 @@ struct ofono_modem_attribute_ops {
struct ofono_modem *ofono_modem_register(struct ofono_modem_attribute_ops *ops);
int ofono_modem_unregister(struct ofono_modem *modem);
/* Voice call related functionality, including ATD, ATA, +CHLD, CTFR, CLCC
* and VTS.
*
* It is up to the plugin to implement polling of CLCC if the modem does
* not support vendor extensions for call progress indication.
*/
struct ofono_voicecall_ops {
void (*dial)(struct ofono_modem *modem,
const struct ofono_phone_number *number,
enum ofono_clir_option clir, enum ofono_cug_option cug,
ofono_generic_cb_t cb, void *data);
void (*answer)(struct ofono_modem *modem,
ofono_generic_cb_t cb, void *data);
void (*hangup)(struct ofono_modem *modem,
ofono_generic_cb_t cb, void *data);
void (*list_calls)(struct ofono_modem *modem,
ofono_call_list_cb_t cb, void *data);
void (*hold_all_active)(struct ofono_modem *modem,
ofono_generic_cb_t cb, void *data);
void (*release_all_held)(struct ofono_modem *modem,
ofono_generic_cb_t cb, void *data);
void (*set_udub)(struct ofono_modem *modem,
ofono_generic_cb_t cb, void *data);
void (*release_all_active)(struct ofono_modem *modem,
ofono_generic_cb_t cb, void *data);
void (*release_specific)(struct ofono_modem *modem, int id,
ofono_generic_cb_t cb, void *data);
void (*private_chat)(struct ofono_modem *modem, int id,
ofono_generic_cb_t cb, void *data);
void (*create_multiparty)(struct ofono_modem *modem,
ofono_generic_cb_t cb, void *data);
void (*transfer)(struct ofono_modem *modem,
ofono_generic_cb_t cb, void *data);
void (*deflect)(struct ofono_modem *modem,
const struct ofono_phone_number *ph,
ofono_generic_cb_t cb, void *data);
void (*swap_without_accept)(struct ofono_modem *modem,
ofono_generic_cb_t cb, void *data);
void (*send_tones)(struct ofono_modem *modem, const char *tones,
ofono_generic_cb_t cb, void *data);
};
void ofono_voicecall_notify(struct ofono_modem *modem, const struct ofono_call *call);
void ofono_voicecall_disconnected(struct ofono_modem *modem, int id,
enum ofono_disconnect_reason reason,
const struct ofono_error *error);
int ofono_voicecall_register(struct ofono_modem *modem, struct ofono_voicecall_ops *ops);
void ofono_voicecall_unregister(struct ofono_modem *modem);

2
src/ofono.h
View File

@ -143,8 +143,8 @@ void __ofono_atom_free(struct ofono_atom *atom);
#include <ofono/call-settings.h>
#include <ofono/phonebook.h>
#include <ofono/sms.h>
#include <ofono/sim.h>
#include <ofono/voicecall.h>
#include <ofono/ssn.h>

899
src/voicecall.c
View File

File diff suppressed because it is too large Load Diff