ports: rename 'MMSerialPort' to 'MMPortSerial'
This commit is contained in:
@@ -1378,7 +1378,7 @@ setup_ports (MMBroadbandModem *self)
|
||||
return;
|
||||
|
||||
g_object_set (primary,
|
||||
MM_SERIAL_PORT_SEND_DELAY, (guint64) 0,
|
||||
MM_PORT_SERIAL_SEND_DELAY, (guint64) 0,
|
||||
MM_AT_SERIAL_PORT_SEND_LF, TRUE,
|
||||
MM_AT_SERIAL_PORT_INIT_SEQUENCE, primary_init_sequence,
|
||||
NULL);
|
||||
|
||||
@@ -640,7 +640,7 @@ connect_cancelled_cb (GCancellable *cancellable,
|
||||
}
|
||||
|
||||
static void
|
||||
forced_close_cb (MMSerialPort *port,
|
||||
forced_close_cb (MMPortSerial *port,
|
||||
MMBroadbandBearerIcera *self)
|
||||
{
|
||||
/* Just treat the forced close event as any other unsolicited message */
|
||||
|
||||
@@ -343,7 +343,7 @@ setup_ports (MMBroadbandModem *self)
|
||||
return;
|
||||
|
||||
g_object_set (G_OBJECT (primary),
|
||||
MM_SERIAL_PORT_BAUD, 9600,
|
||||
MM_PORT_SERIAL_BAUD, 9600,
|
||||
MM_AT_SERIAL_PORT_INIT_SEQUENCE, primary_init_sequence,
|
||||
NULL);
|
||||
}
|
||||
|
||||
@@ -1209,7 +1209,9 @@ setup_ports (MMBroadbandModem *_self)
|
||||
* command mode. F5521gw R2A07 resets port properties like echo when
|
||||
* flashed, leading to confusion. bgo #650740
|
||||
*/
|
||||
g_object_set (G_OBJECT (ports[i]), MM_SERIAL_PORT_FLASH_OK, FALSE, NULL);
|
||||
g_object_set (G_OBJECT (ports[i]),
|
||||
MM_PORT_SERIAL_FLASH_OK, FALSE,
|
||||
NULL);
|
||||
|
||||
mm_at_serial_port_add_unsolicited_msg_handler (
|
||||
ports[i],
|
||||
|
||||
@@ -462,7 +462,7 @@ connect_cancelled_cb (GCancellable *cancellable,
|
||||
}
|
||||
|
||||
static void
|
||||
forced_close_cb (MMSerialPort *port,
|
||||
forced_close_cb (MMPortSerial *port,
|
||||
MMBroadbandBearerHso *self)
|
||||
{
|
||||
/* Just treat the forced close event as any other unsolicited message */
|
||||
|
||||
@@ -474,7 +474,7 @@ gps_disabled_ready (MMBaseModem *self,
|
||||
/* Even if we get an error here, we try to close the GPS port */
|
||||
gps_port = mm_base_modem_peek_port_gps (self);
|
||||
if (gps_port)
|
||||
mm_serial_port_close (MM_SERIAL_PORT (gps_port));
|
||||
mm_port_serial_close (MM_PORT_SERIAL (gps_port));
|
||||
|
||||
g_simple_async_result_complete (simple);
|
||||
g_object_unref (simple);
|
||||
@@ -567,7 +567,7 @@ gps_enabled_ready (MMBaseModem *self,
|
||||
|
||||
gps_port = mm_base_modem_peek_port_gps (self);
|
||||
if (!gps_port ||
|
||||
!mm_serial_port_open (MM_SERIAL_PORT (gps_port), &error)) {
|
||||
!mm_port_serial_open (MM_PORT_SERIAL (gps_port), &error)) {
|
||||
if (error)
|
||||
g_simple_async_result_take_error (ctx->result, error);
|
||||
else
|
||||
@@ -698,7 +698,7 @@ setup_ports (MMBroadbandModem *self)
|
||||
NULL, NULL, NULL);
|
||||
|
||||
g_object_set (mm_base_modem_peek_port_primary (MM_BASE_MODEM (self)),
|
||||
MM_SERIAL_PORT_SEND_DELAY, (guint64) 0,
|
||||
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,
|
||||
|
||||
@@ -53,7 +53,7 @@ setup_ports (MMBroadbandModem *self)
|
||||
continue;
|
||||
|
||||
g_object_set (ports[i],
|
||||
MM_SERIAL_PORT_SEND_DELAY, (guint64) 0,
|
||||
MM_PORT_SERIAL_SEND_DELAY, (guint64) 0,
|
||||
NULL);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user