colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iface-modem-cdma: let caller decide the maximum registration timeout

Browse Source
This commit is contained in:
Aleksander Morgado
2012-01-11 16:24:29 +01:00
parent cc4e469b1a
commit a0255273f0
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mm-broadband-modem.c
View File

@@ -3791,15 +3791,12 @@ modem_cdma_setup_registration_checks (MMIfaceModemCdma *self,
/*****************************************************************************/ /*****************************************************************************/
/* Register in network (CDMA interface) */ /* Register in network (CDMA interface) */
/* Maximum time to wait for a successful registration when polling
* periodically */
#define MAX_CDMA_REGISTRATION_CHECK_WAIT_TIME 60
typedef struct { typedef struct {
MMBroadbandModem *self; MMBroadbandModem *self;
GSimpleAsyncResult *result; GSimpleAsyncResult *result;
GCancellable *cancellable; GCancellable *cancellable;
GTimer *timer; GTimer *timer;
guint max_registration_time;
} RegisterInCdmaNetworkContext; } RegisterInCdmaNetworkContext;
static void static void
@@ -3893,7 +3890,7 @@ run_all_cdma_registration_checks_ready (MMBroadbandModem *self,
} }
/* Don't spend too much time waiting to get registered */ /* Don't spend too much time waiting to get registered */
if (g_timer_elapsed (ctx->timer, NULL) > MAX_CDMA_REGISTRATION_CHECK_WAIT_TIME) { if (g_timer_elapsed (ctx->timer, NULL) > ctx->max_registration_time) {
mm_dbg ("CDMA registration check timed out"); mm_dbg ("CDMA registration check timed out");
mm_iface_modem_cdma_update_cdma1x_registration_state ( mm_iface_modem_cdma_update_cdma1x_registration_state (
MM_IFACE_MODEM_CDMA (self), MM_IFACE_MODEM_CDMA (self),
@@ -3919,6 +3916,7 @@ run_all_cdma_registration_checks_ready (MMBroadbandModem *self,
static void static void
modem_cdma_register_in_network (MMIfaceModemCdma *self, modem_cdma_register_in_network (MMIfaceModemCdma *self,
guint max_registration_time,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
@@ -3933,6 +3931,7 @@ modem_cdma_register_in_network (MMIfaceModemCdma *self,
ctx = g_new0 (RegisterInCdmaNetworkContext, 1); ctx = g_new0 (RegisterInCdmaNetworkContext, 1);
ctx->self = g_object_ref (self); ctx->self = g_object_ref (self);
ctx->max_registration_time = max_registration_time;
ctx->result = g_simple_async_result_new (G_OBJECT (self), ctx->result = g_simple_async_result_new (G_OBJECT (self),
callback, callback,
user_data, user_data,

2
src/mm-iface-modem-cdma.c
View File

@@ -401,6 +401,7 @@ register_in_network_ready (MMIfaceModemCdma *self,
void void
mm_iface_modem_cdma_register_in_network (MMIfaceModemCdma *self, mm_iface_modem_cdma_register_in_network (MMIfaceModemCdma *self,
guint max_registration_time,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
@@ -412,6 +413,7 @@ mm_iface_modem_cdma_register_in_network (MMIfaceModemCdma *self,
mm_iface_modem_cdma_register_in_network); mm_iface_modem_cdma_register_in_network);
MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->register_in_network ( MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->register_in_network (
self, self,
max_registration_time,
(GAsyncReadyCallback)register_in_network_ready, (GAsyncReadyCallback)register_in_network_ready,
result); result);
} }

2
src/mm-iface-modem-cdma.h
View File

@@ -142,6 +142,7 @@ struct _MMIfaceModemCdma {
/* Try to register in the CDMA network */ /* Try to register in the CDMA network */
void (* register_in_network) (MMIfaceModemCdma *self, void (* register_in_network) (MMIfaceModemCdma *self,
guint max_registration_time,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean (*register_in_network_finish) (MMIfaceModemCdma *self, gboolean (*register_in_network_finish) (MMIfaceModemCdma *self,
@@ -224,6 +225,7 @@ gboolean mm_iface_modem_cdma_run_all_registration_checks_finish (MMIfaceModemCdm
/* Register in network */ /* Register in network */
void mm_iface_modem_cdma_register_in_network (MMIfaceModemCdma *self, void mm_iface_modem_cdma_register_in_network (MMIfaceModemCdma *self,
guint max_registration_time,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean mm_iface_modem_cdma_register_in_network_finish (MMIfaceModemCdma *self, gboolean mm_iface_modem_cdma_register_in_network_finish (MMIfaceModemCdma *self,