diff mbox

[OpenWrt-Devel,uqmi] Add command for listing device capabilities

Message ID 1420725309-23172-1-git-send-email-s.demeszko@wireless-instruments.com
State Changes Requested
Headers show

Commit Message

Sławomir Demeszko Jan. 8, 2015, 1:55 p.m. UTC 
Signed-off-by: Sławomir Demeszko <s.demeszko@wireless-instruments.com>
---
 commands-dms.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 commands-dms.h |  2 ++
 2 files changed, 55 insertions(+)

Comments

Felix Fietkau Jan. 8, 2015, 2:38 p.m. UTC | #1 
On 2015-01-08 14:55, Sławomir Demeszko wrote:
> Signed-off-by: Sławomir Demeszko <s.demeszko@wireless-instruments.com>
> ---
>  commands-dms.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>  commands-dms.h |  2 ++
>  2 files changed, 55 insertions(+)
> 
> diff --git a/commands-dms.c b/commands-dms.c
> index a677052..fcb4b93 100644
> --- a/commands-dms.c
> +++ b/commands-dms.c
> @@ -7,6 +7,59 @@ static struct {
>  	char* puk;
>  } dms_req_data;
>  
> +static void cmd_dms_get_capabilities_cb(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg)
> +{
> +	void *t, *networks;
> +	int i;
> +	struct qmi_dms_get_capabilities_response res;
> +	const char *radio_cap[] = {
> +		[QMI_DMS_RADIO_INTERFACE_CDMA20001X] = "cdma1x",
> +		[QMI_DMS_RADIO_INTERFACE_EVDO] = "cdma1xevdo",
> +		[QMI_DMS_RADIO_INTERFACE_GSM] = "gsm",
> +		[QMI_DMS_RADIO_INTERFACE_UMTS] = "umts",
> +		[QMI_DMS_RADIO_INTERFACE_LTE] = "lte",
> +	};
> +	const char *service_cap[] = {
> +		[QMI_DMS_DATA_SERVICE_CAPABILITY_NONE] = "none",
> +		[QMI_DMS_DATA_SERVICE_CAPABILITY_CS] = "cs",
> +		[QMI_DMS_DATA_SERVICE_CAPABILITY_PS] = "ps",
> +		[QMI_DMS_DATA_SERVICE_CAPABILITY_SIMULTANEOUS_CS_PS] = "simultaneous_cs_ps",
> +		[QMI_DMS_DATA_SERVICE_CAPABILITY_NON_SIMULTANEOUS_CS_PS] = "non_simultaneous_cs_ps",
> +	};
> +
> +	qmi_parse_dms_get_capabilities_response(msg, &res);
> +
> +	t = blobmsg_open_table(&status, NULL);
> +
> +	blobmsg_add_u32(&status, "max_tx_channel_rate", (int32_t) res.data.info.max_tx_channel_rate);
> +	blobmsg_add_u32(&status, "max_rx_channel_rate", (int32_t) res.data.info.max_rx_channel_rate);
> +	if (res.data.info.data_service_capability >= 0 && res.data.info.data_service_capability < ARRAY_SIZE(service_cap))
> +		blobmsg_add_string(&status, "data_service", service_cap[res.data.info.data_service_capability]);
This causes the following warning on my system:

In file included from /Users/nbd/uqmi/commands.c:139:
/Users/nbd/uqmi/commands-dms.c:36:44: error: comparison of unsigned enum expression >= 0 is always true [-Werror,-Wtautological-compare]
        if (res.data.info.data_service_capability >= 0 && res.data.info.data_service_capability < ARRAY_SIZE(service_cap))
            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~
/Users/nbd/uqmi/commands-dms.c:46:45: error: comparison of unsigned enum expression >= 0 is always true [-Werror,-Wtautological-compare]
                if (res.data.info.radio_interface_list[i] >= 0 && res.data.info.radio_interface_list[i] < ARRAY_SIZE(radio_cap))
                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~

- Felix
diff mbox

Patch

diff --git a/commands-dms.c b/commands-dms.c
index a677052..fcb4b93 100644
--- a/commands-dms.c
+++ b/commands-dms.c
@@ -7,6 +7,59 @@  static struct {
 	char* puk;
 } dms_req_data;
 
+static void cmd_dms_get_capabilities_cb(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg)
+{
+	void *t, *networks;
+	int i;
+	struct qmi_dms_get_capabilities_response res;
+	const char *radio_cap[] = {
+		[QMI_DMS_RADIO_INTERFACE_CDMA20001X] = "cdma1x",
+		[QMI_DMS_RADIO_INTERFACE_EVDO] = "cdma1xevdo",
+		[QMI_DMS_RADIO_INTERFACE_GSM] = "gsm",
+		[QMI_DMS_RADIO_INTERFACE_UMTS] = "umts",
+		[QMI_DMS_RADIO_INTERFACE_LTE] = "lte",
+	};
+	const char *service_cap[] = {
+		[QMI_DMS_DATA_SERVICE_CAPABILITY_NONE] = "none",
+		[QMI_DMS_DATA_SERVICE_CAPABILITY_CS] = "cs",
+		[QMI_DMS_DATA_SERVICE_CAPABILITY_PS] = "ps",
+		[QMI_DMS_DATA_SERVICE_CAPABILITY_SIMULTANEOUS_CS_PS] = "simultaneous_cs_ps",
+		[QMI_DMS_DATA_SERVICE_CAPABILITY_NON_SIMULTANEOUS_CS_PS] = "non_simultaneous_cs_ps",
+	};
+
+	qmi_parse_dms_get_capabilities_response(msg, &res);
+
+	t = blobmsg_open_table(&status, NULL);
+
+	blobmsg_add_u32(&status, "max_tx_channel_rate", (int32_t) res.data.info.max_tx_channel_rate);
+	blobmsg_add_u32(&status, "max_rx_channel_rate", (int32_t) res.data.info.max_rx_channel_rate);
+	if (res.data.info.data_service_capability >= 0 && res.data.info.data_service_capability < ARRAY_SIZE(service_cap))
+		blobmsg_add_string(&status, "data_service", service_cap[res.data.info.data_service_capability]);
+
+	if(res.data.info.sim_capability == QMI_DMS_SIM_CAPABILITY_NOT_SUPPORTED)
+		blobmsg_add_string(&status, "sim", "not supported");
+	else if(res.data.info.sim_capability == QMI_DMS_SIM_CAPABILITY_SUPPORTED)
+		blobmsg_add_string(&status, "sim", "supported");
+
+	networks = blobmsg_open_array(&status, "networks");
+	for (i = 0; i < res.data.info.radio_interface_list_n; i++) {
+		if (res.data.info.radio_interface_list[i] >= 0 && res.data.info.radio_interface_list[i] < ARRAY_SIZE(radio_cap))
+			blobmsg_add_string(&status, NULL, radio_cap[res.data.info.radio_interface_list[i]]);
+		else
+			blobmsg_add_string(&status, NULL, "unknown");
+	}
+	blobmsg_close_array(&status, networks);
+
+	blobmsg_close_table(&status, t);
+}
+
+static enum qmi_cmd_result
+cmd_dms_get_capabilities_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
+{
+	qmi_set_dms_get_capabilities_request(msg);
+	return QMI_CMD_REQUEST;
+}
+
 static const char *get_pin_status(int status)
 {
 	static const char *pin_status[] = {
diff --git a/commands-dms.h b/commands-dms.h
index 925aea3..a370425 100644
--- a/commands-dms.h
+++ b/commands-dms.h
@@ -1,4 +1,5 @@ 
 #define __uqmi_dms_commands												\
+	__uqmi_command(dms_get_capabilities, get-capabilities, no, QMI_SERVICE_DMS), \
 	__uqmi_command(dms_get_pin_status, get-pin-status, no, QMI_SERVICE_DMS), \
 	__uqmi_command(dms_verify_pin1, verify-pin1, required, QMI_SERVICE_DMS), \
 	__uqmi_command(dms_verify_pin2, verify-pin2, required, QMI_SERVICE_DMS), \
@@ -18,6 +19,7 @@ 
 	__uqmi_command(dms_reset, reset-dms, no, QMI_SERVICE_DMS) \
 
 #define dms_helptext \
+		"  --get-capabilities:               List device capabilities\n" \
 		"  --get-pin-status:                 Get PIN verification status\n" \
 		"  --verify-pin1 <pin>:              Verify PIN1\n" \
 		"  --verify-pin2 <pin>:              Verify PIN2\n" \