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