wda: implement 'Get Supported Messages'
This commit is contained in:
parent
5dfa2198d0
commit
ba1abb2cec
|
@ -12,6 +12,22 @@
|
||||||
{ "name" : "QMI Message WDA",
|
{ "name" : "QMI Message WDA",
|
||||||
"type" : "Message-ID-Enum" },
|
"type" : "Message-ID-Enum" },
|
||||||
|
|
||||||
|
// *********************************************************************************
|
||||||
|
{ "name" : "Get Supported Messages",
|
||||||
|
"type" : "Message",
|
||||||
|
"service" : "WDA",
|
||||||
|
"id" : "0x001E",
|
||||||
|
"version" : "1.6",
|
||||||
|
"output" : [ { "common-ref" : "Operation Result" },
|
||||||
|
{ "name" : "List",
|
||||||
|
"id" : "0x10",
|
||||||
|
"mandatory" : "no",
|
||||||
|
"type" : "TLV",
|
||||||
|
"format" : "array",
|
||||||
|
"size-prefix-format" : "guint16",
|
||||||
|
"array-element" : { "format" : "guint8" },
|
||||||
|
"prerequisites" : [ { "common-ref" : "Success" } ] } ] },
|
||||||
|
|
||||||
// *********************************************************************************
|
// *********************************************************************************
|
||||||
{ "name" : "Set Data Format",
|
{ "name" : "Set Data Format",
|
||||||
"type" : "Message",
|
"type" : "Message",
|
||||||
|
|
|
@ -273,6 +273,7 @@
|
||||||
<title>WDA Requests</title>
|
<title>WDA Requests</title>
|
||||||
<xi:include href="xml/qmi-message-wda-set-data-format.xml"/>
|
<xi:include href="xml/qmi-message-wda-set-data-format.xml"/>
|
||||||
<xi:include href="xml/qmi-message-wda-get-data-format.xml"/>
|
<xi:include href="xml/qmi-message-wda-get-data-format.xml"/>
|
||||||
|
<xi:include href="xml/qmi-message-wda-get-supported-messages.xml"/>
|
||||||
</section>
|
</section>
|
||||||
</chapter>
|
</chapter>
|
||||||
|
|
||||||
|
|
|
@ -44,6 +44,7 @@ static Context *ctx;
|
||||||
/* Options */
|
/* Options */
|
||||||
static gchar *set_data_format_str;
|
static gchar *set_data_format_str;
|
||||||
static gboolean get_data_format_flag;
|
static gboolean get_data_format_flag;
|
||||||
|
static gboolean get_supported_messages_flag;
|
||||||
static gboolean noop_flag;
|
static gboolean noop_flag;
|
||||||
|
|
||||||
static GOptionEntry entries[] = {
|
static GOptionEntry entries[] = {
|
||||||
|
@ -55,6 +56,10 @@ static GOptionEntry entries[] = {
|
||||||
"Get data format",
|
"Get data format",
|
||||||
NULL
|
NULL
|
||||||
},
|
},
|
||||||
|
{ "wda-get-supported-messages", 0, 0, G_OPTION_ARG_NONE, &get_supported_messages_flag,
|
||||||
|
"Get supported messages",
|
||||||
|
NULL
|
||||||
|
},
|
||||||
{ "wda-noop", 0, 0, G_OPTION_ARG_NONE, &noop_flag,
|
{ "wda-noop", 0, 0, G_OPTION_ARG_NONE, &noop_flag,
|
||||||
"Just allocate or release a WDA client. Use with `--client-no-release-cid' and/or `--client-cid'",
|
"Just allocate or release a WDA client. Use with `--client-no-release-cid' and/or `--client-cid'",
|
||||||
NULL
|
NULL
|
||||||
|
@ -88,6 +93,7 @@ qmicli_wda_options_enabled (void)
|
||||||
|
|
||||||
n_actions = (!!set_data_format_str +
|
n_actions = (!!set_data_format_str +
|
||||||
get_data_format_flag +
|
get_data_format_flag +
|
||||||
|
get_supported_messages_flag +
|
||||||
noop_flag);
|
noop_flag);
|
||||||
|
|
||||||
if (n_actions > 1) {
|
if (n_actions > 1) {
|
||||||
|
@ -313,6 +319,63 @@ set_data_format_input_create (const gchar *str)
|
||||||
return input;
|
return input;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
get_supported_messages_ready (QmiClientWda *client,
|
||||||
|
GAsyncResult *res)
|
||||||
|
{
|
||||||
|
QmiMessageWdaGetSupportedMessagesOutput *output;
|
||||||
|
GError *error = NULL;
|
||||||
|
GArray *bytearray = NULL;
|
||||||
|
GString *str = NULL;
|
||||||
|
|
||||||
|
output = qmi_client_wda_get_supported_messages_finish (client, res, &error);
|
||||||
|
if (!output) {
|
||||||
|
g_printerr ("error: operation failed: %s\n", error->message);
|
||||||
|
g_error_free (error);
|
||||||
|
shutdown (FALSE);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!qmi_message_wda_get_supported_messages_output_get_result (output, &error)) {
|
||||||
|
g_printerr ("error: couldn't get supported WDA messages: %s\n", error->message);
|
||||||
|
g_error_free (error);
|
||||||
|
qmi_message_wda_get_supported_messages_output_unref (output);
|
||||||
|
shutdown (FALSE);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
g_print ("[%s] Successfully got supported WDA messages:\n",
|
||||||
|
qmi_device_get_path_display (ctx->device));
|
||||||
|
|
||||||
|
if (qmi_message_wda_get_supported_messages_output_get_list (output, &bytearray, NULL)) {
|
||||||
|
|
||||||
|
guint bytearray_i;
|
||||||
|
|
||||||
|
for (bytearray_i = 0; bytearray_i < bytearray->len; bytearray_i++) {
|
||||||
|
guint bit_i;
|
||||||
|
guint8 bytevalue;
|
||||||
|
|
||||||
|
bytevalue = g_array_index (bytearray, guint8, bytearray_i);
|
||||||
|
for (bit_i = 0; bit_i < 8; bit_i++) {
|
||||||
|
if (bytevalue & (1 << bit_i)) {
|
||||||
|
if (!str)
|
||||||
|
str = g_string_new ("");
|
||||||
|
g_string_append_printf (str, "\t0x%04X\n", (bit_i + (8 * bytearray_i)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (str) {
|
||||||
|
g_print ("%s", str->str);
|
||||||
|
g_string_free (str, TRUE);
|
||||||
|
} else
|
||||||
|
g_print ("\tnone\n");
|
||||||
|
|
||||||
|
qmi_message_wda_get_supported_messages_output_unref (output);
|
||||||
|
shutdown (TRUE);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
qmicli_wda_run (QmiDevice *device,
|
qmicli_wda_run (QmiDevice *device,
|
||||||
QmiClientWda *client,
|
QmiClientWda *client,
|
||||||
|
@ -357,6 +420,18 @@ qmicli_wda_run (QmiDevice *device,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Request to list supported messages? */
|
||||||
|
if (get_supported_messages_flag) {
|
||||||
|
g_debug ("Asynchronously getting supported WDA messages...");
|
||||||
|
qmi_client_wda_get_supported_messages (ctx->client,
|
||||||
|
NULL,
|
||||||
|
10,
|
||||||
|
ctx->cancellable,
|
||||||
|
(GAsyncReadyCallback)get_supported_messages_ready,
|
||||||
|
NULL);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/* Just client allocate/release? */
|
/* Just client allocate/release? */
|
||||||
if (noop_flag) {
|
if (noop_flag) {
|
||||||
g_idle_add (noop_cb, NULL);
|
g_idle_add (noop_cb, NULL);
|
||||||
|
|
Loading…
Reference in New Issue