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

plugins: use default port grabbing on those plugins without special requirements

Browse Source
This commit is contained in:
Aleksander Morgado
2012-07-11 12:40:55 +02:00
parent b64f52cddc
commit 1ca46cc0ec
9 changed files with 0 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/anydata/mm-plugin-anydata.c
View File

@@ -47,20 +47,6 @@ create_modem (MMPlugin *self,
product)); product));
} }
static gboolean
grab_port (MMPlugin *self,
MMBaseModem *modem,
MMPortProbe *probe,
GError **error)
{
return mm_base_modem_grab_port (modem,
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe),
mm_port_probe_get_port_type (probe),
MM_AT_PORT_FLAG_NONE,
error);
}
/*****************************************************************************/ /*****************************************************************************/
G_MODULE_EXPORT MMPlugin * G_MODULE_EXPORT MMPlugin *
@@ -90,5 +76,4 @@ mm_plugin_anydata_class_init (MMPluginAnydataClass *klass)
MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass); MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
plugin_class->create_modem = create_modem; plugin_class->create_modem = create_modem;
plugin_class->grab_port = grab_port;
} }

25
plugins/cinterion/mm-plugin-cinterion.c
View File

@@ -51,30 +51,6 @@ create_modem (MMPlugin *self,
product)); product));
} }
static gboolean
grab_port (MMPlugin *self,
MMBaseModem *modem,
MMPortProbe *probe,
GError **error)
{
/* The Cinterion plugin cannot do anything with non-AT ports */
if (!mm_port_probe_is_at (probe)) {
g_set_error_literal (error,
MM_CORE_ERROR,
MM_CORE_ERROR_UNSUPPORTED,
"Ignoring non-AT port");
return FALSE;
}
return mm_base_modem_grab_port (modem,
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe),
MM_PORT_TYPE_AT, /* we only allow AT ports here */
MM_AT_PORT_FLAG_NONE,
error);
}
/*****************************************************************************/ /*****************************************************************************/
G_MODULE_EXPORT MMPlugin * G_MODULE_EXPORT MMPlugin *
@@ -105,5 +81,4 @@ mm_plugin_cinterion_class_init (MMPluginCinterionClass *klass)
MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass); MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
plugin_class->create_modem = create_modem; plugin_class->create_modem = create_modem;
plugin_class->grab_port = grab_port;
} }

25
plugins/generic/mm-plugin-generic.c
View File

@@ -55,30 +55,6 @@ create_modem (MMPlugin *self,
product)); product));
} }
static gboolean
grab_port (MMPlugin *self,
MMBaseModem *modem,
MMPortProbe *probe,
GError **error)
{
/* The generic plugin cannot do anything with non-AT and non-QCDM ports */
if (!mm_port_probe_is_at (probe) &&
!mm_port_probe_is_qcdm (probe)) {
g_set_error (error,
MM_CORE_ERROR,
MM_CORE_ERROR_UNSUPPORTED,
"Ignoring non-AT/non-QCDM ports");
return FALSE;
}
return mm_base_modem_grab_port (modem,
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe),
mm_port_probe_get_port_type (probe),
MM_AT_PORT_FLAG_NONE,
error);
}
/*****************************************************************************/ /*****************************************************************************/
G_MODULE_EXPORT MMPlugin * G_MODULE_EXPORT MMPlugin *
@@ -106,5 +82,4 @@ mm_plugin_generic_class_init (MMPluginGenericClass *klass)
MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass); MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
plugin_class->create_modem = create_modem; plugin_class->create_modem = create_modem;
plugin_class->grab_port = grab_port;
} }

24
plugins/gobi/mm-plugin-gobi.c
View File

@@ -45,29 +45,6 @@ create_modem (MMPlugin *self,
product)); product));
} }
static gboolean
grab_port (MMPlugin *self,
MMBaseModem *modem,
MMPortProbe *probe,
GError **error)
{
/* The Gobi plugin only handles AT and QCDM ports (for now) */
if (!mm_port_probe_is_at (probe) && !mm_port_probe_is_qcdm (probe)) {
g_set_error_literal (error,
MM_CORE_ERROR,
MM_CORE_ERROR_UNSUPPORTED,
"Ignoring non-AT/non-QCDM port");
return FALSE;
}
return mm_base_modem_grab_port (modem,
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe),
mm_port_probe_get_port_type (probe),
MM_AT_PORT_FLAG_NONE,
error);
}
/*****************************************************************************/ /*****************************************************************************/
G_MODULE_EXPORT MMPlugin * G_MODULE_EXPORT MMPlugin *
@@ -97,5 +74,4 @@ mm_plugin_gobi_class_init (MMPluginGobiClass *klass)
MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass); MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
plugin_class->create_modem = create_modem; plugin_class->create_modem = create_modem;
plugin_class->grab_port = grab_port;
} }

24
plugins/iridium/mm-plugin-iridium.c
View File

@@ -51,29 +51,6 @@ create_modem (MMPlugin *self,
product)); product));
} }
static gboolean
grab_port (MMPlugin *self,
MMBaseModem *modem,
MMPortProbe *probe,
GError **error)
{
/* The Iridium plugin cannot do anything with non-AT ports */
if (!mm_port_probe_is_at (probe)) {
g_set_error_literal (error,
MM_CORE_ERROR,
MM_CORE_ERROR_UNSUPPORTED,
"Ignoring non-AT port");
return FALSE;
}
return mm_base_modem_grab_port (modem,
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe),
MM_PORT_TYPE_AT, /* we only allow AT ports here */
MM_AT_PORT_FLAG_NONE,
error);
}
/*****************************************************************************/ /*****************************************************************************/
G_MODULE_EXPORT MMPlugin * G_MODULE_EXPORT MMPlugin *
@@ -108,5 +85,4 @@ mm_plugin_iridium_class_init (MMPluginIridiumClass *klass)
MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass); MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
plugin_class->create_modem = create_modem; plugin_class->create_modem = create_modem;
plugin_class->grab_port = grab_port;
} }

