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

ports: rename 'MMAtSerialPort' to 'MMPortSerialAt'

Browse Source
This commit is contained in:
Aleksander Morgado
2014-02-13 13:40:01 +01:00
parent 0d1602bf0f
commit 6f235b9948
60 changed files with 700 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/icera/mm-broadband-bearer-icera.c
+10 -10
View File
@@ -64,7 +64,7 @@ struct _MMBroadbandBearerIceraPrivate {
typedef struct {
MMBroadbandBearerIcera *self;
MMBaseModem *modem;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
guint cid;
GSimpleAsyncResult *result;
} GetIpConfig3gppContext;
@@ -72,7 +72,7 @@ typedef struct {
static GetIpConfig3gppContext *
get_ip_config_3gpp_context_new (MMBroadbandBearerIcera *self,
MMBaseModem *modem,
MMAtSerialPort *primary,
MMPortSerialAt *primary,
guint cid,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -265,8 +265,8 @@ ip_config_ready (MMBaseModem *modem,
static void
get_ip_config_3gpp (MMBroadbandBearer *self,
MMBroadbandModem *modem,
MMAtSerialPort *primary,
MMAtSerialPort *secondary,
MMPortSerialAt *primary,
MMPortSerialAt *secondary,
MMPort *data,
guint cid,
GAsyncReadyCallback callback,
@@ -439,8 +439,8 @@ disconnect_ipdpact_ready (MMBaseModem *modem,
static void
disconnect_3gpp (MMBroadbandBearer *bearer,
MMBroadbandModem *modem,
MMAtSerialPort *primary,
MMAtSerialPort *secondary,
MMPortSerialAt *primary,
MMPortSerialAt *secondary,
MMPort *data,
guint cid,
GAsyncReadyCallback callback,
@@ -486,7 +486,7 @@ disconnect_3gpp (MMBroadbandBearer *bearer,
typedef struct {
MMBroadbandBearerIcera *self;
MMBaseModem *modem;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
guint cid;
GCancellable *cancellable;
GSimpleAsyncResult *result;
@@ -960,8 +960,8 @@ authenticate (Dial3gppContext *ctx)
return;
}
quoted_user = mm_at_serial_port_quote_string (user);
quoted_password = mm_at_serial_port_quote_string (password);
quoted_user = mm_port_serial_at_quote_string (user);
quoted_password = mm_port_serial_at_quote_string (password);
command = g_strdup_printf ("%%IPDPCFG=%d,0,%u,%s,%s",
ctx->cid, icera_auth, quoted_user, quoted_password);
g_free (quoted_user);
@@ -983,7 +983,7 @@ authenticate (Dial3gppContext *ctx)
static void
dial_3gpp (MMBroadbandBearer *self,
MMBaseModem *modem,
MMAtSerialPort *primary,
MMPortSerialAt *primary,
guint cid,
GCancellable *cancellable,
GAsyncReadyCallback callback,
plugins/icera/mm-broadband-modem-icera.c
+8 -8
View File
@@ -414,7 +414,7 @@ bearer_list_report_status_foreach (MMBearer *bearer,
}
static void
ipdpact_received (MMAtSerialPort *port,
ipdpact_received (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemIcera *self)
{
@@ -497,7 +497,7 @@ nwstate_to_act (const gchar *str)
}
static void
nwstate_changed (MMAtSerialPort *port,
nwstate_changed (MMPortSerialAt *port,
GMatchInfo *info,
MMBroadbandModemIcera *self)
{
@@ -548,7 +548,7 @@ static void
set_unsolicited_events_handlers (MMBroadbandModemIcera *self,
gboolean enable)
{
MMAtSerialPort *ports[2];
MMPortSerialAt *ports[2];
guint i;
ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
@@ -560,24 +560,24 @@ set_unsolicited_events_handlers (MMBroadbandModemIcera *self,
continue;
/* Access technology related */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->nwstate_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)nwstate_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)nwstate_changed : NULL,
enable ? self : NULL,
NULL);
/* Connection status related */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->ipdpact_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)ipdpact_received : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)ipdpact_received : NULL,
enable ? self : NULL,
NULL);
/* Always to ignore */
if (!enable) {
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->pacsp_regex,
NULL,