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/altair/mm-broadband-bearer-altair-lte.c
+9 -9
View File
@@ -44,7 +44,7 @@ G_DEFINE_TYPE (MMBroadbandBearerAltairLte, mm_broadband_bearer_altair_lte, MM_TY
typedef struct {
MMBroadbandBearerAltairLte *self;
MMBaseModem *modem;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
MMPort *data;
GCancellable *cancellable;
GSimpleAsyncResult *result;
@@ -53,7 +53,7 @@ typedef struct {
static DetailedConnectContext *
detailed_connect_context_new (MMBroadbandBearer *self,
MMBroadbandModem *modem,
MMAtSerialPort *primary,
MMPortSerialAt *primary,
MMPort *data,
GCancellable *cancellable,
GAsyncReadyCallback callback,
@@ -168,8 +168,8 @@ connect_3gpp_apnsettings_ready (MMBaseModem *modem,
static void
connect_3gpp (MMBroadbandBearer *self,
MMBroadbandModem *modem,
MMAtSerialPort *primary,
MMAtSerialPort *secondary,
MMPortSerialAt *primary,
MMPortSerialAt *secondary,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -216,7 +216,7 @@ connect_3gpp (MMBroadbandBearer *self,
user_data);
config = mm_bearer_peek_config (MM_BEARER (self));
apn = mm_at_serial_port_quote_string (mm_bearer_properties_get_apn (config));
apn = mm_port_serial_at_quote_string (mm_bearer_properties_get_apn (config));
command = g_strdup_printf ("%%APNN=%s",apn);
g_free (apn);
mm_base_modem_at_command_full (ctx->modem,
@@ -237,7 +237,7 @@ connect_3gpp (MMBroadbandBearer *self,
typedef struct {
MMBroadbandBearer *self;
MMBaseModem *modem;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
MMPort *data;
GSimpleAsyncResult *result;
} DetailedDisconnectContext;
@@ -245,7 +245,7 @@ typedef struct {
static DetailedDisconnectContext *
detailed_disconnect_context_new (MMBroadbandBearer *self,
MMBroadbandModem *modem,
MMAtSerialPort *primary,
MMPortSerialAt *primary,
MMPort *data,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -307,8 +307,8 @@ disconnect_3gpp_check_status (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/altair/mm-broadband-modem-altair-lte.c
+14 -14
View File
@@ -709,7 +709,7 @@ altair_sim_refresh_timer_expired (MMBroadbandModemAltairLte *self)
}
static void
altair_sim_refresh_changed (MMAtSerialPort *port,
altair_sim_refresh_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemAltairLte *self)
{
@@ -742,7 +742,7 @@ bearer_list_report_disconnect_status_foreach (MMBearer *bearer,
/* STATCM unsolicited event handler */
static void
altair_statcm_changed (MMAtSerialPort *port,
altair_statcm_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemAltairLte *self)
{
@@ -776,7 +776,7 @@ altair_statcm_changed (MMAtSerialPort *port,
/* Setup/Cleanup unsolicited events (3GPP interface) */
static void
altair_pco_info_changed (MMAtSerialPort *port,
altair_pco_info_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemAltairLte *self);
@@ -784,7 +784,7 @@ static void
set_3gpp_unsolicited_events_handlers (MMBroadbandModemAltairLte *self,
gboolean enable)
{
MMAtSerialPort *ports[2];
MMPortSerialAt *ports[2];
guint i;
ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
@@ -796,26 +796,26 @@ set_3gpp_unsolicited_events_handlers (MMBroadbandModemAltairLte *self,
continue;
/* SIM refresh handler */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->sim_refresh_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)altair_sim_refresh_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)altair_sim_refresh_changed : NULL,
enable ? self : NULL,
NULL);
/* bearer mode related */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->statcm_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)altair_statcm_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)altair_statcm_changed : NULL,
enable ? self : NULL,
NULL);
/* PCO info handler */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->pcoinfo_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)altair_pco_info_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)altair_pco_info_changed : NULL,
enable ? self : NULL,
NULL);
}
@@ -1337,7 +1337,7 @@ altair_get_subscription_state_ready (MMBroadbandModemAltairLte *self,
}
static void
altair_pco_info_changed (MMAtSerialPort *port,
altair_pco_info_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemAltairLte *self)
{
@@ -1368,7 +1368,7 @@ static const gchar *primary_init_sequence[] = {
static void
setup_ports (MMBroadbandModem *self)
{
MMAtSerialPort *primary;
MMPortSerialAt *primary;
/* Call parent's setup ports first always */
MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_altair_lte_parent_class)->setup_ports (self);
@@ -1379,8 +1379,8 @@ setup_ports (MMBroadbandModem *self)
g_object_set (primary,
MM_PORT_SERIAL_SEND_DELAY, (guint64) 0,
MM_AT_SERIAL_PORT_SEND_LF, TRUE,
MM_AT_SERIAL_PORT_INIT_SEQUENCE, primary_init_sequence,
MM_PORT_SERIAL_AT_SEND_LF, TRUE,
MM_PORT_SERIAL_AT_INIT_SEQUENCE, primary_init_sequence,
NULL);
}
plugins/anydata/mm-broadband-modem-anydata.c
+8 -8
View File
@@ -50,7 +50,7 @@ typedef struct {
typedef struct {
MMBroadbandModem *self;
GSimpleAsyncResult *result;
MMAtSerialPort *port;
MMPortSerialAt *port;
MMModemCdmaRegistrationState cdma1x_state;
MMModemCdmaRegistrationState evdo_state;
GError *error;
@@ -284,7 +284,7 @@ reset (MMIfaceModem *self,
static void
setup_ports (MMBroadbandModem *self)
{
MMAtSerialPort *ports[2];
MMPortSerialAt *ports[2];
GRegex *regex;
guint i;
@@ -303,17 +303,17 @@ setup_ports (MMBroadbandModem *self)
/* Data call has connected */
regex = g_regex_new ("\\r\\n\\*ACTIVE:(.*)\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (MM_AT_SERIAL_PORT (ports[i]), regex, NULL, NULL, NULL);
mm_port_serial_at_add_unsolicited_msg_handler (MM_PORT_SERIAL_AT (ports[i]), regex, NULL, NULL, NULL);
g_regex_unref (regex);
/* Data call disconnected */
regex = g_regex_new ("\\r\\n\\*INACTIVE:(.*)\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (MM_AT_SERIAL_PORT (ports[i]), regex, NULL, NULL, NULL);
mm_port_serial_at_add_unsolicited_msg_handler (MM_PORT_SERIAL_AT (ports[i]), regex, NULL, NULL, NULL);
g_regex_unref (regex);
/* Modem is now dormant */
regex = g_regex_new ("\\r\\n\\*DORMANT:(.*)\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (MM_AT_SERIAL_PORT (ports[i]), regex, NULL, NULL, NULL);
mm_port_serial_at_add_unsolicited_msg_handler (MM_PORT_SERIAL_AT (ports[i]), regex, NULL, NULL, NULL);
g_regex_unref (regex);
/* Abnormal state notifications
@@ -324,17 +324,17 @@ setup_ports (MMBroadbandModem *self)
/* Network acquisition fail */
regex = g_regex_new ("\\r\\n\\*OFFLINE:(.*)\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (MM_AT_SERIAL_PORT (ports[i]), regex, NULL, NULL, NULL);
mm_port_serial_at_add_unsolicited_msg_handler (MM_PORT_SERIAL_AT (ports[i]), regex, NULL, NULL, NULL);
g_regex_unref (regex);
/* Registration fail */
regex = g_regex_new ("\\r\\n\\*REGREQ:(.*)\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (MM_AT_SERIAL_PORT (ports[i]), regex, NULL, NULL, NULL);
mm_port_serial_at_add_unsolicited_msg_handler (MM_PORT_SERIAL_AT (ports[i]), regex, NULL, NULL, NULL);
g_regex_unref (regex);
/* Authentication fail */
regex = g_regex_new ("\\r\\n\\*AUTHREQ:(.*)\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (MM_AT_SERIAL_PORT (ports[i]), regex, NULL, NULL, NULL);
mm_port_serial_at_add_unsolicited_msg_handler (MM_PORT_SERIAL_AT (ports[i]), regex, NULL, NULL, NULL);
g_regex_unref (regex);
}
}
plugins/cinterion/mm-plugin-cinterion.c
+8 -8
View File
@@ -48,7 +48,7 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
typedef struct {
MMPortProbe *probe;
MMAtSerialPort *port;
MMPortSerialAt *port;
GCancellable *cancellable;
GSimpleAsyncResult *result;
} CinterionCustomInitContext;
@@ -75,7 +75,7 @@ cinterion_custom_init_finish (MMPortProbe *probe,
}
static void
sqport_ready (MMAtSerialPort *port,
sqport_ready (MMPortSerialAt *port,
GString *response,
GError *error,
CinterionCustomInitContext *ctx)
@@ -101,7 +101,7 @@ sqport_ready (MMAtSerialPort *port,
static void
cinterion_custom_init (MMPortProbe *probe,
MMAtSerialPort *port,
MMPortSerialAt *port,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -117,13 +117,13 @@ cinterion_custom_init (MMPortProbe *probe,
ctx->port = g_object_ref (port);
ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
mm_at_serial_port_queue_command (
mm_port_serial_at_queue_command (
ctx->port,
"AT^SQPORT?",
3,
FALSE, /* raw */
ctx->cancellable,
(MMAtSerialResponseFn)sqport_ready,
(MMPortSerialAtResponseFn)sqport_ready,
ctx);
}
@@ -162,15 +162,15 @@ grab_port (MMPlugin *self,
MMPortProbe *probe,
GError **error)
{
MMAtPortFlag pflags = MM_AT_PORT_FLAG_NONE;
MMPortSerialAtFlag pflags = MM_PORT_SERIAL_AT_FLAG_NONE;
MMPortType ptype;
ptype = mm_port_probe_get_port_type (probe);
if (g_object_get_data (G_OBJECT (probe), TAG_CINTERION_APP_PORT))
pflags = MM_AT_PORT_FLAG_PRIMARY;
pflags = MM_PORT_SERIAL_AT_FLAG_PRIMARY;
else if (g_object_get_data (G_OBJECT (probe), TAG_CINTERION_MODEM_PORT))
pflags = MM_AT_PORT_FLAG_PPP;
pflags = MM_PORT_SERIAL_AT_FLAG_PPP;
return mm_base_modem_grab_port (modem,
mm_port_probe_get_port_subsys (probe),
plugins/huawei/mm-broadband-bearer-huawei.c
+6 -6
View File
@@ -54,7 +54,7 @@ typedef enum {
typedef struct {
MMBroadbandBearerHuawei *self;
MMBaseModem *modem;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
MMPort *data;
GCancellable *cancellable;
GSimpleAsyncResult *result;
@@ -369,8 +369,8 @@ connect_3gpp_context_step (Connect3gppContext *ctx)
static void
connect_3gpp (MMBroadbandBearer *self,
MMBroadbandModem *modem,
MMAtSerialPort *primary,
MMAtSerialPort *secondary,
MMPortSerialAt *primary,
MMPortSerialAt *secondary,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -425,7 +425,7 @@ typedef enum {
typedef struct {
MMBroadbandBearerHuawei *self;
MMBaseModem *modem;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
GSimpleAsyncResult *result;
Disconnect3gppContextStep step;
guint check_count;
@@ -626,8 +626,8 @@ disconnect_3gpp_context_step (Disconnect3gppContext *ctx)
static void
disconnect_3gpp (MMBroadbandBearer *self,
MMBroadbandModem *modem,
MMAtSerialPort *primary,
MMAtSerialPort *secondary,
MMPortSerialAt *primary,
MMPortSerialAt *secondary,
MMPort *data,
guint cid,
GAsyncReadyCallback callback,
plugins/huawei/mm-broadband-modem-huawei.c
+38 -38
View File
@@ -1485,7 +1485,7 @@ set_current_modes (MMIfaceModem *_self,
/* Setup/Cleanup unsolicited events (3GPP interface) */
static void
huawei_signal_changed (MMAtSerialPort *port,
huawei_signal_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemHuawei *self)
{
@@ -1507,7 +1507,7 @@ huawei_signal_changed (MMAtSerialPort *port,
}
static void
huawei_mode_changed (MMAtSerialPort *port,
huawei_mode_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemHuawei *self)
{
@@ -1599,7 +1599,7 @@ huawei_mode_changed (MMAtSerialPort *port,
}
static void
huawei_status_changed (MMAtSerialPort *port,
huawei_status_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemHuawei *self)
{
@@ -1639,7 +1639,7 @@ bearer_report_connection_status (MMBearer *bearer,
}
static void
huawei_ndisstat_changed (MMAtSerialPort *port,
huawei_ndisstat_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemHuawei *self)
{
@@ -1687,7 +1687,7 @@ static void
set_3gpp_unsolicited_events_handlers (MMBroadbandModemHuawei *self,
gboolean enable)
{
MMAtSerialPort *ports[2];
MMPortSerialAt *ports[2];
guint i;
ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
@@ -1699,33 +1699,33 @@ set_3gpp_unsolicited_events_handlers (MMBroadbandModemHuawei *self,
continue;
/* Signal quality related */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->rssi_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)huawei_signal_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)huawei_signal_changed : NULL,
enable ? self : NULL,
NULL);
/* Access technology related */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->mode_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)huawei_mode_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)huawei_mode_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->dsflowrpt_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)huawei_status_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)huawei_status_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->ndisstat_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)huawei_ndisstat_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)huawei_ndisstat_changed : NULL,
enable ? self : NULL,
NULL);
}
@@ -2211,7 +2211,7 @@ decode (MMIfaceModem3gppUssd *self,
/*****************************************************************************/
static void
huawei_1x_signal_changed (MMAtSerialPort *port,
huawei_1x_signal_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemHuawei *self)
{
@@ -2226,7 +2226,7 @@ huawei_1x_signal_changed (MMAtSerialPort *port,
}
static void
huawei_evdo_signal_changed (MMAtSerialPort *port,
huawei_evdo_signal_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemHuawei *self)
{
@@ -2370,7 +2370,7 @@ static void
set_cdma_unsolicited_events_handlers (MMBroadbandModemHuawei *self,
gboolean enable)
{
MMAtSerialPort *ports[2];
MMPortSerialAt *ports[2];
guint i;
ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
@@ -2382,23 +2382,23 @@ set_cdma_unsolicited_events_handlers (MMBroadbandModemHuawei *self,
continue;
/* Signal quality related */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->rssilvl_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)huawei_1x_signal_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)huawei_1x_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->hrssilvl_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)huawei_evdo_signal_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)huawei_evdo_signal_changed : NULL,
enable ? self : NULL,
NULL);
/* Access technology related */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->mode_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)huawei_mode_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)huawei_mode_changed : NULL,
enable ? self : NULL,
NULL);
}
@@ -2817,7 +2817,7 @@ static void
enable_disable_unsolicited_rfswitch_event_handler (MMBroadbandModemHuawei *self,
gboolean enable)
{
MMAtSerialPort *ports[2];
MMPortSerialAt *ports[2];
guint i;
mm_dbg ("%s ^RFSWITCH unsolicited event handler",
@@ -2828,7 +2828,7 @@ enable_disable_unsolicited_rfswitch_event_handler (MMBroadbandModemHuawei *self,
for (i = 0; i < 2; i++)
if (ports[i])
mm_at_serial_port_enable_unsolicited_msg_handler (
mm_port_serial_at_enable_unsolicited_msg_handler (
ports[i],
self->priv->rfswitch_regex,
enable);
@@ -3121,7 +3121,7 @@ modem_time_check_support (MMIfaceModemTime *self,
static void
set_ignored_unsolicited_events_handlers (MMBroadbandModemHuawei *self)
{
MMAtSerialPort *ports[2];
MMPortSerialAt *ports[2];
guint i;
ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
@@ -3132,55 +3132,55 @@ set_ignored_unsolicited_events_handlers (MMBroadbandModemHuawei *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->boot_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->connect_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->csnr_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->cusatp_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->cusatend_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->dsdormant_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->simst_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->srvst_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->stin_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->hcsq_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->pdpdeact_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->ndisend_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->rfswitch_regex,
NULL, NULL, NULL);
plugins/huawei/mm-plugin-huawei.c
+19 -19
View File
@@ -74,7 +74,7 @@ first_interface_context_free (FirstInterfaceContext *ctx)
typedef struct {
MMPortProbe *probe;
MMAtSerialPort *port;
MMPortSerialAt *port;
GCancellable *cancellable;
GSimpleAsyncResult *result;
gboolean curc_done;
@@ -127,7 +127,7 @@ cache_port_mode (MMDevice *device,
}
static void
getportmode_ready (MMAtSerialPort *port,
getportmode_ready (MMPortSerialAt *port,
GString *response,
GError *error,
HuaweiCustomInitContext *ctx)
@@ -170,7 +170,7 @@ getportmode_ready (MMAtSerialPort *port,
}
static void
curc_ready (MMAtSerialPort *port,
curc_ready (MMPortSerialAt *port,
GString *response,
GError *error,
HuaweiCustomInitContext *ctx)
@@ -263,13 +263,13 @@ huawei_custom_init_step (HuaweiCustomInitContext *ctx)
ctx->curc_retries--;
/* Turn off unsolicited messages on secondary ports until needed */
mm_at_serial_port_queue_command (
mm_port_serial_at_queue_command (
ctx->port,
"AT^CURC=0",
3,
FALSE, /* raw */
ctx->cancellable,
(MMAtSerialResponseFn)curc_ready,
(MMPortSerialAtResponseFn)curc_ready,
ctx);
return;
}
@@ -283,13 +283,13 @@ huawei_custom_init_step (HuaweiCustomInitContext *ctx)
}
ctx->getportmode_retries--;
mm_at_serial_port_queue_command (
mm_port_serial_at_queue_command (
ctx->port,
"AT^GETPORTMODE",
3,
FALSE, /* raw */
ctx->cancellable,
(MMAtSerialResponseFn)getportmode_ready,
(MMPortSerialAtResponseFn)getportmode_ready,
ctx);
return;
}
@@ -315,7 +315,7 @@ first_interface_missing_timeout_cb (MMDevice *device)
static void
huawei_custom_init (MMPortProbe *probe,
MMAtSerialPort *port,
MMPortSerialAt *port,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -411,31 +411,31 @@ propagate_port_mode_results (GList *probes)
/* Now we propagate the tags to the specific port probes */
for (l = probes; l; l = g_list_next (l)) {
MMAtPortFlag at_port_flags = MM_AT_PORT_FLAG_NONE;
MMPortSerialAtFlag at_port_flags = MM_PORT_SERIAL_AT_FLAG_NONE;
gint usbif;
usbif = g_udev_device_get_property_as_int (mm_port_probe_peek_port (MM_PORT_PROBE (l->data)), "ID_USB_INTERFACE_NUM");
if (GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (device), TAG_GETPORTMODE_SUPPORTED))) {
if (usbif + 1 == GPOINTER_TO_INT (g_object_get_data (G_OBJECT (device), TAG_HUAWEI_PCUI_PORT)))
at_port_flags = MM_AT_PORT_FLAG_PRIMARY;
at_port_flags = MM_PORT_SERIAL_AT_FLAG_PRIMARY;
else if (usbif + 1 == GPOINTER_TO_INT (g_object_get_data (G_OBJECT (device), TAG_HUAWEI_MODEM_PORT)))
at_port_flags = MM_AT_PORT_FLAG_PPP;
at_port_flags = MM_PORT_SERIAL_AT_FLAG_PPP;
else if (!g_object_get_data (G_OBJECT (device), TAG_HUAWEI_MODEM_PORT) &&
usbif + 1 == GPOINTER_TO_INT (g_object_get_data (G_OBJECT (device), TAG_HUAWEI_NDIS_PORT)))
/* If NDIS reported only instead of MDM, use it */
at_port_flags = MM_AT_PORT_FLAG_PPP;
at_port_flags = MM_PORT_SERIAL_AT_FLAG_PPP;
} else if (usbif == 0 &&
mm_port_probe_is_at (MM_PORT_PROBE (l->data))) {
/* If GETPORTMODE is not supported, we assume usbif 0 is the modem port */
at_port_flags = MM_AT_PORT_FLAG_PPP;
at_port_flags = MM_PORT_SERIAL_AT_FLAG_PPP;
/* /\* TODO. */
/* * For CDMA modems we assume usbif0 is both primary and PPP, since */
/* * they don't have problems with talking on secondary ports. */
/* *\/ */
/* if (caps & CAP_CDMA) */
/* pflags |= MM_AT_PORT_FLAG_PRIMARY; */
/* pflags |= MM_PORT_SERIAL_AT_FLAG_PRIMARY; */
}
g_object_set_data (G_OBJECT (l->data), TAG_AT_PORT_FLAGS, GUINT_TO_POINTER (at_port_flags));
@@ -488,7 +488,7 @@ grab_port (MMPlugin *self,
MMPortProbe *probe,
GError **error)
{
MMAtPortFlag pflags;
MMPortSerialAtFlag pflags;
GUdevDevice *port;
port = mm_port_probe_peek_port (probe);
@@ -496,17 +496,17 @@ grab_port (MMPlugin *self,
mm_dbg ("(%s/%s)' Port 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;
} else if (g_udev_device_get_property_as_boolean (port, "ID_MM_HUAWEI_MODEM_PORT")) {
mm_dbg ("(%s/%s) Port flagged as PPP",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
pflags = MM_AT_PORT_FLAG_PPP;
pflags = MM_PORT_SERIAL_AT_FLAG_PPP;
} else {
gchar *str;
pflags = (MMAtPortFlag) GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (probe), TAG_AT_PORT_FLAGS));
str = mm_at_port_flag_build_string_from_mask (pflags);
pflags = (MMPortSerialAtFlag) GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (probe), TAG_AT_PORT_FLAGS));
str = mm_port_serial_at_flag_build_string_from_mask (pflags);
mm_dbg ("(%s/%s) Port will have AT flags '%s'",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe),
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,
plugins/iridium/mm-bearer-iridium.c
+1 -1
View File
@@ -40,7 +40,7 @@ typedef struct {
MMBearerIridium *self;
GSimpleAsyncResult *result;
GCancellable *cancellable;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
GError *saved_error;
} ConnectContext;
plugins/iridium/mm-broadband-modem-iridium.c
+2 -2
View File
@@ -331,7 +331,7 @@ static const gchar *primary_init_sequence[] = {
static void
setup_ports (MMBroadbandModem *self)
{
MMAtSerialPort *primary;
MMPortSerialAt *primary;
/* Call parent's setup ports first always */
MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_iridium_parent_class)->setup_ports (self);
@@ -344,7 +344,7 @@ setup_ports (MMBroadbandModem *self)
g_object_set (G_OBJECT (primary),
MM_PORT_SERIAL_BAUD, 9600,
MM_AT_SERIAL_PORT_INIT_SEQUENCE, primary_init_sequence,
MM_PORT_SERIAL_AT_INIT_SEQUENCE, primary_init_sequence,
NULL);
}
plugins/longcheer/mm-plugin-longcheer.c
+8 -8
View File
@@ -36,7 +36,7 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
typedef struct {
MMPortProbe *probe;
MMAtSerialPort *port;
MMPortSerialAt *port;
GCancellable *cancellable;
GSimpleAsyncResult *result;
guint retries;
@@ -66,7 +66,7 @@ longcheer_custom_init_finish (MMPortProbe *probe,
static void longcheer_custom_init_step (LongcheerCustomInitContext *ctx);
static void
gmr_ready (MMAtSerialPort *port,
gmr_ready (MMPortSerialAt *port,
GString *response,
GError *error,
LongcheerCustomInitContext *ctx)
@@ -124,19 +124,19 @@ longcheer_custom_init_step (LongcheerCustomInitContext *ctx)
}
ctx->retries--;
mm_at_serial_port_queue_command (
mm_port_serial_at_queue_command (
ctx->port,
"AT+GMR",
3,
FALSE, /* raw */
ctx->cancellable,
(MMAtSerialResponseFn)gmr_ready,
(MMPortSerialAtResponseFn)gmr_ready,
ctx);
}
static void
longcheer_custom_init (MMPortProbe *probe,
MMAtSerialPort *port,
MMPortSerialAt *port,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -201,7 +201,7 @@ grab_port (MMPlugin *self,
{
GUdevDevice *port;
MMPortType ptype;
MMAtPortFlag pflags = MM_AT_PORT_FLAG_NONE;
MMPortSerialAtFlag pflags = MM_PORT_SERIAL_AT_FLAG_NONE;
port = mm_port_probe_peek_port (probe);
ptype = mm_port_probe_get_port_type (probe);
@@ -214,12 +214,12 @@ grab_port (MMPlugin *self,
mm_dbg ("longcheer: AT 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;
} else if (g_udev_device_get_property_as_boolean (port, "ID_MM_LONGCHEER_PORT_TYPE_AUX")) {
mm_dbg ("longcheer: 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 the port was tagged by the udev rules but isn't a primary or secondary,
* then ignore it to guard against race conditions if a device just happens
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);
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;
}
}
plugins/nokia/mm-broadband-modem-nokia.c
+2 -2
View File
@@ -300,7 +300,7 @@ static const gchar *primary_init_sequence[] = {
static void
setup_ports (MMBroadbandModem *self)
{
MMAtSerialPort *primary;
MMPortSerialAt *primary;
/* Call parent's setup ports first always */
MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_nokia_parent_class)->setup_ports (self);
@@ -308,7 +308,7 @@ setup_ports (MMBroadbandModem *self)
primary = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
g_object_set (primary,
MM_AT_SERIAL_PORT_INIT_SEQUENCE, primary_init_sequence,
MM_PORT_SERIAL_AT_INIT_SEQUENCE, primary_init_sequence,
NULL);
}
plugins/nokia/mm-plugin-nokia-icera.c
+3 -3
View File
@@ -64,7 +64,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);
@@ -74,12 +74,12 @@ grab_port (MMPlugin *self,
mm_dbg ("Nokia: AT 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;
} else if (g_udev_device_get_property_as_boolean (port, "ID_MM_NOKIA_PORT_TYPE_AUX")) {
mm_dbg ("Nokia: 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;
}
}
plugins/novatel/mm-broadband-bearer-novatel-lte.c
+10 -10
View File
@@ -64,7 +64,7 @@ normalize_qmistatus (const gchar *status)
typedef struct {
MMBroadbandBearerNovatelLte *self;
MMBaseModem *modem;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
MMPort *data;
GCancellable *cancellable;
GSimpleAsyncResult *result;
@@ -283,9 +283,9 @@ connect_3gpp_authenticate (DetailedConnectContext *ctx)
gchar *command, *apn, *user, *password;
config = mm_bearer_peek_config (MM_BEARER (ctx->self));
apn = mm_at_serial_port_quote_string (mm_bearer_properties_get_apn (config));
user = mm_at_serial_port_quote_string (mm_bearer_properties_get_user (config));
password = mm_at_serial_port_quote_string (mm_bearer_properties_get_password (config));
apn = mm_port_serial_at_quote_string (mm_bearer_properties_get_apn (config));
user = mm_port_serial_at_quote_string (mm_bearer_properties_get_user (config));
password = mm_port_serial_at_quote_string (mm_bearer_properties_get_password (config));
command = g_strdup_printf ("$NWQMICONNECT=,,,,,,%s,,,%s,%s",
apn, user, password);
g_free (apn);
@@ -307,8 +307,8 @@ connect_3gpp_authenticate (DetailedConnectContext *ctx)
static void
connect_3gpp (MMBroadbandBearer *self,
MMBroadbandModem *modem,
MMAtSerialPort *primary,
MMAtSerialPort *secondary,
MMPortSerialAt *primary,
MMPortSerialAt *secondary,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -347,7 +347,7 @@ connect_3gpp (MMBroadbandBearer *self,
typedef struct {
MMBroadbandBearer *self;
MMBaseModem *modem;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
MMPort *data;
GSimpleAsyncResult *result;
gint retries;
@@ -356,7 +356,7 @@ typedef struct {
static DetailedDisconnectContext *
detailed_disconnect_context_new (MMBroadbandBearer *self,
MMBroadbandModem *modem,
MMAtSerialPort *primary,
MMPortSerialAt *primary,
MMPort *data,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -486,8 +486,8 @@ disconnect_3gpp_check_status (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/novatel/mm-plugin-novatel.c
+5 -5
View File
@@ -59,7 +59,7 @@ static const MMPortProbeAtCommand custom_at_probe[] = {
typedef struct {
MMPortProbe *probe;
MMAtSerialPort *port;
MMPortSerialAt *port;
GCancellable *cancellable;
GSimpleAsyncResult *result;
guint nwdmat_retries;
@@ -90,7 +90,7 @@ novatel_custom_init_finish (MMPortProbe *probe,
static void custom_init_step (CustomInitContext *ctx);
static void
nwdmat_ready (MMAtSerialPort *port,
nwdmat_ready (MMPortSerialAt *port,
GString *response,
GError *error,
CustomInitContext *ctx)
@@ -147,12 +147,12 @@ custom_init_step (CustomInitContext *ctx)
if (ctx->nwdmat_retries > 0) {
ctx->nwdmat_retries--;
mm_at_serial_port_queue_command (ctx->port,
mm_port_serial_at_queue_command (ctx->port,
"$NWDMAT=1",
3,
FALSE, /* raw */
ctx->cancellable,
(MMAtSerialResponseFn)nwdmat_ready,
(MMPortSerialAtResponseFn)nwdmat_ready,
ctx);
return;
}
@@ -166,7 +166,7 @@ custom_init_step (CustomInitContext *ctx)
static void
novatel_custom_init (MMPortProbe *probe,
MMAtSerialPort *port,
MMPortSerialAt *port,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
plugins/option/mm-broadband-bearer-hso.c
+10 -10
View File
@@ -50,7 +50,7 @@ struct _MMBroadbandBearerHsoPrivate {
typedef struct {
MMBroadbandBearerHso *self;
MMBaseModem *modem;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
guint cid;
GSimpleAsyncResult *result;
} GetIpConfig3gppContext;
@@ -183,8 +183,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,
@@ -223,7 +223,7 @@ get_ip_config_3gpp (MMBroadbandBearer *self,
typedef struct {
MMBroadbandBearerHso *self;
MMBaseModem *modem;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
guint cid;
GCancellable *cancellable;
GSimpleAsyncResult *result;
@@ -632,8 +632,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 ("%s=%d,%u,%s,%s",
auth_commands[ctx->auth_idx],
ctx->cid,
@@ -659,7 +659,7 @@ authenticate (Dial3gppContext *ctx)
static void
dial_3gpp (MMBroadbandBearer *self,
MMBaseModem *modem,
MMAtSerialPort *primary,
MMPortSerialAt *primary,
guint cid,
GCancellable *cancellable,
GAsyncReadyCallback callback,
@@ -705,7 +705,7 @@ dial_3gpp (MMBroadbandBearer *self,
typedef struct {
MMBroadbandBearerHso *self;
MMBaseModem *modem;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
GSimpleAsyncResult *result;
} DisconnectContext;
@@ -749,8 +749,8 @@ disconnect_owancall_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/option/mm-broadband-modem-hso.c
+7 -7
View File
@@ -230,7 +230,7 @@ bearer_list_report_status_foreach (MMBearer *bearer,
}
static void
hso_connection_status_changed (MMAtSerialPort *port,
hso_connection_status_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemHso *self)
{
@@ -299,10 +299,10 @@ parent_setup_unsolicited_events_ready (MMIfaceModem3gpp *self,
g_simple_async_result_take_error (simple, error);
else {
/* Our own setup now */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
mm_base_modem_peek_port_primary (MM_BASE_MODEM (self)),
MM_BROADBAND_MODEM_HSO (self)->priv->_owancall_regex,
(MMAtSerialUnsolicitedMsgFn)hso_connection_status_changed,
(MMPortSerialAtUnsolicitedMsgFn)hso_connection_status_changed,
self,
NULL);
@@ -360,7 +360,7 @@ modem_3gpp_cleanup_unsolicited_events (MMIfaceModem3gpp *self,
modem_3gpp_cleanup_unsolicited_events);
/* Our own cleanup first */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
mm_base_modem_peek_port_primary (MM_BASE_MODEM (self)),
MM_BROADBAND_MODEM_HSO (self)->priv->_owancall_regex,
NULL, NULL, NULL);
@@ -685,14 +685,14 @@ trace_received (MMPortSerialGps *port,
static void
setup_ports (MMBroadbandModem *self)
{
MMAtSerialPort *gps_control_port;
MMPortSerialAt *gps_control_port;
MMPortSerialGps *gps_data_port;
/* Call parent's setup ports first always */
MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_hso_parent_class)->setup_ports (self);
/* _OWANCALL unsolicited messages are only expected in the primary port. */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
mm_base_modem_peek_port_primary (MM_BASE_MODEM (self)),
MM_BROADBAND_MODEM_HSO (self)->priv->_owancall_regex,
NULL, NULL, NULL);
@@ -701,7 +701,7 @@ setup_ports (MMBroadbandModem *self)
MM_PORT_SERIAL_SEND_DELAY, (guint64) 0,
/* built-in echo removal conflicts with unsolicited _OWANCALL
* messages, which are not <CR><LF> prefixed. */
MM_AT_SERIAL_PORT_REMOVE_ECHO, FALSE,
MM_PORT_SERIAL_AT_REMOVE_ECHO, FALSE,
NULL);
gps_control_port = mm_base_modem_peek_port_gps_control (MM_BASE_MODEM (self));
plugins/option/mm-broadband-modem-option.c
+14 -14
View File
@@ -746,7 +746,7 @@ modem_3gpp_load_imei (MMIfaceModem3gpp *self,
/* Setup/Cleanup unsolicited events (3GPP interface) */
static void
option_ossys_tech_changed (MMAtSerialPort *port,
option_ossys_tech_changed (MMPortSerialAt *port,
GMatchInfo *info,
MMBroadbandModemOption *self)
{
@@ -783,7 +783,7 @@ option_ossys_tech_changed (MMAtSerialPort *port,
}
static void
option_2g_tech_changed (MMAtSerialPort *port,
option_2g_tech_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemOption *self)
{
@@ -799,7 +799,7 @@ option_2g_tech_changed (MMAtSerialPort *port,
}
static void
option_3g_tech_changed (MMAtSerialPort *port,
option_3g_tech_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemOption *self)
{
@@ -815,7 +815,7 @@ option_3g_tech_changed (MMAtSerialPort *port,
}
static void
option_signal_changed (MMAtSerialPort *port,
option_signal_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemOption *self)
{
@@ -843,7 +843,7 @@ static void
set_unsolicited_events_handlers (MMBroadbandModemOption *self,
gboolean enable)
{
MMAtSerialPort *ports[2];
MMPortSerialAt *ports[2];
guint i;
ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
@@ -855,36 +855,36 @@ set_unsolicited_events_handlers (MMBroadbandModemOption *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->_ossysi_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)option_ossys_tech_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)option_ossys_tech_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->_octi_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)option_2g_tech_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)option_2g_tech_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->_ouwcti_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)option_3g_tech_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)option_3g_tech_changed : NULL,
enable ? self : NULL,
NULL);
/* Signal quality related */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->_osigq_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)option_signal_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)option_signal_changed : NULL,
enable ? self : NULL,
NULL);
/* Other unsolicited events to always ignore */
if (!enable)
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->ignore_regex,
NULL, NULL, NULL);
plugins/option/mm-plugin-hso.c
+6 -6
View File
@@ -51,7 +51,7 @@ hso_custom_init_finish (MMPortProbe *probe,
static void
hso_custom_init (MMPortProbe *probe,
MMAtSerialPort *port,
MMPortSerialAt *port,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -135,7 +135,7 @@ grab_port (MMPlugin *self,
GError **error)
{
const gchar *name, *subsys;
MMAtPortFlag pflags = MM_AT_PORT_FLAG_NONE;
MMPortSerialAtFlag pflags = MM_PORT_SERIAL_AT_FLAG_NONE;
MMPortType port_type;
subsys = mm_port_probe_get_port_subsys (probe);
@@ -145,13 +145,13 @@ grab_port (MMPlugin *self,
/* Detect AT port types */
if (g_str_equal (subsys, "tty")) {
if (g_object_get_data (G_OBJECT (probe), TAG_HSO_AT_CONTROL))
pflags = MM_AT_PORT_FLAG_PRIMARY;
pflags = MM_PORT_SERIAL_AT_FLAG_PRIMARY;
else if (g_object_get_data (G_OBJECT (probe), TAG_HSO_AT_APP))
pflags = MM_AT_PORT_FLAG_SECONDARY;
pflags = MM_PORT_SERIAL_AT_FLAG_SECONDARY;
else if (g_object_get_data (G_OBJECT (probe), TAG_HSO_AT_GPS_CONTROL))
pflags = MM_AT_PORT_FLAG_GPS_CONTROL;
pflags = MM_PORT_SERIAL_AT_FLAG_GPS_CONTROL;
else if (g_object_get_data (G_OBJECT (probe), TAG_HSO_AT_MODEM))
pflags = MM_AT_PORT_FLAG_PPP;
pflags = MM_PORT_SERIAL_AT_FLAG_PPP;
else if (g_object_get_data (G_OBJECT (probe), TAG_HSO_GPS)) {
/* Not an AT port, but the port to grab GPS traces */
g_assert (port_type == MM_PORT_TYPE_UNKNOWN);
plugins/option/mm-plugin-option.c
+2 -2
View File
@@ -54,7 +54,7 @@ grab_port (MMPlugin *self,
MMPortProbe *probe,
GError **error)
{
MMAtPortFlag pflags = MM_AT_PORT_FLAG_NONE;
MMPortSerialAtFlag pflags = MM_PORT_SERIAL_AT_FLAG_NONE;
GUdevDevice *port;
gint usbif;
@@ -75,7 +75,7 @@ grab_port (MMPlugin *self,
*/
usbif = g_udev_device_get_property_as_int (port, "ID_USB_INTERFACE_NUM");
if (usbif == 0)
pflags = MM_AT_PORT_FLAG_PRIMARY | MM_AT_PORT_FLAG_PPP;
pflags = MM_PORT_SERIAL_AT_FLAG_PRIMARY | MM_PORT_SERIAL_AT_FLAG_PPP;
return mm_base_modem_grab_port (modem,
mm_port_probe_get_port_subsys (probe),
plugins/pantech/mm-plugin-pantech.c
+2 -2
View File
@@ -108,14 +108,14 @@ grab_port (MMPlugin *self,
GError **error)
{
MMPortType ptype;
MMAtPortFlag pflags = MM_AT_PORT_FLAG_NONE;
MMPortSerialAtFlag pflags = MM_PORT_SERIAL_AT_FLAG_NONE;
ptype = mm_port_probe_get_port_type (probe);
/* Always prefer the ttyACM port as PRIMARY AT port */
if (ptype == MM_PORT_TYPE_AT &&
g_str_has_prefix (mm_port_probe_get_port_name (probe), "ttyACM")) {
pflags = MM_AT_PORT_FLAG_PRIMARY;
pflags = MM_PORT_SERIAL_AT_FLAG_PRIMARY;
}
return mm_base_modem_grab_port (modem,
plugins/samsung/mm-broadband-modem-samsung.c
+1 -1
View File
@@ -38,7 +38,7 @@ G_DEFINE_TYPE (MMBroadbandModemSamsung, mm_broadband_modem_samsung, MM_TYPE_BROA
static void
setup_ports (MMBroadbandModem *self)
{
MMAtSerialPort *ports[2];
MMPortSerialAt *ports[2];
guint i;
/* Call parent's setup ports first always */
plugins/sierra/mm-broadband-bearer-sierra.c
+8 -8
View File
@@ -48,7 +48,7 @@ typedef enum {
typedef struct {
MMBroadbandBearerSierra *self;
MMBaseModem *modem;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
guint cid;
GCancellable *cancellable;
GSimpleAsyncResult *result;
@@ -186,7 +186,7 @@ dial_3gpp_context_step (Dial3gppContext *ctx)
return;
case DIAL_3GPP_STEP_AUTHENTICATE:
if (!MM_IS_AT_SERIAL_PORT (ctx->data)) {
if (!MM_IS_PORT_SERIAL_AT (ctx->data)) {
gchar *command;
const gchar *user;
const gchar *password;
@@ -228,8 +228,8 @@ dial_3gpp_context_step (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 ("$QCPDPP=%d,%u,%s,%s",
ctx->cid,
sierra_auth,
@@ -298,7 +298,7 @@ dial_3gpp_context_step (Dial3gppContext *ctx)
static void
dial_3gpp (MMBroadbandBearer *self,
MMBaseModem *modem,
MMAtSerialPort *primary,
MMPortSerialAt *primary,
guint cid,
GCancellable *cancellable,
GAsyncReadyCallback callback,
@@ -373,8 +373,8 @@ disconnect_scact_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,
@@ -389,7 +389,7 @@ disconnect_3gpp (MMBroadbandBearer *self,
user_data,
disconnect_3gpp);
if (!MM_IS_AT_SERIAL_PORT (data)) {
if (!MM_IS_PORT_SERIAL_AT (data)) {
gchar *command;
/* Use specific CID */
plugins/sierra/mm-broadband-modem-sierra.c
+2 -2
View File
@@ -753,7 +753,7 @@ load_current_modes (MMIfaceModem *self,
gpointer user_data)
{
GSimpleAsyncResult *result;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
result = g_simple_async_result_new (G_OBJECT (self),
callback,
@@ -830,7 +830,7 @@ set_current_modes (MMIfaceModem *self,
gpointer user_data)
{
GSimpleAsyncResult *result;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
gint idx = -1;
gchar *command;
plugins/sierra/mm-common-sierra.c
+3 -3
View File
@@ -268,7 +268,7 @@ mm_common_sierra_create_sim (MMIfaceModem *self,
void
mm_common_sierra_setup_ports (MMBroadbandModem *self)
{
MMAtSerialPort *ports[2];
MMPortSerialAt *ports[2];
guint i;
GRegex *pacsp_regex;
@@ -286,11 +286,11 @@ mm_common_sierra_setup_ports (MMBroadbandModem *self)
* parser, which doesn't always prefix responses with <CR><LF>.
*/
g_object_set (ports[i],
MM_AT_SERIAL_PORT_REMOVE_ECHO, FALSE,
MM_PORT_SERIAL_AT_REMOVE_ECHO, FALSE,
NULL);
}
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
pacsp_regex,
NULL, NULL, NULL);
plugins/sierra/mm-plugin-sierra.c
+9 -9
View File
@@ -48,7 +48,7 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
typedef struct {
MMPortProbe *probe;
MMAtSerialPort *port;
MMPortSerialAt *port;
GCancellable *cancellable;
GSimpleAsyncResult *result;
guint retries;
@@ -78,7 +78,7 @@ sierra_custom_init_finish (MMPortProbe *probe,
static void sierra_custom_init_step (SierraCustomInitContext *ctx);
static void
gcap_ready (MMAtSerialPort *port,
gcap_ready (MMPortSerialAt *port,
GString *response,
GError *error,
SierraCustomInitContext *ctx)
@@ -166,19 +166,19 @@ sierra_custom_init_step (SierraCustomInitContext *ctx)
}
ctx->retries--;
mm_at_serial_port_queue_command (
mm_port_serial_at_queue_command (
ctx->port,
"ATI",
3,
FALSE, /* raw */
ctx->cancellable,
(MMAtSerialResponseFn)gcap_ready,
(MMPortSerialAtResponseFn)gcap_ready,
ctx);
}
static void
sierra_custom_init (MMPortProbe *probe,
MMAtSerialPort *port,
MMPortSerialAt *port,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -268,7 +268,7 @@ grab_port (MMPlugin *self,
MMPortProbe *probe,
GError **error)
{
MMAtPortFlag pflags = MM_AT_PORT_FLAG_NONE;
MMPortSerialAtFlag pflags = MM_PORT_SERIAL_AT_FLAG_NONE;
MMPortType ptype;
ptype = mm_port_probe_get_port_type (probe);
@@ -276,11 +276,11 @@ grab_port (MMPlugin *self,
/* Is it a GSM secondary port? */
if (g_object_get_data (G_OBJECT (probe), TAG_SIERRA_APP_PORT)) {
if (g_object_get_data (G_OBJECT (probe), TAG_SIERRA_APP1_PPP_OK))
pflags = MM_AT_PORT_FLAG_PPP;
pflags = MM_PORT_SERIAL_AT_FLAG_PPP;
else
pflags = MM_AT_PORT_FLAG_SECONDARY;
pflags = MM_PORT_SERIAL_AT_FLAG_SECONDARY;
} else if (ptype == MM_PORT_TYPE_AT)
pflags = MM_AT_PORT_FLAG_PRIMARY;
pflags = MM_PORT_SERIAL_AT_FLAG_PRIMARY;
return mm_base_modem_grab_port (modem,
mm_port_probe_get_port_subsys (probe),
plugins/simtech/mm-broadband-modem-simtech.c
+4 -4
View File
@@ -69,7 +69,7 @@ simtech_act_to_mm_act (int nsmod)
}
static void
simtech_tech_changed (MMAtSerialPort *port,
simtech_tech_changed (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemSimtech *self)
{
@@ -88,7 +88,7 @@ static void
set_unsolicited_events_handlers (MMBroadbandModemSimtech *self,
gboolean enable)
{
MMAtSerialPort *ports[2];
MMPortSerialAt *ports[2];
guint i;
GRegex *regex;
@@ -104,10 +104,10 @@ set_unsolicited_events_handlers (MMBroadbandModemSimtech *self,
continue;
/* Access technology related */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
regex,
enable ? (MMAtSerialUnsolicitedMsgFn)simtech_tech_changed : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)simtech_tech_changed : NULL,
enable ? self : NULL,
NULL);
}
plugins/simtech/mm-plugin-simtech.c
+4 -4
View File
@@ -56,7 +56,7 @@ grab_port (MMPlugin *self,
{
GUdevDevice *port;
MMPortType ptype;
MMAtPortFlag pflags = MM_AT_PORT_FLAG_NONE;
MMPortSerialAtFlag pflags = MM_PORT_SERIAL_AT_FLAG_NONE;
/* The Simtech plugin cannot do anything with non-AT non-QCDM ports */
if (!mm_port_probe_is_at (probe) &&
@@ -78,19 +78,19 @@ grab_port (MMPlugin *self,
mm_dbg ("Simtech: AT 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;
} else if (g_udev_device_get_property_as_boolean (port, "ID_MM_SIMTECH_PORT_TYPE_AUX")) {
mm_dbg ("Simtech: 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;
}
/* If the port was tagged by the udev rules but isn't a primary or secondary,
* then ignore it to guard against race conditions if a device just happens
* to show up with more than two AT-capable ports.
*/
if (pflags == MM_AT_PORT_FLAG_NONE &&
if (pflags == MM_PORT_SERIAL_AT_FLAG_NONE &&
g_udev_device_get_property_as_boolean (port, "ID_MM_SIMTECH_TAGGED"))
ptype = MM_PORT_TYPE_IGNORED;
else
plugins/telit/mm-plugin-telit.c
+3 -3
View File
@@ -57,7 +57,7 @@ grab_port (MMPlugin *self,
{
GUdevDevice *port;
MMPortType ptype;
MMAtPortFlag pflags = MM_AT_PORT_FLAG_NONE;
MMPortSerialAtFlag pflags = MM_PORT_SERIAL_AT_FLAG_NONE;
port = mm_port_probe_peek_port (probe);
ptype = mm_port_probe_get_port_type (probe);
@@ -70,12 +70,12 @@ grab_port (MMPlugin *self,
mm_dbg ("telit: AT 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;
} else if (g_udev_device_get_property_as_boolean (port, "ID_MM_TELIT_PORT_TYPE_AUX")) {
mm_dbg ("telit: 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_TELIT_PORT_TYPE_NMEA")) {
mm_dbg ("telit: port '%s/%s' flagged as NMEA",
mm_port_probe_get_port_subsys (probe),
plugins/via/mm-broadband-modem-via.c
+14 -14
View File
@@ -297,7 +297,7 @@ get_detailed_registration_state (MMIfaceModemCdma *self,
/* Setup/Cleanup unsolicited events (CDMA interface) */
static void
handle_evdo_quality_change (MMAtSerialPort *port,
handle_evdo_quality_change (MMPortSerialAt *port,
GMatchInfo *match_info,
MMBroadbandModemVia *self)
{
@@ -314,7 +314,7 @@ static void
set_unsolicited_events_handlers (MMBroadbandModemVia *self,
gboolean enable)
{
MMAtSerialPort *ports[2];
MMPortSerialAt *ports[2];
guint i;
ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
@@ -326,10 +326,10 @@ set_unsolicited_events_handlers (MMBroadbandModemVia *self,
continue;
/* Signal quality related */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->hrssilvl_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)handle_evdo_quality_change : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)handle_evdo_quality_change : NULL,
enable ? self : NULL,
NULL);
}
@@ -424,7 +424,7 @@ modem_cdma_cleanup_unsolicited_events (MMIfaceModemCdma *self,
static void
set_ignored_unsolicited_events_handlers (MMBroadbandModemVia *self)
{
MMAtSerialPort *ports[2];
MMPortSerialAt *ports[2];
guint i;
ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
@@ -435,39 +435,39 @@ set_ignored_unsolicited_events_handlers (MMBroadbandModemVia *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->mode_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->dosession_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->simst_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->vpon_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->creg_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->vrom_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->vser_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->ciev_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
self->priv->vpup_regex,
NULL, NULL, NULL);
plugins/wavecom/mm-broadband-modem-wavecom.c
+2 -2
View File
@@ -1167,7 +1167,7 @@ static void
setup_ports (MMBroadbandModem *self)
{
gpointer parser;
MMAtSerialPort *primary;
MMPortSerialAt *primary;
GRegex *regex;
/* Call parent's setup ports first always */
@@ -1187,7 +1187,7 @@ setup_ports (MMBroadbandModem *self)
mm_serial_parser_v1_set_custom_regex (parser, regex, NULL);
g_regex_unref (regex);
mm_at_serial_port_set_response_parser (MM_AT_SERIAL_PORT (primary),
mm_port_serial_at_set_response_parser (MM_PORT_SERIAL_AT (primary),
mm_serial_parser_v1_parse,
parser,
mm_serial_parser_v1_destroy);
plugins/x22x/mm-plugin-x22x.c
+11 -11
View File
@@ -40,7 +40,7 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
typedef struct {
MMPortProbe *probe;
MMAtSerialPort *port;
MMPortSerialAt *port;
GCancellable *cancellable;
GSimpleAsyncResult *result;
guint retries;
@@ -70,7 +70,7 @@ x22x_custom_init_finish (MMPortProbe *probe,
static void x22x_custom_init_step (X22xCustomInitContext *ctx);
static void
gmr_ready (MMAtSerialPort *port,
gmr_ready (MMPortSerialAt *port,
GString *response,
GError *error,
X22xCustomInitContext *ctx)
@@ -127,22 +127,22 @@ x22x_custom_init_step (X22xCustomInitContext *ctx)
}
ctx->retries--;
mm_at_serial_port_queue_command (
mm_port_serial_at_queue_command (
ctx->port,
"AT+GMR",
3,
FALSE, /* raw */
ctx->cancellable,
(MMAtSerialResponseFn)gmr_ready,
(MMPortSerialAtResponseFn)gmr_ready,
ctx);
}
static void
x22x_custom_init (MMPortProbe *probe,
MMAtSerialPort *port,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
MMPortSerialAt *port,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
MMDevice *device;
X22xCustomInitContext *ctx;
@@ -215,7 +215,7 @@ grab_port (MMPlugin *self,
{
GUdevDevice *port;
MMPortType ptype;
MMAtPortFlag pflags = MM_AT_PORT_FLAG_NONE;
MMPortSerialAtFlag pflags = MM_PORT_SERIAL_AT_FLAG_NONE;
port = mm_port_probe_peek_port (probe);
ptype = mm_port_probe_get_port_type (probe);
@@ -229,12 +229,12 @@ grab_port (MMPlugin *self,
mm_dbg ("x22x: AT 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;
} else if (g_udev_device_get_property_as_boolean (port, "ID_MM_X22X_PORT_TYPE_AUX")) {
mm_dbg ("x22x: 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 the port was tagged by the udev rules but isn't a primary or secondary,
* then ignore it to guard against race conditions if a device just happens
plugins/zte/mm-common-zte.c
+8 -8
View File
@@ -76,7 +76,7 @@ mm_common_zte_unsolicited_setup_free (MMCommonZteUnsolicitedSetup *setup)
}
static void
zpasr_received (MMAtSerialPort *port,
zpasr_received (MMPortSerialAt *port,
GMatchInfo *info,
MMBroadbandModem *self)
{
@@ -99,7 +99,7 @@ mm_common_zte_set_unsolicited_events_handlers (MMBroadbandModem *self,
MMCommonZteUnsolicitedSetup *setup,
gboolean enable)
{
MMAtSerialPort *ports[2];
MMPortSerialAt *ports[2];
guint i;
ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
@@ -111,28 +111,28 @@ mm_common_zte_set_unsolicited_events_handlers (MMBroadbandModem *self,
continue;
/* Access technology related */
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
setup->zpasr_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)zpasr_received : NULL,
enable ? (MMPortSerialAtUnsolicitedMsgFn)zpasr_received : NULL,
enable ? self : NULL,
NULL);
/* Other unsolicited events to always ignore */
if (!enable) {
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
setup->zusimr_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
setup->zdonr_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
setup->zpstm_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
mm_port_serial_at_add_unsolicited_msg_handler (
ports[i],
setup->zend_regex,
NULL, NULL, NULL);
plugins/zte/mm-plugin-zte.c
+3 -3
View File
@@ -111,7 +111,7 @@ grab_port (MMPlugin *self,
GError **error)
{
GUdevDevice *port;
MMAtPortFlag pflags = MM_AT_PORT_FLAG_NONE;
MMPortSerialAtFlag pflags = MM_PORT_SERIAL_AT_FLAG_NONE;
MMPortType ptype;
port = mm_port_probe_peek_port (probe);
@@ -132,12 +132,12 @@ grab_port (MMPlugin *self,
mm_dbg ("ZTE: AT 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;
} else if (g_udev_device_get_property_as_boolean (port, "ID_MM_ZTE_PORT_TYPE_AUX")) {
mm_dbg ("ZTE: 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;
}
}