ports: rename 'MMAtSerialPort' to 'MMPortSerialAt'
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user