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

core: remove uses of `MMModemStateReason'

Browse Source 
Use `MMModemStateChangeReason' instead.
This commit is contained in:
Aleksander Morgado
2012-02-27 23:00:11 +01:00
parent 8b78e037a2
commit 12786d21cf
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mm-iface-modem-3gpp.c
View File

@@ -665,7 +665,7 @@ update_registration_state (MMIfaceModem3gpp *self,
mm_iface_modem_update_subsystem_state (MM_IFACE_MODEM (self), mm_iface_modem_update_subsystem_state (MM_IFACE_MODEM (self),
SUBSYSTEM_3GPP, SUBSYSTEM_3GPP,
MM_MODEM_STATE_REGISTERED, MM_MODEM_STATE_REGISTERED,
MM_MODEM_STATE_REASON_NONE); MM_MODEM_STATE_CHANGE_REASON_UNKNOWN);
} }
/* Not registered neither in home nor roaming network */ /* Not registered neither in home nor roaming network */
else { else {
@@ -678,7 +678,7 @@ update_registration_state (MMIfaceModem3gpp *self,
(new_state == MM_MODEM_3GPP_REGISTRATION_STATE_SEARCHING ? (new_state == MM_MODEM_3GPP_REGISTRATION_STATE_SEARCHING ?
MM_MODEM_STATE_SEARCHING : MM_MODEM_STATE_SEARCHING :
MM_MODEM_STATE_ENABLED), MM_MODEM_STATE_ENABLED),
MM_MODEM_STATE_REASON_NONE); MM_MODEM_STATE_CHANGE_REASON_UNKNOWN);
} }
} }

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

