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

Move USSD status enum to header

This commit is contained in:
Aki Niemi 2010-02-09 22:00:46 +02:00
parent 6d28f82dc1
commit 8730339f40
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/ussd.h
View File

@ -28,6 +28,15 @@ extern "C" {
#include <ofono/types.h>
enum ofono_ussd_status {
OFONO_USSD_STATUS_NOTIFY = 0,
OFONO_USSD_STATUS_ACTION_REQUIRED = 1,
OFONO_USSD_STATUS_TERMINATED = 2,
OFONO_USSD_STATUS_LOCAL_CLIENT_RESPONDED = 3,
OFONO_USSD_STATUS_NOT_SUPPORTED = 4,
OFONO_USSD_STATUS_TIMED_OUT = 5,
};
struct ofono_ussd;
typedef void (*ofono_ussd_cb_t)(const struct ofono_error *error, void *data);

15
src/ussd.c
View File

@ -41,15 +41,6 @@
static GSList *g_drivers = NULL;
enum ussd_status {
USSD_STATUS_NOTIFY = 0,
USSD_STATUS_ACTION_REQUIRED = 1,
USSD_STATUS_TERMINATED = 2,
USSD_STATUS_LOCAL_CLIENT_RESPONDED = 3,
USSD_STATUS_NOT_SUPPORTED = 4,
USSD_STATUS_TIMED_OUT = 5,
};
enum ussd_state {
USSD_STATE_IDLE = 0,
USSD_STATE_ACTIVE = 1,
@ -292,13 +283,13 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, const char *str)
DBusMessageIter iter;
DBusMessageIter variant;
if (status == USSD_STATUS_NOT_SUPPORTED) {
if (status == OFONO_USSD_STATUS_NOT_SUPPORTED) {
ussd->state = USSD_STATE_IDLE;
reply = __ofono_error_not_supported(ussd->pending);
goto out;
}
if (status == USSD_STATUS_TIMED_OUT) {
if (status == OFONO_USSD_STATUS_TIMED_OUT) {
ussd->state = USSD_STATE_IDLE;
reply = __ofono_error_timed_out(ussd->pending);
goto out;
@ -306,7 +297,7 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, const char *str)
/* TODO: Rework this in the Agent framework */
if (ussd->state == USSD_STATE_ACTIVE) {
if (status == USSD_STATUS_ACTION_REQUIRED) {
if (status == OFONO_USSD_STATUS_ACTION_REQUIRED) {
ofono_error("Unable to handle action required ussd");
return;
}