X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=804838c8cc7369a7179ecc377cff9c3bf8399204;hb=3086efdd73885820da142ce8c36053bbc3cf0e5f;hp=ff28465111d7af6fd6561b8d7d3b01f173594a75;hpb=88f544f27e56e8cd4a022d3de1f37153b941d158;p=libsigrok.git

diff --git a/hwdriver.c b/hwdriver.c
index ff284651..804838c8 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -123,6 +123,9 @@ extern SR_PRIV struct sr_dev_driver colead_slm_driver_info;
 #ifdef HAVE_HW_DEMO
 extern SR_PRIV struct sr_dev_driver demo_driver_info;
 #endif
+#ifdef HAVE_HW_GMC_MH_1X_2X
+extern SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info;
+#endif
 #ifdef HAVE_HW_IKALOGIC_SCANALOGIC2
 extern SR_PRIV struct sr_dev_driver ikalogic_scanalogic2_driver_info;
 #endif
@@ -145,8 +148,8 @@ extern SR_PRIV struct sr_dev_driver norma_dmm_driver_info;
 #ifdef HAVE_HW_OLS
 extern SR_PRIV struct sr_dev_driver ols_driver_info;
 #endif
-#ifdef HAVE_HW_RIGOL_DS1XX2
-extern SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info;
+#ifdef HAVE_HW_RIGOL_DS
+extern SR_PRIV struct sr_dev_driver rigol_ds_driver_info;
 #endif
 #ifdef HAVE_HW_SALEAE_LOGIC16
 extern SR_PRIV struct sr_dev_driver saleae_logic16_driver_info;
@@ -225,6 +228,7 @@ extern SR_PRIV struct sr_dev_driver uni_t_ut61e_driver_info;
 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;
 #endif
 /** @endcond */
 
@@ -245,6 +249,9 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_DEMO
 	&demo_driver_info,
 #endif
+#ifdef HAVE_HW_GMC_MH_1X_2X
+	&gmc_mh_1x_2x_rs232_driver_info,
+#endif
 #ifdef HAVE_HW_IKALOGIC_SCANALOGIC2
 	&ikalogic_scanalogic2_driver_info,
 #endif
@@ -267,8 +274,8 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_OLS
 	&ols_driver_info,
 #endif
-#ifdef HAVE_HW_RIGOL_DS1XX2
-	&rigol_ds1xx2_driver_info,
+#ifdef HAVE_HW_RIGOL_DS
+	&rigol_ds_driver_info,
 #endif
 #ifdef HAVE_HW_SALEAE_LOGIC16
 	&saleae_logic16_driver_info,
@@ -347,6 +354,7 @@ static struct sr_dev_driver *drivers_list[] = {
 	&voltcraft_vc820_driver_info,
 	&voltcraft_vc830_driver_info,
 	&voltcraft_vc840_driver_info,
+	&tenma_72_7745_driver_info,
 #endif
 	NULL,
 };
@@ -489,23 +497,27 @@ SR_PRIV void sr_config_free(struct sr_config *src)
  * Returns information about the given driver or device instance.
  *
  * @param driver The sr_dev_driver struct to query.
+ * @param sdi (optional) If the key is specific to a device, this must
+ *            contain a pointer to the struct sr_dev_inst to be checked.
+ *            Otherwise it must be NULL.
+ * @param probe_group The probe group on the device for which to list the
+ *                    values, or NULL.
  * @param key The configuration key (SR_CONF_*).
  * @param data Pointer to a GVariant where the value will be stored. Must
  *             not be NULL. The caller is given ownership of the GVariant
  *             and must thus decrease the refcount after use. However if
  *             this function returns an error code, the field should be
  *             considered unused, and should not be unreferenced.
- * @param sdi (optional) If the key is specific to a device, this must
- *            contain a pointer to the struct sr_dev_inst to be checked.
- *            Otherwise it must be NULL.
  *
  * @return SR_OK upon success or SR_ERR in case of error. Note SR_ERR_ARG
  *         may be returned by the driver indicating it doesn't know that key,
  *         but this is not to be flagged as an error by the caller; merely
  *         as an indication that it's not applicable.
  */