@@ -921,7 +921,7 @@ mm_iface_modem_cdma_update_evdo_registration_state (MMIfaceModemCdma *self,
mm_iface_modem_update_subsystem_state (MM_IFACE_MODEM (self), mm_iface_modem_update_subsystem_state (MM_IFACE_MODEM (self),
SUBSYSTEM_EVDO, SUBSYSTEM_EVDO,
MM_MODEM_STATE_REGISTERED, MM_MODEM_STATE_REGISTERED,
MM_MODEM_STATE_REASON_NONE); MM_MODEM_STATE_CHANGE_REASON_UNKNOWN);
/* TODO: report proper EVDO revision (0/A/B) */ /* TODO: report proper EVDO revision (0/A/B) */
mm_iface_modem_update_access_technologies (MM_IFACE_MODEM (self), mm_iface_modem_update_access_technologies (MM_IFACE_MODEM (self),
MM_MODEM_ACCESS_TECHNOLOGY_EVDO0, MM_MODEM_ACCESS_TECHNOLOGY_EVDO0,
@@ -931,7 +931,7 @@ mm_iface_modem_cdma_update_evdo_registration_state (MMIfaceModemCdma *self,
mm_iface_modem_update_subsystem_state (MM_IFACE_MODEM (self), mm_iface_modem_update_subsystem_state (MM_IFACE_MODEM (self),
SUBSYSTEM_EVDO, SUBSYSTEM_EVDO,
MM_MODEM_STATE_ENABLED, MM_MODEM_STATE_ENABLED,
MM_MODEM_STATE_REASON_NONE); MM_MODEM_STATE_CHANGE_REASON_UNKNOWN);
mm_iface_modem_update_access_technologies (MM_IFACE_MODEM (self), mm_iface_modem_update_access_technologies (MM_IFACE_MODEM (self),
MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN,
ALL_CDMA_EVDO_ACCESS_TECHNOLOGIES_MASK); ALL_CDMA_EVDO_ACCESS_TECHNOLOGIES_MASK);
@@ -972,7 +972,7 @@ mm_iface_modem_cdma_update_cdma1x_registration_state (MMIfaceModemCdma *self,
mm_iface_modem_update_subsystem_state (MM_IFACE_MODEM (self), mm_iface_modem_update_subsystem_state (MM_IFACE_MODEM (self),
SUBSYSTEM_CDMA1X, SUBSYSTEM_CDMA1X,
MM_MODEM_STATE_REGISTERED, MM_MODEM_STATE_REGISTERED,
MM_MODEM_STATE_REASON_NONE); MM_MODEM_STATE_CHANGE_REASON_UNKNOWN);
mm_iface_modem_update_access_technologies (MM_IFACE_MODEM (self), mm_iface_modem_update_access_technologies (MM_IFACE_MODEM (self),
MM_MODEM_ACCESS_TECHNOLOGY_1XRTT, MM_MODEM_ACCESS_TECHNOLOGY_1XRTT,
ALL_CDMA_CDMA1X_ACCESS_TECHNOLOGIES_MASK); ALL_CDMA_CDMA1X_ACCESS_TECHNOLOGIES_MASK);
@@ -986,7 +986,7 @@ mm_iface_modem_cdma_update_cdma1x_registration_state (MMIfaceModemCdma *self,
mm_iface_modem_update_subsystem_state (MM_IFACE_MODEM (self), mm_iface_modem_update_subsystem_state (MM_IFACE_MODEM (self),
SUBSYSTEM_CDMA1X, SUBSYSTEM_CDMA1X,
MM_MODEM_STATE_ENABLED, MM_MODEM_STATE_ENABLED,
MM_MODEM_STATE_REASON_NONE); MM_MODEM_STATE_CHANGE_REASON_UNKNOWN);
mm_iface_modem_update_access_technologies (MM_IFACE_MODEM (self), mm_iface_modem_update_access_technologies (MM_IFACE_MODEM (self),
MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN,
ALL_CDMA_CDMA1X_ACCESS_TECHNOLOGIES_MASK); ALL_CDMA_CDMA1X_ACCESS_TECHNOLOGIES_MASK);

4
src/mm-iface-modem.c
View File

@@ -927,7 +927,7 @@ bearer_list_count_connected (MMBearer *bearer,
void void
mm_iface_modem_update_state (MMIfaceModem *self, mm_iface_modem_update_state (MMIfaceModem *self,
MMModemState new_state, MMModemState new_state,
MMModemStateReason reason) MMModemStateChangeReason reason)
{ {
MMModemState old_state = MM_MODEM_STATE_UNKNOWN; MMModemState old_state = MM_MODEM_STATE_UNKNOWN;
MmGdbusModem *skeleton = NULL; MmGdbusModem *skeleton = NULL;
@@ -1115,7 +1115,7 @@ void
mm_iface_modem_update_subsystem_state (MMIfaceModem *self, mm_iface_modem_update_subsystem_state (MMIfaceModem *self,
const gchar *subsystem, const gchar *subsystem,
MMModemState new_state, MMModemState new_state,
MMModemStateReason reason) MMModemStateChangeReason reason)
{ {
MMModemState consolidated; MMModemState consolidated;

4
src/mm-iface-modem.h
View File

@@ -350,10 +350,10 @@ guint mm_iface_modem_signal_quality_check_finish (MMIfaceModem *self,
void mm_iface_modem_update_subsystem_state (MMIfaceModem *self, void mm_iface_modem_update_subsystem_state (MMIfaceModem *self,
const gchar *subsystem, const gchar *subsystem,
MMModemState new_state, MMModemState new_state,
MMModemStateReason reason); MMModemStateChangeReason reason);
void mm_iface_modem_update_state (MMIfaceModem *self, void mm_iface_modem_update_state (MMIfaceModem *self,
MMModemState new_state, MMModemState new_state,
MMModemStateReason reason); MMModemStateChangeReason reason);
/* Allow reporting new access tech */ /* Allow reporting new access tech */
void mm_iface_modem_update_access_technologies (MMIfaceModem *self, void mm_iface_modem_update_access_technologies (MMIfaceModem *self,