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/mbm/mm-broadband-bearer-mbm.c
+5 -5
View File
@@ -55,7 +55,7 @@ struct _MMBroadbandBearerMbmPrivate {
typedef struct {
MMBroadbandBearerMbm *self;
MMBaseModem *modem;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
guint cid;
GCancellable *cancellable;
MMPort *data;
@@ -428,7 +428,7 @@ authenticate (Dial3gppContext *ctx)
static void
dial_3gpp (MMBroadbandBearer *self,
MMBaseModem *modem,
MMAtSerialPort *primary,
MMPortSerialAt *primary,
guint cid,
GCancellable *cancellable,
GAsyncReadyCallback callback,
@@ -471,7 +471,7 @@ dial_3gpp (MMBroadbandBearer *self,
typedef struct {
MMBroadbandBearerMbm *self;
MMBaseModem *modem;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
GSimpleAsyncResult *result;
} DisconnectContext;
@@ -515,8 +515,8 @@ disconnect_enap_ready (MMBaseModem *modem,
static void
disconnect_3gpp (MMBroadbandBearer *self,
MMBroadbandModem *modem,
MMAtSerialPort *primary,
MMAtSerialPort *secondary,
MMPortSerialAt *primary,
MMPortSerialAt *secondary,
MMPort *data,
guint cid,
GAsyncReadyCallback callback,
plugins/mbm/mm-broadband-modem-mbm.c
+17 -17
View File
@@ -808,7 +808,7 @@ bearer_list_report_status_foreach (MMBearer *bearer,
}
static void
e2nap_received (MMAtSerialPort *port,
e2nap_received (MMPortSerialAt *port,
GMatchInfo *info,
MMBroadbandModemMbm *self)
{
@@ -856,7 +856,7 @@ e2nap_received (MMAtSerialPort *port,
}
static void
erinfo_received (MMAtSerialPort *port,
erinfo_received (MMPortSerialAt *port,
GMatchInfo *info,
MMBroadbandModemMbm *self)
{
@@ -902,7 +902,7 @@ static void
set_unsolicited_events_handlers (MMBroadbandModemMbm *self,
gboolean enable)
{
MMAtSerialPort *ports[2];
MMPortSerialAt *ports[2];
guint i;
ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
@@ -914,24 +914,24 @@ set_unsolicited_events_handlers (MMBroadbandModemMbm *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->erinfo_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)erinfo_received : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)erinfo_received : NULL,
enable ? self : NULL,
NULL);
/* Connection related */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->e2nap_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)e2nap_received : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)e2nap_received : NULL,
enable ? self : NULL,
NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->e2nap_ext_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)e2nap_received : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)e2nap_received : NULL,
enable ? self : NULL,
NULL);
}
@@ -1179,7 +1179,7 @@ modem_3gpp_disable_unsolicited_events (MMIfaceModem3gpp *self,
/* Setup ports (Broadband modem class) */
static void
emrdy_received (MMAtSerialPort *port,
emrdy_received (MMPortSerialAt *port,
GMatchInfo *info,
MMBroadbandModemMbm *self)
{
@@ -1190,7 +1190,7 @@ static void
setup_ports (MMBroadbandModem *_self)
{
MMBroadbandModemMbm *self = MM_BROADBAND_MODEM_MBM (_self);
MMAtSerialPort *ports[2];
MMPortSerialAt *ports[2];
guint i;
/* Call parent's setup ports first always */
@@ -1213,30 +1213,30 @@ setup_ports (MMBroadbandModem *_self)
MM_PORT_SERIAL_FLASH_OK, FALSE,
NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->emrdy_regex,
(MMAtSerialUnsolicitedMsgFn)emrdy_received,
(MMPortSerialAtUnsolicitedMsgFn)emrdy_received,
self,
NULL);
/* Several unsolicited messages to always ignore... */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->pacsp_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->estksmenu_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->estksms_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->emwi_regex,
NULL, NULL, NULL);