36
plugins/linktop/mm-plugin-linktop.c
View File

@@ -45,41 +45,6 @@ create_modem (MMPlugin *self,
product)); product));
} }
static gboolean
grab_port (MMPlugin *self,
MMBaseModem *modem,
MMPortProbe *probe,
GError **error)
{
GUdevDevice *port;
const gchar *devfile;
/* The Linktop plugin cannot do anything with non-AT ports */
if (!mm_port_probe_is_at (probe)) {
g_set_error_literal (error,
MM_CORE_ERROR,
MM_CORE_ERROR_UNSUPPORTED,
"Ignoring non-AT port");
return FALSE;
}
port = mm_port_probe_peek_port (probe);
/* TODO: Why do we check for device file? */
devfile = g_udev_device_get_device_file (port);
if (!devfile) {
g_set_error (error, 0, 0, "Could not get port's sysfs file.");
return FALSE;
}
return mm_base_modem_grab_port (modem,
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe),
MM_PORT_TYPE_AT, /* we only allow AT ports here */
MM_AT_PORT_FLAG_NONE,
error);
}
/*****************************************************************************/ /*****************************************************************************/
G_MODULE_EXPORT MMPlugin * G_MODULE_EXPORT MMPlugin *
@@ -108,5 +73,4 @@ mm_plugin_linktop_class_init (MMPluginLinktopClass *klass)
MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass); MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
plugin_class->create_modem = create_modem; plugin_class->create_modem = create_modem;
plugin_class->grab_port = grab_port;
} }

24
plugins/motorola/mm-plugin-motorola.c
View File

@@ -47,29 +47,6 @@ create_modem (MMPlugin *self,
product)); product));
} }
static gboolean
grab_port (MMPlugin *self,
MMBaseModem *modem,
MMPortProbe *probe,
GError **error)
{
/* The Motorola plugin cannot do anything with non-AT ports */
if (!mm_port_probe_is_at (probe)) {
g_set_error_literal (error,
MM_CORE_ERROR,
MM_CORE_ERROR_UNSUPPORTED,
"Ignoring non-AT port");
return FALSE;
}
return mm_base_modem_grab_port (modem,
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe),
MM_PORT_TYPE_AT, /* we only allow AT ports here */
MM_AT_PORT_FLAG_NONE,
error);
}
/*****************************************************************************/ /*****************************************************************************/
G_MODULE_EXPORT MMPlugin * G_MODULE_EXPORT MMPlugin *
@@ -102,5 +79,4 @@ mm_plugin_motorola_class_init (MMPluginMotorolaClass *klass)
MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass); MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
plugin_class->create_modem = create_modem; plugin_class->create_modem = create_modem;
plugin_class->grab_port = grab_port;
} }

22
plugins/novatel/mm-plugin-novatel.c
View File

@@ -49,27 +49,6 @@ create_modem (MMPlugin *self,
product)); product));
} }
static gboolean
grab_port (MMPlugin *self,
MMBaseModem *modem,
MMPortProbe *probe,
GError **error)
{
/* The Novatel plugin uses AT and net ports */
if (!mm_port_probe_is_at (probe) &&
!g_str_equal (mm_port_probe_get_port_subsys (probe), "net")) {
g_set_error (error, 0, 0, "Ignoring non-AT/net port");
return FALSE;
}
return mm_base_modem_grab_port (modem,
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe),
mm_port_probe_get_port_type (probe),
MM_AT_PORT_FLAG_NONE,
error);
}
/*****************************************************************************/ /*****************************************************************************/
G_MODULE_EXPORT MMPlugin * G_MODULE_EXPORT MMPlugin *
@@ -99,5 +78,4 @@ mm_plugin_novatel_class_init (MMPluginNovatelClass *klass)
MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass); MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
plugin_class->create_modem = create_modem; plugin_class->create_modem = create_modem;
plugin_class->grab_port = grab_port;
} }

24
plugins/wavecom/mm-plugin-wavecom.c
View File

@@ -53,29 +53,6 @@ create_modem (MMPlugin *self,
product)); product));
} }
static gboolean
grab_port (MMPlugin *self,
MMBaseModem *modem,
MMPortProbe *probe,
GError **error)
{
/* The Wavecom plugin cannot do anything with non-AT ports */
if (!mm_port_probe_is_at (probe)) {
g_set_error_literal (error,
MM_CORE_ERROR,
MM_CORE_ERROR_UNSUPPORTED,
"Ignoring non-AT port");
return FALSE;
}
return mm_base_modem_grab_port (modem,
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe),
MM_PORT_TYPE_AT, /* we only allow AT ports here */
MM_AT_PORT_FLAG_NONE,
error);
}
/*****************************************************************************/ /*****************************************************************************/
G_MODULE_EXPORT MMPlugin * G_MODULE_EXPORT MMPlugin *
@@ -104,5 +81,4 @@ mm_plugin_wavecom_class_init (MMPluginWavecomClass *klass)
MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass); MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
plugin_class->create_modem = create_modem; plugin_class->create_modem = create_modem;
plugin_class->grab_port = grab_port;
} }