SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base-modem: use the new `MMQmiPort' object

Browse Source
This commit is contained in:
Aleksander Morgado
2012-08-29 17:14:47 +02:00
parent 26d3c28e43
commit 3e251129c2
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-base-modem.c
+4 -8
View File
@@ -85,7 +85,7 @@ struct _MMBaseModemPrivate {
MMGpsSerialPort *gps;
/* QMI port */
MMPort *qmi;
MMQmiPort *qmi;
};
static gchar *
@@ -236,11 +236,7 @@ mm_base_modem_grab_port (MMBaseModem *self,
/* QMI ports... */
else if (g_str_equal (subsys, "usb") &&
g_str_has_prefix (name, "cdc-wdm")) {
port = MM_PORT (g_object_new (MM_TYPE_PORT,
MM_PORT_DEVICE, name,
MM_PORT_SUBSYS, MM_PORT_SUBSYS_USB,
MM_PORT_TYPE, MM_PORT_TYPE_QMI,
NULL));
port = MM_PORT (mm_qmi_port_new (name));
} else
/* We already filter out before all non-tty, non-net, non-qmi ports */
g_assert_not_reached();
@@ -508,7 +504,7 @@ mm_base_modem_peek_port_gps (MMBaseModem *self)
return self->priv->gps;
}
MMPort *
MMQmiPort *
mm_base_modem_get_port_qmi (MMBaseModem *self)
{
g_return_val_if_fail (MM_IS_BASE_MODEM (self), NULL);
@@ -516,7 +512,7 @@ mm_base_modem_get_port_qmi (MMBaseModem *self)
return (self->priv->qmi ? g_object_ref (self->priv->qmi) : NULL);
}
MMPort *
MMQmiPort *
mm_base_modem_peek_port_qmi (MMBaseModem *self)
{
g_return_val_if_fail (MM_IS_BASE_MODEM (self), NULL);
src/mm-base-modem.h
+3 -2
View File
@@ -28,6 +28,7 @@
#include "mm-at-serial-port.h"
#include "mm-qcdm-serial-port.h"
#include "mm-gps-serial-port.h"
#include "mm-qmi-port.h"
#define MM_TYPE_BASE_MODEM (mm_base_modem_get_type ())
#define MM_BASE_MODEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BASE_MODEM, MMBaseModem))
@@ -116,7 +117,7 @@ MMAtSerialPort *mm_base_modem_peek_port_secondary (MMBaseModem *self);
MMQcdmSerialPort *mm_base_modem_peek_port_qcdm (MMBaseModem *self);
MMAtSerialPort *mm_base_modem_peek_port_gps_control (MMBaseModem *self);
MMGpsSerialPort *mm_base_modem_peek_port_gps (MMBaseModem *self);
MMPort *mm_base_modem_peek_port_qmi (MMBaseModem *self);
MMQmiPort *mm_base_modem_peek_port_qmi (MMBaseModem *self);
MMAtSerialPort *mm_base_modem_peek_best_at_port (MMBaseModem *self, GError **error);
MMPort *mm_base_modem_peek_best_data_port (MMBaseModem *self);
@@ -125,7 +126,7 @@ MMAtSerialPort *mm_base_modem_get_port_secondary (MMBaseModem *self);
MMQcdmSerialPort *mm_base_modem_get_port_qcdm (MMBaseModem *self);
MMAtSerialPort *mm_base_modem_get_port_gps_control (MMBaseModem *self);
MMGpsSerialPort *mm_base_modem_get_port_gps (MMBaseModem *self);
MMPort *mm_base_modem_get_port_qmi (MMBaseModem *self);
MMQmiPort *mm_base_modem_get_port_qmi (MMBaseModem *self);
MMAtSerialPort *mm_base_modem_get_best_at_port (MMBaseModem *self, GError **error);
MMPort *mm_base_modem_get_best_data_port (MMBaseModem *self);