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

iface-modem: renamed modem_flow_control' to setup_flow_control'

Browse Source 
Changed broadband modem and Cinterion plugin accordingly.
This commit is contained in:
Aleksander Morgado
2011-12-29 11:37:52 +01:00
parent 08b7620b7a
commit 7b506bc8a6
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/mm-broadband-modem-cinterion.c
View File

@@ -198,7 +198,7 @@ modem_after_power_up (MMIfaceModem *self,
/* FLOW CONTROL */ /* FLOW CONTROL */
static gboolean static gboolean
modem_flow_control_finish (MMIfaceModem *self, setup_flow_control_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
@@ -206,7 +206,7 @@ modem_flow_control_finish (MMIfaceModem *self,
} }
static void static void
modem_flow_control_ready (MMBroadbandModemCinterion *self, setup_flow_control_ready (MMBroadbandModemCinterion *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *operation_result) GSimpleAsyncResult *operation_result)
{ {
@@ -224,7 +224,7 @@ modem_flow_control_ready (MMBroadbandModemCinterion *self,
} }
static void static void
modem_flow_control (MMIfaceModem *self, setup_flow_control (MMIfaceModem *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
@@ -233,7 +233,7 @@ modem_flow_control (MMIfaceModem *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,
modem_flow_control); setup_flow_control);
/* We need to enable RTS/CTS so that CYCLIC SLEEP mode works */ /* We need to enable RTS/CTS so that CYCLIC SLEEP mode works */
mm_base_modem_at_command (MM_BASE_MODEM (self), mm_base_modem_at_command (MM_BASE_MODEM (self),
@@ -241,7 +241,7 @@ modem_flow_control (MMIfaceModem *self,
3, 3,
FALSE, FALSE,
NULL, /* cancellable */ NULL, /* cancellable */
(GAsyncReadyCallback)modem_flow_control_ready, (GAsyncReadyCallback)setup_flow_control_ready,
result); result);
} }
@@ -285,8 +285,8 @@ finalize (GObject *object)
static void static void
iface_modem_init (MMIfaceModem *iface) iface_modem_init (MMIfaceModem *iface)
{ {
iface->modem_flow_control = modem_flow_control; iface->setup_flow_control = setup_flow_control;
iface->modem_flow_control_finish = modem_flow_control_finish; iface->setup_flow_control_finish = setup_flow_control_finish;
iface->modem_after_power_up = modem_after_power_up; iface->modem_after_power_up = modem_after_power_up;
iface->modem_after_power_up_finish = modem_after_power_up_finish; iface->modem_after_power_up_finish = modem_after_power_up_finish;
iface->modem_power_down = modem_power_down; iface->modem_power_down = modem_power_down;

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

@@ -1074,7 +1074,7 @@ load_supported_charsets (MMIfaceModem *self,
/* FLOW CONTROL */ /* FLOW CONTROL */
static gboolean static gboolean
modem_flow_control_finish (MMIfaceModem *self, setup_flow_control_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
@@ -1083,7 +1083,7 @@ modem_flow_control_finish (MMIfaceModem *self,
} }
static void static void
modem_flow_control (MMIfaceModem *self, setup_flow_control (MMIfaceModem *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
@@ -1097,7 +1097,7 @@ modem_flow_control (MMIfaceModem *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,
modem_flow_control); setup_flow_control);
g_simple_async_result_set_op_res_gboolean (result, TRUE); g_simple_async_result_set_op_res_gboolean (result, TRUE);
g_simple_async_result_complete_in_idle (result); g_simple_async_result_complete_in_idle (result);
g_object_unref (result); g_object_unref (result);
@@ -1131,7 +1131,7 @@ modem_power_up (MMIfaceModem *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,
modem_flow_control); setup_flow_control);
g_simple_async_result_set_op_res_gboolean (result, TRUE); g_simple_async_result_set_op_res_gboolean (result, TRUE);
g_simple_async_result_complete_in_idle (result); g_simple_async_result_complete_in_idle (result);
g_object_unref (result); g_object_unref (result);
@@ -2959,8 +2959,8 @@ iface_modem_init (MMIfaceModem *iface)
iface->modem_init_finish = modem_init_finish; iface->modem_init_finish = modem_init_finish;
iface->modem_power_up = modem_power_up; iface->modem_power_up = modem_power_up;
iface->modem_power_up_finish = modem_power_up_finish; iface->modem_power_up_finish = modem_power_up_finish;
iface->modem_flow_control = modem_flow_control; iface->setup_flow_control = setup_flow_control;
iface->modem_flow_control_finish = modem_flow_control_finish; iface->setup_flow_control_finish = setup_flow_control_finish;
iface->load_supported_charsets = load_supported_charsets; iface->load_supported_charsets = load_supported_charsets;
iface->load_supported_charsets_finish = load_supported_charsets_finish; iface->load_supported_charsets_finish = load_supported_charsets_finish;
iface->modem_charset = modem_charset; iface->modem_charset = modem_charset;

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

@@ -1646,7 +1646,7 @@ mm_iface_modem_enable_finish (MMIfaceModem *self,
VOID_REPLY_READY_FN (modem_init); VOID_REPLY_READY_FN (modem_init);
VOID_REPLY_READY_FN (modem_power_up); VOID_REPLY_READY_FN (modem_power_up);
VOID_REPLY_READY_FN (modem_after_power_up); VOID_REPLY_READY_FN (modem_after_power_up);
VOID_REPLY_READY_FN (modem_flow_control); VOID_REPLY_READY_FN (setup_flow_control);
static void static void
load_supported_charsets_ready (MMIfaceModem *self, load_supported_charsets_ready (MMIfaceModem *self,
@@ -1783,11 +1783,11 @@ interface_enabling_step (EnablingContext *ctx)
ctx->step++; ctx->step++;
case ENABLING_STEP_FLOW_CONTROL: case ENABLING_STEP_FLOW_CONTROL:
if (MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->modem_flow_control && if (MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->setup_flow_control &&
MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->modem_flow_control_finish) { MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->setup_flow_control_finish) {
MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->modem_flow_control ( MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->setup_flow_control (
ctx->self, ctx->self,
(GAsyncReadyCallback)modem_flow_control_ready, (GAsyncReadyCallback)setup_flow_control_ready,
ctx); ctx);
return; return;
} }

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

@@ -197,10 +197,10 @@ struct _MMIfaceModem {
GError **error); GError **error);
/* Asynchronous flow control setup */ /* Asynchronous flow control setup */
void (*modem_flow_control) (MMIfaceModem *self, void (*setup_flow_control) (MMIfaceModem *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean (*modem_flow_control_finish) (MMIfaceModem *self, gboolean (*setup_flow_control_finish) (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error); GError **error);