-SR_API int sr_config_get(const struct sr_dev_driver *driver, int key,
-		GVariant **data, const struct sr_dev_inst *sdi)
+SR_API int sr_config_get(const struct sr_dev_driver *driver,
+		const struct sr_dev_inst *sdi,
+		const struct sr_probe_group *probe_group,
+		int key, GVariant **data)
 {
 	int ret;
 
@@ -515,7 +527,7 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, int key,
 	if (!driver->config_get)
 		return SR_ERR_ARG;
 
-	if ((ret = driver->config_get(key, data, sdi)) == SR_OK) {
+	if ((ret = driver->config_get(key, data, sdi, probe_group)) == SR_OK) {
 		/* Got a floating reference from the driver. Sink it here,
 		 * caller will need to unref when done with it. */
 		g_variant_ref_sink(*data);
@@ -528,6 +540,8 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, int key,
  * Set a configuration key in a device instance.
  *
  * @param sdi The device instance.
+ * @param probe_group The probe group on the device for which to list the
+ *                    values, or NULL.
  * @param key The configuration key (SR_CONF_*).
  * @param data The new value for the key, as a GVariant with GVariantType
  *        appropriate to that key. A floating reference can be passed
@@ -538,7 +552,9 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, int key,
  *         but this is not to be flagged as an error by the caller; merely
  *         as an indication that it's not applicable.
  */
-SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key, GVariant *data)
+SR_API int sr_config_set(const struct sr_dev_inst *sdi,
+		const struct sr_probe_group *probe_group,
+		int key, GVariant *data)
 {
 	int ret;
 
@@ -549,7 +565,7 @@ SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key, GVariant *data)
 	else if (!sdi->driver->config_set)
 		ret = SR_ERR_ARG;
 	else
-		ret = sdi->driver->config_set(key, data, sdi);
+		ret = sdi->driver->config_set(key, data, sdi, probe_group);
 
 	g_variant_unref(data);
 
@@ -560,22 +576,26 @@ SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key, GVariant *data)
  * List all possible values for a configuration key.
  *
  * @param driver The sr_dev_driver struct to query.
+ * @param sdi (optional) If the key is specific to a device, this must
+ *            contain a pointer to the struct sr_dev_inst to be checked.
+ * @param probe_group The probe group on the device for which to list the
+ *                    values, or NULL.
  * @param key The configuration key (SR_CONF_*).
  * @param data A pointer to a GVariant where the list will be stored. The
  *             caller is given ownership of the GVariant and must thus
  *             unref the GVariant after use. However if this function
  *             returns an error code, the field should be considered
  *             unused, and should not be unreferenced.
- * @param sdi (optional) If the key is specific to a device, this must
- *            contain a pointer to the struct sr_dev_inst to be checked.
  *
  * @return SR_OK upon success or SR_ERR in case of error. Note SR_ERR_ARG
  *         may be returned by the driver indicating it doesn't know that key,
  *         but this is not to be flagged as an error by the caller; merely
  *         as an indication that it's not applicable.
  */
-SR_API int sr_config_list(const struct sr_dev_driver *driver, int key,
-		GVariant **data, const struct sr_dev_inst *sdi)
+SR_API int sr_config_list(const struct sr_dev_driver *driver,
+		const struct sr_dev_inst *sdi,
+		const struct sr_probe_group *probe_group,
+		int key, GVariant **data)
 {
 	int ret;
 
@@ -583,7 +603,7 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver, int key,
 		ret = SR_ERR;
 	else if (!driver->config_list)
 		ret = SR_ERR_ARG;
-	else if ((ret = driver->config_list(key, data, sdi)) == SR_OK)
+	else if ((ret = driver->config_list(key, data, sdi, probe_group)) == SR_OK)
 		g_variant_ref_sink(*data);
 
 	return ret;