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

cdma: use consistent terminology for registration

Browse Source
This commit is contained in:
Dan Williams
2009-10-11 11:24:41 -07:00
parent 665d1847a8
commit 19b7c8fef1
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mm-generic-cdma.c
View File

@@ -820,7 +820,7 @@ reg_state_css_response (MMModemCdma *cdma,
MMModem *modem = info->modem; MMModem *modem = info->modem;
/* We'll get an error if the SID isn't valid, so detect that and /* We'll get an error if the SID isn't valid, so detect that and
* report unknown registration status. * report unknown registration state.
*/ */
if (error) { if (error) {
if ( (error->domain == MM_MOBILE_ERROR) if ( (error->domain == MM_MOBILE_ERROR)
@@ -839,8 +839,8 @@ reg_state_css_response (MMModemCdma *cdma,
} }
/* SID is valid; let subclasses figure out roaming and detailed registration */ /* SID is valid; let subclasses figure out roaming and detailed registration */
if (MM_GENERIC_CDMA_GET_CLASS (modem)->query_registration_status) { if (MM_GENERIC_CDMA_GET_CLASS (modem)->query_registration_state) {
MM_GENERIC_CDMA_GET_CLASS (modem)->query_registration_status (MM_GENERIC_CDMA (modem), MM_GENERIC_CDMA_GET_CLASS (modem)->query_registration_state (MM_GENERIC_CDMA (modem),
reg_state_query_done, reg_state_query_done,
info); info);
} else { } else {
@@ -914,7 +914,7 @@ get_registration_state (MMModemCdma *modem,
} }
info = mm_callback_info_uint_new (MM_MODEM (modem), callback, user_data); info = mm_callback_info_uint_new (MM_MODEM (modem), callback, user_data);
/* Prefer secondary port for registration status */ /* Prefer secondary port for registration state */
mm_serial_port_queue_command (priv->secondary ? priv->secondary : priv->primary, mm_serial_port_queue_command (priv->secondary ? priv->secondary : priv->primary,
"+CAD?", "+CAD?",
3, 3,

2
src/mm-generic-cdma.h
View File

@@ -36,7 +36,7 @@ typedef struct {
typedef struct { typedef struct {
MMModemBaseClass parent; MMModemBaseClass parent;
void (*query_registration_status) (MMGenericCdma *self, void (*query_registration_state) (MMGenericCdma *self,
MMModemUIntFn callback, MMModemUIntFn callback,
gpointer user_data); gpointer user_data);
} MMGenericCdmaClass; } MMGenericCdmaClass;