api,introspection: report list of drivers, not just one
Different ports of the same modem may get handled by different drivers. We
therefore need to provide a list of drivers (new `Modem.Drivers' property with
signature 'as') instead of just one (removed `Modem.Driver' property with
signature 's').
$ sudo mmcli -m 0 | grep drivers
| drivers: 'qcserial, qmi_wwan'
This commit is contained in:
Aleksander Morgado
@@ -343,14 +343,14 @@ setup_ports (MMBroadbandModem *self)
|
||||
|
||||
MMBroadbandModemAnydata *
|
||||
mm_broadband_modem_anydata_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_ANYDATA,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -41,7 +41,7 @@ struct _MMBroadbandModemAnydataClass{
|
||||
GType mm_broadband_modem_anydata_get_type (void);
|
||||
|
||||
MMBroadbandModemAnydata *mm_broadband_modem_anydata_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -34,14 +34,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_anydata_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -1147,14 +1147,14 @@ setup_flow_control (MMIfaceModem *self,
|
||||
|
||||
MMBroadbandModemCinterion *
|
||||
mm_broadband_modem_cinterion_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_CINTERION,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -43,7 +43,7 @@ struct _MMBroadbandModemCinterionClass{
|
||||
GType mm_broadband_modem_cinterion_get_type (void);
|
||||
|
||||
MMBroadbandModemCinterion *mm_broadband_modem_cinterion_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -38,14 +38,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_cinterion_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -42,14 +42,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -89,14 +89,14 @@ load_access_technologies (MMIfaceModem *self,
|
||||
|
||||
MMBroadbandModemGobi *
|
||||
mm_broadband_modem_gobi_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_GOBI,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -41,7 +41,7 @@ struct _MMBroadbandModemGobiClass{
|
||||
GType mm_broadband_modem_gobi_get_type (void);
|
||||
|
||||
MMBroadbandModemGobi *mm_broadband_modem_gobi_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -32,14 +32,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_gobi_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -1524,14 +1524,14 @@ setup_ports (MMBroadbandModem *self)
|
||||
|
||||
MMBroadbandModemHuawei *
|
||||
mm_broadband_modem_huawei_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_HUAWEI,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -43,7 +43,7 @@ struct _MMBroadbandModemHuaweiClass{
|
||||
GType mm_broadband_modem_huawei_get_type (void);
|
||||
|
||||
MMBroadbandModemHuawei *mm_broadband_modem_huawei_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **driver,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -415,7 +415,7 @@ propagate_port_mode_results (GList *probes)
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
@@ -424,7 +424,7 @@ create_modem (MMPlugin *self,
|
||||
propagate_port_mode_results (probes);
|
||||
|
||||
return MM_BASE_MODEM (mm_broadband_modem_huawei_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -1546,14 +1546,14 @@ setup_ports (MMBroadbandModem *self)
|
||||
|
||||
MMBroadbandModemIcera *
|
||||
mm_broadband_modem_icera_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_ICERA,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -45,7 +45,7 @@ struct _MMBroadbandModemIceraClass{
|
||||
GType mm_broadband_modem_icera_get_type (void);
|
||||
|
||||
MMBroadbandModemIcera *mm_broadband_modem_icera_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -395,14 +395,14 @@ setup_ports (MMBroadbandModem *self)
|
||||
|
||||
MMBroadbandModemIridium *
|
||||
mm_broadband_modem_iridium_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_IRIDIUM,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -41,7 +41,7 @@ struct _MMBroadbandModemIridiumClass{
|
||||
GType mm_broadband_modem_iridium_get_type (void);
|
||||
|
||||
MMBroadbandModemIridium *mm_broadband_modem_iridium_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -38,14 +38,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_iridium_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -204,14 +204,14 @@ set_allowed_modes (MMIfaceModem *self,
|
||||
|
||||
MMBroadbandModemLinktop *
|
||||
mm_broadband_modem_linktop_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_LINKTOP,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -41,7 +41,7 @@ struct _MMBroadbandModemLinktopClass{
|
||||
GType mm_broadband_modem_linktop_get_type (void);
|
||||
|
||||
MMBroadbandModemLinktop *mm_broadband_modem_linktop_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -32,14 +32,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_linktop_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -312,14 +312,14 @@ load_unlock_retries (MMIfaceModem *self,
|
||||
|
||||
MMBroadbandModemLongcheer *
|
||||
mm_broadband_modem_longcheer_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_LONGCHEER,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -41,7 +41,7 @@ struct _MMBroadbandModemLongcheerClass{
|
||||
GType mm_broadband_modem_longcheer_get_type (void);
|
||||
|
||||
MMBroadbandModemLongcheer *mm_broadband_modem_longcheer_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -182,14 +182,14 @@ longcheer_custom_init (MMPortProbe *probe,
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_longcheer_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -1032,14 +1032,14 @@ setup_ports (MMBroadbandModem *_self)
|
||||
|
||||
MMBroadbandModemMbm *
|
||||
mm_broadband_modem_mbm_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_MBM,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -50,7 +50,7 @@ struct _MMBroadbandModemMbmClass{
|
||||
GType mm_broadband_modem_mbm_get_type (void);
|
||||
|
||||
MMBroadbandModemMbm *mm_broadband_modem_mbm_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -36,14 +36,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_mbm_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -39,14 +39,14 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMotorola, mm_broadband_modem_motorola, M
|
||||
|
||||
MMBroadbandModemMotorola *
|
||||
mm_broadband_modem_motorola_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_MOTOROLA,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -41,7 +41,7 @@ struct _MMBroadbandModemMotorolaClass{
|
||||
GType mm_broadband_modem_motorola_get_type (void);
|
||||
|
||||
MMBroadbandModemMotorola *mm_broadband_modem_motorola_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -34,14 +34,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_motorola_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -153,14 +153,14 @@ modem_init (MMIfaceModem *self,
|
||||
|
||||
MMBroadbandModemNokia *
|
||||
mm_broadband_modem_nokia_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_NOKIA,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -41,7 +41,7 @@ struct _MMBroadbandModemNokiaClass{
|
||||
GType mm_broadband_modem_nokia_get_type (void);
|
||||
|
||||
MMBroadbandModemNokia *mm_broadband_modem_nokia_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -33,14 +33,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_icera_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -44,14 +44,14 @@ static const MMPortProbeAtCommand custom_at_probe[] = {
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_nokia_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -336,14 +336,14 @@ load_access_technologies (MMIfaceModem *self,
|
||||
|
||||
MMBroadbandModemNovatelLte *
|
||||
mm_broadband_modem_novatel_lte_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_NOVATEL_LTE,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -42,7 +42,7 @@ struct _MMBroadbandModemNovatelLteClass{
|
||||
GType mm_broadband_modem_novatel_lte_get_type (void);
|
||||
|
||||
MMBroadbandModemNovatelLte *mm_broadband_modem_novatel_lte_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -742,14 +742,14 @@ setup_ports (MMBroadbandModem *self)
|
||||
|
||||
MMBroadbandModemNovatel *
|
||||
mm_broadband_modem_novatel_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_NOVATEL,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -43,7 +43,7 @@ struct _MMBroadbandModemNovatelClass{
|
||||
GType mm_broadband_modem_novatel_get_type (void);
|
||||
|
||||
MMBroadbandModemNovatel *mm_broadband_modem_novatel_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -36,14 +36,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_novatel_lte_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -37,14 +37,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_novatel_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -675,14 +675,14 @@ setup_ports (MMBroadbandModem *self)
|
||||
|
||||
MMBroadbandModemHso *
|
||||
mm_broadband_modem_hso_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_HSO,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -43,7 +43,7 @@ struct _MMBroadbandModemHsoClass{
|
||||
GType mm_broadband_modem_hso_get_type (void);
|
||||
|
||||
MMBroadbandModemHso *mm_broadband_modem_hso_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -1031,14 +1031,14 @@ setup_ports (MMBroadbandModem *self)
|
||||
|
||||
MMBroadbandModemOption *
|
||||
mm_broadband_modem_option_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_OPTION,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -43,7 +43,7 @@ struct _MMBroadbandModemOptionClass{
|
||||
GType mm_broadband_modem_option_get_type (void);
|
||||
|
||||
MMBroadbandModemOption *mm_broadband_modem_option_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -35,14 +35,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_hso_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -34,14 +34,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_option_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -32,14 +32,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -63,14 +63,14 @@ setup_ports (MMBroadbandModem *self)
|
||||
|
||||
MMBroadbandModemSamsung *
|
||||
mm_broadband_modem_samsung_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_SAMSUNG,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -41,7 +41,7 @@ struct _MMBroadbandModemSamsungClass{
|
||||
GType mm_broadband_modem_samsung_get_type (void);
|
||||
|
||||
MMBroadbandModemSamsung *mm_broadband_modem_samsung_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -37,14 +37,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_samsung_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -51,14 +51,14 @@ setup_ports (MMBroadbandModem *self)
|
||||
|
||||
MMBroadbandModemSierraIcera *
|
||||
mm_broadband_modem_sierra_icera_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_SIERRA_ICERA,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -41,7 +41,7 @@ struct _MMBroadbandModemSierraIceraClass {
|
||||
GType mm_broadband_modem_sierra_icera_get_type (void);
|
||||
|
||||
MMBroadbandModemSierraIcera *mm_broadband_modem_sierra_icera_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -843,14 +843,14 @@ setup_ports (MMBroadbandModem *self)
|
||||
|
||||
MMBroadbandModemSierra *
|
||||
mm_broadband_modem_sierra_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_SIERRA,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -41,7 +41,7 @@ struct _MMBroadbandModemSierraClass{
|
||||
GType mm_broadband_modem_sierra_get_type (void);
|
||||
|
||||
MMBroadbandModemSierra *mm_broadband_modem_sierra_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -47,6 +47,8 @@ full_functionality_status_ready (MMBaseModem *self,
|
||||
GSimpleAsyncResult *simple)
|
||||
{
|
||||
GError *error = NULL;
|
||||
guint i;
|
||||
const gchar **drivers;
|
||||
|
||||
if (!mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error)) {
|
||||
g_simple_async_result_take_error (simple, error);
|
||||
@@ -59,11 +61,14 @@ full_functionality_status_ready (MMBaseModem *self,
|
||||
* away but need some time to finish initialization. Anything driven by
|
||||
* 'sierra' is new enough to need no delay.
|
||||
*/
|
||||
if (g_str_equal (mm_base_modem_get_driver (MM_BASE_MODEM (self)), "sierra")) {
|
||||
g_simple_async_result_set_op_res_gboolean (simple, TRUE);
|
||||
g_simple_async_result_complete (simple);
|
||||
g_object_unref (simple);
|
||||
return;
|
||||
drivers = mm_base_modem_get_drivers (MM_BASE_MODEM (self));
|
||||
for (i = 0; drivers[i]; i++) {
|
||||
if (g_str_equal (drivers[i], "sierra")) {
|
||||
g_simple_async_result_set_op_res_gboolean (simple, TRUE);
|
||||
g_simple_async_result_complete (simple);
|
||||
g_object_unref (simple);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
/* The modem object will be valid in the callback as 'result' keeps a
|
||||
|
||||
@@ -157,7 +157,7 @@ sierra_custom_init (MMPortProbe *probe,
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
@@ -173,13 +173,13 @@ create_modem (MMPlugin *self,
|
||||
|
||||
if (is_icera)
|
||||
return MM_BASE_MODEM (mm_broadband_modem_sierra_icera_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
return MM_BASE_MODEM (mm_broadband_modem_sierra_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -791,14 +791,14 @@ setup_ports (MMBroadbandModem *self)
|
||||
|
||||
MMBroadbandModemSimtech *
|
||||
mm_broadband_modem_simtech_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_SIMTECH,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -41,7 +41,7 @@ struct _MMBroadbandModemSimtechClass{
|
||||
GType mm_broadband_modem_simtech_get_type (void);
|
||||
|
||||
MMBroadbandModemSimtech *mm_broadband_modem_simtech_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -32,14 +32,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_simtech_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -1178,14 +1178,14 @@ setup_ports (MMBroadbandModem *self)
|
||||
|
||||
MMBroadbandModemWavecom *
|
||||
mm_broadband_modem_wavecom_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_WAVECOM,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -42,7 +42,7 @@ struct _MMBroadbandModemWavecomClass{
|
||||
GType mm_broadband_modem_wavecom_get_type (void);
|
||||
|
||||
MMBroadbandModemWavecom *mm_broadband_modem_wavecom_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -40,14 +40,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_wavecom_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -239,14 +239,14 @@ load_access_technologies (MMIfaceModem *self,
|
||||
|
||||
MMBroadbandModemX22x *
|
||||
mm_broadband_modem_x22x_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_X22X,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -41,7 +41,7 @@ struct _MMBroadbandModemX22xClass{
|
||||
GType mm_broadband_modem_x22x_get_type (void);
|
||||
|
||||
MMBroadbandModemX22x *mm_broadband_modem_x22x_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -181,14 +181,14 @@ x22x_custom_init (MMPortProbe *probe,
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
GError **error)
|
||||
{
|
||||
return MM_BASE_MODEM (mm_broadband_modem_x22x_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
@@ -168,14 +168,14 @@ setup_ports (MMBroadbandModem *self)
|
||||
|
||||
MMBroadbandModemZteIcera *
|
||||
mm_broadband_modem_zte_icera_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_ZTE_ICERA,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -43,7 +43,7 @@ struct _MMBroadbandModemZteIceraClass{
|
||||
GType mm_broadband_modem_zte_icera_get_type (void);
|
||||
|
||||
MMBroadbandModemZteIcera *mm_broadband_modem_zte_icera_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -533,14 +533,14 @@ setup_ports (MMBroadbandModem *self)
|
||||
|
||||
MMBroadbandModemZte *
|
||||
mm_broadband_modem_zte_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id)
|
||||
{
|
||||
return g_object_new (MM_TYPE_BROADBAND_MODEM_ZTE,
|
||||
MM_BASE_MODEM_DEVICE, device,
|
||||
MM_BASE_MODEM_DRIVER, driver,
|
||||
MM_BASE_MODEM_DRIVERS, drivers,
|
||||
MM_BASE_MODEM_PLUGIN, plugin,
|
||||
MM_BASE_MODEM_VENDOR_ID, vendor_id,
|
||||
MM_BASE_MODEM_PRODUCT_ID, product_id,
|
||||
|
||||
@@ -43,7 +43,7 @@ struct _MMBroadbandModemZteClass{
|
||||
GType mm_broadband_modem_zte_get_type (void);
|
||||
|
||||
MMBroadbandModemZte *mm_broadband_modem_zte_new (const gchar *device,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
const gchar *plugin,
|
||||
guint16 vendor_id,
|
||||
guint16 product_id);
|
||||
|
||||
@@ -53,7 +53,7 @@ static const MMPortProbeAtCommand custom_at_probe[] = {
|
||||
static MMBaseModem *
|
||||
create_modem (MMPlugin *self,
|
||||
const gchar *sysfs_path,
|
||||
const gchar *driver,
|
||||
const gchar **drivers,
|
||||
guint16 vendor,
|
||||
guint16 product,
|
||||
GList *probes,
|
||||
@@ -69,13 +69,13 @@ create_modem (MMPlugin *self,
|
||||
|
||||
if (is_icera)
|
||||
return MM_BASE_MODEM (mm_broadband_modem_zte_icera_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
return MM_BASE_MODEM (mm_broadband_modem_zte_new (sysfs_path,
|
||||
driver,
|
||||
drivers,
|
||||
mm_plugin_get_name (self),
|
||||
vendor,
|
||||
product));
|
||||
|
||||
Reference in New Issue
Block a user