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/mtk/mm-broadband-modem-mtk.c
+15 -16
View File
@@ -571,7 +571,7 @@ set_current_modes (MMIfaceModem *self,
/* Setup/Cleanup unsolicited events (3GPP interface) */
static void
mtk_80_signal_changed (MMAtSerialPort *port,
mtk_80_signal_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemMtk *self)
{
@@ -590,7 +590,7 @@ mtk_80_signal_changed (MMAtSerialPort *port,
}
static void
mtk_90_2g_signal_changed (MMAtSerialPort *port,
mtk_90_2g_signal_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemMtk *self)
{
@@ -609,7 +609,7 @@ mtk_90_2g_signal_changed (MMAtSerialPort *port,
}
static void
mtk_90_3g_signal_changed (MMAtSerialPort *port,
mtk_90_3g_signal_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemMtk *self)
{
@@ -625,7 +625,7 @@ mtk_90_3g_signal_changed (MMAtSerialPort *port,
}
static void
mtk_90_4g_signal_changed (MMAtSerialPort *port,
mtk_90_4g_signal_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemMtk *self)
{
@@ -644,7 +644,7 @@ static void
set_unsolicited_events_handlers (MMBroadbandModemMtk *self,
gboolean enable)
{
MMAtSerialPort *ports[2];
MMPortSerialAt *ports[2];
guint i;
ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
@@ -655,38 +655,38 @@ set_unsolicited_events_handlers (MMBroadbandModemMtk *self,
if(!ports[i])
continue;
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->ecsqg_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)mtk_80_signal_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)mtk_80_signal_changed : 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->ecsqu_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)mtk_80_signal_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)mtk_80_signal_changed : 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->ecsqeg_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)mtk_90_2g_signal_changed:NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)mtk_90_2g_signal_changed: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->ecsqeu_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)mtk_90_3g_signal_changed:NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)mtk_90_3g_signal_changed: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->ecsqel_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)mtk_90_4g_signal_changed:NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)mtk_90_4g_signal_changed:NULL,
enable ? self : NULL,
NULL);
}
@@ -1033,4 +1033,3 @@ mm_broadband_modem_mtk_class_init (MMBroadbandModemMtkClass *klass)
object_class->finalize = finalize;
broadband_modem_class->setup_ports = setup_ports;
}
plugins/mtk/mm-plugin-mtk.c
+3 -3
View File
@@ -57,7 +57,7 @@ grab_port (MMPlugin *self,
GError **error)
{
GUdevDevice *port;
MMAtPortFlag pflags = MM_AT_PORT_FLAG_NONE;
MMPortSerialAtFlag pflags = MM_PORT_SERIAL_AT_FLAG_NONE;
port = mm_port_probe_peek_port (probe);
@@ -67,12 +67,12 @@ grab_port (MMPlugin *self,
mm_dbg ("MTK: AT port '%s/%s' flagged as secondary",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
pflags = MM_AT_PORT_FLAG_SECONDARY;
pflags = MM_PORT_SERIAL_AT_FLAG_SECONDARY;
} else if (g_udev_device_get_property_as_boolean (port, "ID_MM_MTK_MODEM_PORT")) {
mm_dbg ("MTK: Modem port '%s/%s' flagged as primary",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
pflags = MM_AT_PORT_FLAG_PRIMARY;
pflags = MM_PORT_SERIAL_AT_FLAG_PRIMARY;
}
}