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

broadband-modem-qmi: new common method to peek a QMI client

Browse Source
This commit is contained in:
Aleksander Morgado
2012-09-18 11:53:52 +02:00
parent 0e40bb7b11
commit 4babcbe30e
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/mm-broadband-modem-qmi.c
View File

@@ -88,6 +88,26 @@ struct _MMBroadbandModemQmiPrivate {
/*****************************************************************************/ /*****************************************************************************/
static QmiClient *
peek_qmi_client (MMBroadbandModemQmi *self,
QmiService service,
GError **error)
{
QmiClient *client;
client = mm_qmi_port_peek_client (mm_base_modem_peek_port_qmi (MM_BASE_MODEM (self)),
service,
MM_QMI_PORT_FLAG_DEFAULT);
if (!client)
g_set_error (error,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"Couldn't peek client for service '%s'",
qmi_service_get_string (service));
return client;
}
static gboolean static gboolean
ensure_qmi_client (MMBroadbandModemQmi *self, ensure_qmi_client (MMBroadbandModemQmi *self,
QmiService service, QmiService service,
@@ -95,19 +115,16 @@ ensure_qmi_client (MMBroadbandModemQmi *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GError *error = NULL;
QmiClient *client; QmiClient *client;
client = mm_qmi_port_peek_client (mm_base_modem_peek_port_qmi (MM_BASE_MODEM (self)), client = peek_qmi_client (self, service, &error);
service,
MM_QMI_PORT_FLAG_DEFAULT);
if (!client) { if (!client) {
g_simple_async_report_error_in_idle (G_OBJECT (self), g_simple_async_report_take_gerror_in_idle (
callback, G_OBJECT (self),
user_data, callback,
MM_CORE_ERROR, user_data,
MM_CORE_ERROR_FAILED, error);
"Couldn't peek client for service '%s'",
qmi_service_get_string (service));
return FALSE; return FALSE;
} }