X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hwdriver.c;h=302ffdc5196eba6a19127cc6e7e5bda615942a2b;hb=464d49360a02c6b378ebaf5ef38f4bb4536dd5ee;hp=6ff5ebc59860fd1e0e9c519cddc55792dad5d953;hpb=4104ef810e56cd68ccfd66919a24e9e8c572ef58;p=libsigrok.git

diff --git a/hwdriver.c b/hwdriver.c
index 6ff5ebc5..302ffdc5 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -53,7 +53,7 @@ static struct sr_config_info sr_config_info_data[] = {
 	{SR_CONF_CAPTURE_RATIO, SR_T_UINT64, "captureratio",
 		"Pre-trigger capture ratio", NULL},
 	{SR_CONF_PATTERN_MODE, SR_T_CHAR, "pattern",
-		"Pattern generator mode", NULL},
+		"Pattern", NULL},
 	{SR_CONF_TRIGGER_TYPE, SR_T_CHAR, "triggertype",
 		"Trigger types", NULL},
 	{SR_CONF_EXTERNAL_CLOCK, SR_T_BOOL, "external_clock",
@@ -62,7 +62,7 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Swap channel order", NULL},
 	{SR_CONF_RLE, SR_T_BOOL, "rle",
 		"Run Length Encoding", NULL},
-	{SR_CONF_TRIGGER_SLOPE, SR_T_UINT64, "triggerslope",
+	{SR_CONF_TRIGGER_SLOPE, SR_T_CHAR, "triggerslope",
 		"Trigger slope", NULL},
 	{SR_CONF_TRIGGER_SOURCE, SR_T_CHAR, "triggersource",
 		"Trigger source", NULL},
@@ -100,6 +100,24 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Number of logic probes", NULL},
 	{SR_CONF_NUM_ANALOG_PROBES, SR_T_INT32, "analog_probes",
 		"Number of analog probes", NULL},
+	{SR_CONF_OUTPUT_VOLTAGE, SR_T_FLOAT, "output_voltage",
+		"Current output voltage", NULL},
+	{SR_CONF_OUTPUT_VOLTAGE_MAX, SR_T_FLOAT, "output_voltage_max",
+		"Maximum output voltage", NULL},
+	{SR_CONF_OUTPUT_CURRENT, SR_T_FLOAT, "output_current",
+		"Current output current", NULL},
+	{SR_CONF_OUTPUT_CURRENT_MAX, SR_T_FLOAT, "output_current_max",
+		"Maximum output current", NULL},
+	{SR_CONF_OUTPUT_ENABLED, SR_T_BOOL, "output_enabled",
+		"Output enabled", NULL},
+	{SR_CONF_OUTPUT_CHANNEL, SR_T_CHAR, "output_channel",
+		"Output channel modes", NULL},
+	{SR_CONF_OVER_VOLTAGE_PROTECTION, SR_T_BOOL, "ovp",
+		"Over-voltage protection", NULL},
+	{SR_CONF_OVER_CURRENT_PROTECTION, SR_T_BOOL, "ocp",
+		"Over-current protection", NULL},
+	{SR_CONF_LIMIT_SAMPLES, SR_T_UINT64, "limit_samples",
+		"Sample limit", NULL},
 	{0, 0, NULL, NULL, NULL},
 };
 
@@ -107,6 +125,9 @@ static struct sr_config_info sr_config_info_data[] = {
 #ifdef HAVE_HW_APPA_55II
 extern SR_PRIV struct sr_dev_driver appa_55ii_driver_info;
 #endif
+#ifdef HAVE_HW_ATTEN_PPS3XXX
+extern SR_PRIV struct sr_dev_driver atten_pps3203_driver_info;
+#endif
 #ifdef HAVE_HW_BRYMEN_DMM
 extern SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
 #endif
@@ -157,6 +178,9 @@ extern SR_PRIV struct sr_dev_driver rigol_ds_driver_info;
 #ifdef HAVE_HW_SALEAE_LOGIC16
 extern SR_PRIV struct sr_dev_driver saleae_logic16_driver_info;
 #endif
+#ifdef HAVE_HW_SYSCLK_LWLA
+extern SR_PRIV struct sr_dev_driver sysclk_lwla_driver_info;
+#endif
 #ifdef HAVE_HW_TELEINFO
 extern SR_PRIV struct sr_dev_driver teleinfo_driver_info;
 #endif
@@ -226,6 +250,8 @@ extern SR_PRIV struct sr_dev_driver uni_t_ut61c_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver uni_t_ut61d_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver iso_tech_idm103n_driver_info;
+extern SR_PRIV struct sr_dev_driver tenma_72_7745_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver tenma_72_7750_ser_driver_info;
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
 extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info;
@@ -240,6 +266,7 @@ extern SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc830_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
 extern SR_PRIV struct sr_dev_driver tenma_72_7745_driver_info;
+extern SR_PRIV struct sr_dev_driver tenma_72_7750_driver_info;
 #endif
 /** @endcond */
 
@@ -247,6 +274,9 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_APPA_55II
 	&appa_55ii_driver_info,
 #endif
+#ifdef HAVE_HW_ATTEN_PPS3XXX
+	&atten_pps3203_driver_info,
+#endif
 #ifdef HAVE_HW_BRYMEN_DMM
 	&brymen_bm857_driver_info,
 #endif
@@ -297,6 +327,9 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_SALEAE_LOGIC16
 	&saleae_logic16_driver_info,
 #endif
+#ifdef HAVE_HW_SYSCLK_LWLA
+	&sysclk_lwla_driver_info,
+#endif
 #ifdef HAVE_HW_TELEINFO
 	&teleinfo_driver_info,
 #endif
@@ -366,6 +399,8 @@ static struct sr_dev_driver *drivers_list[] = {
 	&uni_t_ut61d_ser_driver_info,
 	&uni_t_ut61e_ser_driver_info,
 	&iso_tech_idm103n_driver_info,
+	&tenma_72_7745_ser_driver_info,
+	&tenma_72_7750_ser_driver_info,
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
 	&tecpel_dmm_8061_driver_info,
@@ -380,6 +415,7 @@ static struct sr_dev_driver *drivers_list[] = {
 	&voltcraft_vc830_driver_info,
 	&voltcraft_vc840_driver_info,
 	&tenma_72_7745_driver_info,
+	&tenma_72_7750_driver_info,
 #endif
 	NULL,
 };
@@ -597,6 +633,27 @@ SR_API int sr_config_set(const struct sr_dev_inst *sdi,
 	return ret;
 }
 
+/**
+ * Apply configuration settings to the device hardware.
+ *
+ * @param sdi The device instance.
+ *
+ * @return SR_OK upon success or SR_ERR in case of error.
+ */
+SR_API int sr_config_commit(const struct sr_dev_inst *sdi)
+{
+	int ret;
+
+	if (!sdi || !sdi->driver)
+		ret = SR_ERR;
+	else if (!sdi->driver->config_commit)
+		ret = SR_OK;
+	else
+		ret = sdi->driver->config_commit(sdi);
+
+	return ret;
+}
+
 /**
  * List all possible values for a configuration key.
  *