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/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),