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

broadband-modem-mbim: rename 3GPP specific methods

Browse Source
This commit is contained in:
Aleksander Morgado
2013-06-19 19:08:46 +02:00
parent 67207f279b
commit ac7c87c0d2
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/mm-broadband-modem-mbim.c
View File

@@ -1734,7 +1734,7 @@ common_setup_cleanup_unsolicited_events (MMBroadbandModemMbim *self,
} }
/*****************************************************************************/ /*****************************************************************************/
/* Setup/cleanup unsolicited events */ /* Setup/cleanup unsolicited events (3GPP interface) */
static gboolean static gboolean
common_setup_cleanup_unsolicited_events_3gpp_finish (MMIfaceModem3gpp *self, common_setup_cleanup_unsolicited_events_3gpp_finish (MMIfaceModem3gpp *self,
@@ -1784,12 +1784,12 @@ setup_unsolicited_registration_events (MMIfaceModem3gpp *self,
} }
/*****************************************************************************/ /*****************************************************************************/
/* Enable/Disable unsolicited events */ /* Enable/Disable unsolicited events (3GPP interface) */
static gboolean static gboolean
common_enable_disable_unsolicited_events_finish (MMIfaceModem3gpp *self, modem_3gpp_common_enable_disable_unsolicited_events_finish (MMIfaceModem3gpp *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error);
} }
@@ -1859,10 +1859,10 @@ enable_signal_state_set_ready_cb (MbimDevice *device,
} }
static void static void
common_enable_disable_unsolicited_events (MMIfaceModem3gpp *_self, common_enable_disable_unsolicited_events_3gpp (MMIfaceModem3gpp *_self,
gboolean enable, gboolean enable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
MMBroadbandModemMbim *self = MM_BROADBAND_MODEM_MBIM (_self); MMBroadbandModemMbim *self = MM_BROADBAND_MODEM_MBIM (_self);
MbimDevice *device; MbimDevice *device;
@@ -1876,7 +1876,7 @@ common_enable_disable_unsolicited_events (MMIfaceModem3gpp *_self,
result = g_simple_async_result_new (G_OBJECT (self), result = g_simple_async_result_new (G_OBJECT (self),
callback, callback,
user_data, user_data,
common_enable_disable_unsolicited_events); common_enable_disable_unsolicited_events_3gpp);
#define DISABLE_FEATURE G_MAXUINT32 #define DISABLE_FEATURE G_MAXUINT32
#define AUTO_FEATURE 0 #define AUTO_FEATURE 0
@@ -1910,19 +1910,19 @@ common_enable_disable_unsolicited_events (MMIfaceModem3gpp *_self,
} }
static void static void
disable_unsolicited_events (MMIfaceModem3gpp *self, modem_3gpp_disable_unsolicited_events (MMIfaceModem3gpp *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
common_enable_disable_unsolicited_events (self, FALSE, callback, user_data); common_enable_disable_unsolicited_events_3gpp (self, FALSE, callback, user_data);
} }
static void static void
enable_unsolicited_events (MMIfaceModem3gpp *self, modem_3gpp_enable_unsolicited_events (MMIfaceModem3gpp *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
common_enable_disable_unsolicited_events (self, TRUE, callback, user_data); common_enable_disable_unsolicited_events_3gpp (self, TRUE, callback, user_data);
} }
/*****************************************************************************/ /*****************************************************************************/
@@ -2525,10 +2525,10 @@ iface_modem_3gpp_init (MMIfaceModem3gpp *iface)
iface->setup_unsolicited_events_finish = common_setup_cleanup_unsolicited_events_3gpp_finish; iface->setup_unsolicited_events_finish = common_setup_cleanup_unsolicited_events_3gpp_finish;
iface->cleanup_unsolicited_events = cleanup_unsolicited_events_3gpp; iface->cleanup_unsolicited_events = cleanup_unsolicited_events_3gpp;
iface->cleanup_unsolicited_events_finish = common_setup_cleanup_unsolicited_events_3gpp_finish; iface->cleanup_unsolicited_events_finish = common_setup_cleanup_unsolicited_events_3gpp_finish;
iface->enable_unsolicited_events = enable_unsolicited_events; iface->enable_unsolicited_events = modem_3gpp_enable_unsolicited_events;
iface->enable_unsolicited_events_finish = common_enable_disable_unsolicited_events_finish; iface->enable_unsolicited_events_finish = modem_3gpp_common_enable_disable_unsolicited_events_finish;
iface->disable_unsolicited_events = disable_unsolicited_events; iface->disable_unsolicited_events = modem_3gpp_disable_unsolicited_events;
iface->disable_unsolicited_events_finish = common_enable_disable_unsolicited_events_finish; iface->disable_unsolicited_events_finish = modem_3gpp_common_enable_disable_unsolicited_events_finish;
iface->setup_unsolicited_registration_events = setup_unsolicited_registration_events; iface->setup_unsolicited_registration_events = setup_unsolicited_registration_events;
iface->setup_unsolicited_registration_events_finish = common_setup_cleanup_unsolicited_events_3gpp_finish; iface->setup_unsolicited_registration_events_finish = common_setup_cleanup_unsolicited_events_3gpp_finish;
iface->cleanup_unsolicited_registration_events = cleanup_unsolicited_registration_events; iface->cleanup_unsolicited_registration_events = cleanup_unsolicited_registration_events;