From 8730339f40285b05faa6979b267fd5a74be43fcc Mon Sep 17 00:00:00 2001 From: Aki Niemi Date: Tue, 9 Feb 2010 22:00:46 +0200 Subject: [PATCH] Move USSD status enum to header --- include/ussd.h | 9 +++++++++ src/ussd.c | 15 +++------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/ussd.h b/include/ussd.h index a0f3a1e7..96e04cb0 100644 --- a/include/ussd.h +++ b/include/ussd.h @@ -28,6 +28,15 @@ extern "C" { #include +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); diff --git a/src/ussd.c b/src/ussd.c index df2e4b3c..e5b53ffe 100644 --- a/src/ussd.c +++ b/src/ussd.c @@ -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; }