hwdriver: Introduce sr_config_commit() API call.

[libsigrok.git] / hwdriver.c

diff --git a/hwdriver.c b/hwdriver.c
index 7f820766b0cb5755ad3b46639c516d2abd6ab7c1..88b6f638e04722903a96ab79164f6f282a36598d 100644 (file)
--- 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",
@@ -100,8 +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_MAX_UNCOMPRESSED_SAMPLES, SR_T_UINT64, "max_uncompressed_samples",
-               "Maximum number of uncompressed samples", 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},
 };
 
@@ -110,7 +126,7 @@ static struct sr_config_info sr_config_info_data[] = {
 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_pps3xxx_driver_info;
+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;
@@ -162,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
@@ -256,7 +275,7 @@ static struct sr_dev_driver *drivers_list[] = {
        &appa_55ii_driver_info,
 #endif
 #ifdef HAVE_HW_ATTEN_PPS3XXX
-       &atten_pps3xxx_driver_info,
+       &atten_pps3203_driver_info,
 #endif
 #ifdef HAVE_HW_BRYMEN_DMM
        &brymen_bm857_driver_info,
@@ -308,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
@@ -611,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.
  *