X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=439d4c78e9ac6ecdf2a4ef1ead932f288febf798;hb=c50277a6ec09fb35de3a6e0f2ae3401bc72a1526;hp=adbab4e9f258ce33939a60ad5add054178273625;hpb=c89c1c9c211a197f24de7bfd32ecbc873dd66818;p=libsigrok.git

diff --git a/hwdriver.c b/hwdriver.c
index adbab4e9..439d4c78 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -42,33 +42,33 @@
  */
 
 static struct sr_config_info sr_config_info_data[] = {
-	{SR_HWOPT_CONN, SR_T_CHAR, "conn",
+	{SR_CONF_CONN, SR_T_CHAR, "conn",
 		"Connection", NULL},
-	{SR_HWOPT_SERIALCOMM, SR_T_CHAR, "serialcomm",
+	{SR_CONF_SERIALCOMM, SR_T_CHAR, "serialcomm",
 		"Serial communication", NULL},
-	{SR_HWCAP_SAMPLERATE, SR_T_UINT64, "samplerate",
+	{SR_CONF_SAMPLERATE, SR_T_UINT64, "samplerate",
 		"Sample rate", NULL},
-	{SR_HWCAP_CAPTURE_RATIO, SR_T_UINT64, "captureratio",
+	{SR_CONF_CAPTURE_RATIO, SR_T_UINT64, "captureratio",
 		"Pre-trigger capture ratio", NULL},
-	{SR_HWCAP_PATTERN_MODE, SR_T_CHAR, "pattern",
+	{SR_CONF_PATTERN_MODE, SR_T_CHAR, "pattern",
 		"Pattern generator mode", NULL},
-	{SR_HWCAP_RLE, SR_T_BOOL, "rle",
+	{SR_CONF_RLE, SR_T_BOOL, "rle",
 		"Run Length Encoding", NULL},
-	{SR_HWCAP_TRIGGER_SLOPE, SR_T_UINT64, "triggerslope",
+	{SR_CONF_TRIGGER_SLOPE, SR_T_UINT64, "triggerslope",
 		"Trigger slope", NULL},
-	{SR_HWCAP_TRIGGER_SOURCE, SR_T_CHAR, "triggersource",
+	{SR_CONF_TRIGGER_SOURCE, SR_T_CHAR, "triggersource",
 		"Trigger source", NULL},
-	{SR_HWCAP_HORIZ_TRIGGERPOS, SR_T_FLOAT, "horiz_triggerpos",
+	{SR_CONF_HORIZ_TRIGGERPOS, SR_T_FLOAT, "horiz_triggerpos",
 		"Horizontal trigger position", NULL},
-	{SR_HWCAP_BUFFERSIZE, SR_T_UINT64, "buffersize",
+	{SR_CONF_BUFFERSIZE, SR_T_UINT64, "buffersize",
 		"Buffer size", NULL},
-	{SR_HWCAP_TIMEBASE, SR_T_RATIONAL_PERIOD, "timebase",
+	{SR_CONF_TIMEBASE, SR_T_RATIONAL_PERIOD, "timebase",
 		"Time base", NULL},
-	{SR_HWCAP_FILTER, SR_T_CHAR, "filter",
+	{SR_CONF_FILTER, SR_T_CHAR, "filter",
 		"Filter targets", NULL},
-	{SR_HWCAP_VDIV, SR_T_RATIONAL_VOLT, "vdiv",
+	{SR_CONF_VDIV, SR_T_RATIONAL_VOLT, "vdiv",
 		"Volts/div", NULL},
-	{SR_HWCAP_COUPLING, SR_T_CHAR, "coupling",
+	{SR_CONF_COUPLING, SR_T_CHAR, "coupling",
 		"Coupling", NULL},
 	{0, 0, NULL, NULL, NULL},
 };
@@ -307,7 +307,7 @@ SR_PRIV struct sr_config *sr_config_make(int key, const void *value)
  * Returns information about the given driver or device instance.
  *
  * @param driver The sr_dev_driver struct to query.
- * @param id The type of information, in the form of an SR_HWCAP_* option.
+ * @param id The type of information, in the form of an SR_CONF_* option.
  * @param data Pointer where the value. will be stored. Must not be NULL.
  * @param sdi Pointer to the struct sr_dev_inst to be checked. Must not be NULL.
  *
@@ -324,7 +324,23 @@ SR_API int sr_info_get(struct sr_dev_driver *driver, int id,
 	if (driver == NULL || data == NULL)
 		return SR_ERR;
 
-	ret = driver->info_get(id, data, sdi);
+	ret = driver->config_get(id, data, sdi);
+
+	return ret;
+}
+
+SR_API int sr_config_list(struct sr_dev_driver *driver, int id,
+		const void **data, const struct sr_dev_inst *sdi)
+{
+	int ret;
+
+	if (driver == NULL || data == NULL)
+		return SR_ERR;
+
+	if (!driver->config_list)
+		return SR_ERR;
+
+	ret = driver->config_list(id, data, sdi);
 
 	return ret;
 }
@@ -349,7 +365,7 @@ SR_API gboolean sr_driver_hwcap_exists(struct sr_dev_driver *driver, int hwcap)
 		return FALSE;
 	}
 
-	if (driver->info_get(SR_DI_HWCAPS, (const void **)&hwcaps, NULL) != SR_OK)
+	if (driver->config_get(SR_DI_HWCAPS, (const void **)&hwcaps, NULL) != SR_OK)
 		return FALSE;
 
 	for (i = 0; hwcaps[i]; i++) {