Commit 47bbc4b5 authored by Sylvain Pelissier's avatar Sylvain Pelissier Committed by Soeren Apel

SCPI: Ignore IDN header in *IDN? response

parent f55bea76
......@@ -908,6 +908,7 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
char *response;
gchar **tokens;
struct sr_scpi_hw_info *hw_info;
gchar *idn_substr;
response = NULL;
tokens = NULL;
......@@ -936,7 +937,13 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
g_free(response);
hw_info = g_malloc0(sizeof(struct sr_scpi_hw_info));
hw_info->manufacturer = g_strstrip(g_strdup(tokens[0]));
idn_substr = g_strstr_len(tokens[0], -1, "IDN ");
if (idn_substr == NULL)
hw_info->manufacturer = g_strstrip(g_strdup(tokens[0]));
else
hw_info->manufacturer = g_strstrip(g_strdup(idn_substr + 4));
hw_info->model = g_strstrip(g_strdup(tokens[1]));
hw_info->serial_number = g_strstrip(g_strdup(tokens[2]));
hw_info->firmware_version = g_strstrip(g_strdup(tokens[3]));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment