From eb90498efdcf1cbb9a8ebab606b945263f25b6ce Mon Sep 17 00:00:00 2001 From: Elly Jones Date: Mon, 20 Dec 2010 14:51:39 -0500 Subject: Add CDMA Activate and ActivateManual methods. BUG=6885 TEST=built modemmanager and cromo Change-Id: Ib73a093b13da05948a2f1da8f051fe7c55682584 Review URL: http://codereview.chromium.org/3517013 (cherry picked from commit f447c8e1a0062500e1171e031cf4c8fef76ffd59) Conflicts: src/mm-modem-cdma.c --- src/mm-modem-cdma.c | 35 +++++++++++++++++++++++++++++++++++ src/mm-modem-cdma.h | 18 ++++++++++++++++++ 2 files changed, 53 insertions(+) (limited to 'src') diff --git a/src/mm-modem-cdma.c b/src/mm-modem-cdma.c index e80dc4e2..3f4ffe54 100644 --- a/src/mm-modem-cdma.c +++ b/src/mm-modem-cdma.c @@ -26,6 +26,8 @@ static void impl_modem_cdma_get_signal_quality (MMModemCdma *modem, DBusGMethodI static void impl_modem_cdma_get_esn (MMModemCdma *modem, DBusGMethodInvocation *context); static void impl_modem_cdma_get_serving_system (MMModemCdma *modem, DBusGMethodInvocation *context); static void impl_modem_cdma_get_registration_state (MMModemCdma *modem, DBusGMethodInvocation *context); +static void impl_modem_cdma_activate (MMModemCdma *modem, DBusGMethodInvocation *context); +static void impl_modem_cdma_activate_manual (MMModemCdma *modem, DBusGMethodInvocation *context); #include "mm-modem-cdma-glue.h" @@ -251,6 +253,39 @@ mm_modem_cdma_emit_signal_quality_changed (MMModemCdma *self, guint32 quality) g_signal_emit (self, signals[SIGNAL_QUALITY], 0, quality); } +void mm_modem_cdma_activate(MMModemCdma *self, MMModemUIntFn callback, + gpointer user_data) +{ + g_return_if_fail (MM_IS_MODEM_CDMA (self)); + g_return_if_fail (callback != NULL); + + if (MM_MODEM_CDMA_GET_INTERFACE (self)->activate) + MM_MODEM_CDMA_GET_INTERFACE (self)->activate(self, callback, user_data); + else + uint_op_not_supported (MM_MODEM (self), callback, user_data); +} + +static void impl_modem_cdma_activate(MMModemCdma *modem, + DBusGMethodInvocation *context) +{ + mm_modem_cdma_activate (modem, uint_call_done, context); +} + + +void mm_modem_cdma_activate_manual(MMModemCdma *self, MMModemUIntFn callback, + gpointer user_data) { + g_return_if_fail (MM_IS_MODEM_CDMA (self)); + g_return_if_fail (callback != NULL); + if (MM_MODEM_CDMA_GET_INTERFACE (self)->activate_manual) + MM_MODEM_CDMA_GET_INTERFACE (self)->activate_manual(self, callback, user_data); + else + uint_op_not_supported (MM_MODEM (self), callback, user_data); +} +static void impl_modem_cdma_activate_manual (MMModemCdma *modem, + DBusGMethodInvocation *context) { + mm_modem_cdma_activate_manual(modem, uint_call_done, context); +} + /*****************************************************************************/ static void diff --git a/src/mm-modem-cdma.h b/src/mm-modem-cdma.h index a7a626f7..89751518 100644 --- a/src/mm-modem-cdma.h +++ b/src/mm-modem-cdma.h @@ -70,6 +70,18 @@ struct _MMModemCdma { MMModemCdmaRegistrationStateFn callback, gpointer user_data); + void (*activate) (MMModemCdma *self, + MMModemUIntFn callback, + gpointer user_data); + + void (*activate_manual) (MMModemCdma *self, + MMModemUIntFn callback, + gpointer user_data); + + void (*activate_manual_debug) (MMModemCdma *self, + MMModemUIntFn callback, + gpointer user_data); + /* Signals */ void (*signal_quality) (MMModemCdma *self, guint32 quality); @@ -97,6 +109,12 @@ void mm_modem_cdma_get_registration_state (MMModemCdma *self, MMModemCdmaRegistrationStateFn callback, gpointer user_data); +void mm_modem_cdma_activate (MMModemCdma *self, MMModemUIntFn callback, + gpointer user_data); + +void mm_modem_cdma_activate_manual (MMModemCdma *self, MMModemUIntFn callback, + gpointer user_data); + /* Protected */ void mm_modem_cdma_emit_signal_quality_changed (MMModemCdma *self, guint32 new_quality); -- cgit v1.2.3-70-g09d2