ports: rename 'MMAtSerialPort' to 'MMPortSerialAt'

plugins/sierra/mm-broadband-bearer-sierra.c

@@ -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

@@ -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

@@ -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

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