From: Bert Vermeulen <redacted>
Date: Fri, 5 Sep 2014 10:50:07 +0000 (+0200)
Subject: scpi-pps: Use regex to match model names.
X-Git-Tag: libsigrok-0.4.0~1035
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=58b77c41ff815d0157c58d052dfed9b087db42d8;p=libsigrok.git

scpi-pps: Use regex to match model names.
---

diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index cf161710..31e7ca6c 100644
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -45,6 +45,8 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	const struct scpi_pps *device;
 	const struct channel_group_spec *cgs;
 	struct pps_channel_group *pcg;
+	GRegex *model_re;
+	GMatchInfo *model_mi;
 	uint64_t mask;
 	unsigned int i, j;
 	const char *vendor;
@@ -57,20 +59,23 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	device = NULL;
 	for (i = 0; i < num_pps_profiles; i++) {
 		vendor = get_vendor(hw_info->manufacturer);
-		if (strcasecmp(vendor, pps_profiles[i].idn_vendor))
+		if (strcasecmp(vendor, pps_profiles[i].vendor))
 			continue;
-		if (!strcmp(hw_info->model, pps_profiles[i].idn_model)) {
+		model_re = g_regex_new(pps_profiles[i].model, 0, 0, NULL);
+		if (g_regex_match(model_re, hw_info->model, 0, &model_mi))
 			device = &pps_profiles[i];
+		g_match_info_unref(model_mi);
+		g_regex_unref(model_re);
+		if (device)
 			break;
-		}
 	}
 	if (!device) {
 		sr_scpi_hw_info_free(hw_info);
 		return NULL;
 	}
 
-	sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, vendor,
-			device->idn_model, hw_info->firmware_version);
+	sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, vendor, hw_info->model,
+			hw_info->firmware_version);
 	sdi->conn = scpi;
 	sdi->driver = di;
 	sdi->inst_type = SR_INST_SCPI;
diff --git a/src/hardware/scpi-pps/protocol.h b/src/hardware/scpi-pps/protocol.h
index 25b55cb1..fc332ed7 100644
--- a/src/hardware/scpi-pps/protocol.h
+++ b/src/hardware/scpi-pps/protocol.h
@@ -70,8 +70,8 @@ enum pps_features {
 };
 
 struct scpi_pps {
-	char *idn_vendor;
-	char *idn_model;
+	char *vendor;
+	char *model;
 	uint64_t features;
 	const int32_t *devopts;
 	unsigned int num_devopts;