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

diff --git a/hwdriver.c b/hwdriver.c
index cf590cd0..804838c8 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -1,7 +1,7 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,14 +27,14 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "hwdriver: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "hwdriver: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
 /**
  * @file
@@ -61,6 +61,12 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Pre-trigger capture ratio", NULL},
 	{SR_CONF_PATTERN_MODE, SR_T_CHAR, "pattern",
 		"Pattern generator mode", NULL},
+	{SR_CONF_TRIGGER_TYPE, SR_T_CHAR, "triggertype",
+		"Trigger types", NULL},
+	{SR_CONF_EXTERNAL_CLOCK, SR_T_BOOL, "external_clock",
+		"External clock mode", NULL},
+	{SR_CONF_SWAP, SR_T_BOOL, "swap",
+		"Swap channel order", NULL},
 	{SR_CONF_RLE, SR_T_BOOL, "rle",
 		"Run Length Encoding", NULL},
 	{SR_CONF_TRIGGER_SLOPE, SR_T_UINT64, "triggerslope",
@@ -79,6 +85,24 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Volts/div", NULL},
 	{SR_CONF_COUPLING, SR_T_CHAR, "coupling",
 		"Coupling", NULL},
+	{SR_CONF_DATALOG, SR_T_BOOL, "datalog",
+		"Datalog", NULL},
+	{SR_CONF_SPL_WEIGHT_FREQ, SR_T_CHAR, "spl_weight_freq",
+		"Sound pressure level frequency weighting", NULL},
+	{SR_CONF_SPL_WEIGHT_TIME, SR_T_CHAR, "spl_weight_time",
+		"Sound pressure level time weighting", NULL},
+	{SR_CONF_HOLD_MAX, SR_T_BOOL, "hold_max",
+		"Hold max", NULL},
+	{SR_CONF_HOLD_MIN, SR_T_BOOL, "hold_min",
+		"Hold min", NULL},
+	{SR_CONF_SPL_MEASUREMENT_RANGE, SR_T_UINT64_RANGE, "spl_meas_range",
+		"Sound pressure level measurement range", NULL},
+	{SR_CONF_VOLTAGE_THRESHOLD, SR_T_DOUBLE_RANGE, "voltage_threshold",
+		"Voltage threshold", NULL },
+	{SR_CONF_POWER_OFF, SR_T_BOOL, "power_off",
+		"Power off", NULL},
+	{SR_CONF_DATA_SOURCE, SR_T_CHAR, "data_source",
+		"Data source", NULL},
 	{0, 0, NULL, NULL, NULL},
 };
 
@@ -86,12 +110,31 @@ static struct sr_config_info sr_config_info_data[] = {
 #ifdef HAVE_HW_BRYMEN_DMM
 extern SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
 #endif
+#ifdef HAVE_HW_CEM_DT_885X
+extern SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info;
+#endif
+#ifdef HAVE_HW_CENTER_3XX
+extern SR_PRIV struct sr_dev_driver center_309_driver_info;
+extern SR_PRIV struct sr_dev_driver voltcraft_k204_driver_info;
+#endif
 #ifdef HAVE_HW_COLEAD_SLM
 extern SR_PRIV struct sr_dev_driver colead_slm_driver_info;
 #endif
-#ifdef HAVE_LA_DEMO
+#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
+#ifdef HAVE_HW_IKALOGIC_SCANAPLUS
+extern SR_PRIV struct sr_dev_driver ikalogic_scanaplus_driver_info;
+#endif
+#ifdef HAVE_HW_KECHENG_KC_330B
+extern SR_PRIV struct sr_dev_driver kecheng_kc_330b_driver_info;
+#endif
 #ifdef HAVE_HW_LASCAR_EL_USB
 extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
 #endif
@@ -99,37 +142,46 @@ extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
 extern SR_PRIV struct sr_dev_driver mic_98581_driver_info;
 extern SR_PRIV struct sr_dev_driver mic_98583_driver_info;
 #endif
-#ifdef HAVE_HW_NEXUS_OSCIPRIME
-extern SR_PRIV struct sr_dev_driver nexus_osciprime_driver_info;
+#ifdef HAVE_HW_NORMA_DMM
+extern SR_PRIV struct sr_dev_driver norma_dmm_driver_info;
 #endif
-#ifdef HAVE_LA_OLS
+#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;
+#endif
+#ifdef HAVE_HW_TELEINFO
+extern SR_PRIV struct sr_dev_driver teleinfo_driver_info;
 #endif
 #ifdef HAVE_HW_TONDAJ_SL_814
 extern SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info;
 #endif
+#ifdef HAVE_HW_UNI_T_UT32X
+extern SR_PRIV struct sr_dev_driver uni_t_ut32x_driver_info;
+#endif
 #ifdef HAVE_HW_VICTOR_DMM
 extern SR_PRIV struct sr_dev_driver victor_dmm_driver_info;
 #endif
-#ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE
+#ifdef HAVE_HW_ZEROPLUS_LOGIC_CUBE
 extern SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info;
 #endif
-#ifdef HAVE_LA_ASIX_SIGMA
+#ifdef HAVE_HW_ASIX_SIGMA
 extern SR_PRIV struct sr_dev_driver asix_sigma_driver_info;
 #endif
-#ifdef HAVE_LA_CHRONOVU_LA8
+#ifdef HAVE_HW_CHRONOVU_LA8
 extern SR_PRIV struct sr_dev_driver chronovu_la8_driver_info;
 #endif
-#ifdef HAVE_LA_LINK_MSO19
+#ifdef HAVE_HW_LINK_MSO19
 extern SR_PRIV struct sr_dev_driver link_mso19_driver_info;
 #endif
 #ifdef HAVE_HW_ALSA
 extern SR_PRIV struct sr_dev_driver alsa_driver_info;
 #endif
-#ifdef HAVE_LA_FX2LAFW
+#ifdef HAVE_HW_FX2LAFW
 extern SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
 #endif
 #ifdef HAVE_HW_HANTEK_DSO
@@ -149,17 +201,34 @@ extern SR_PRIV struct sr_dev_driver peaktech_3410_driver_info;
 extern SR_PRIV struct sr_dev_driver mastech_mas345_driver_info;
 extern SR_PRIV struct sr_dev_driver va_va18b_driver_info;
 extern SR_PRIV struct sr_dev_driver metex_m3640d_driver_info;
+extern SR_PRIV struct sr_dev_driver metex_m4650cr_driver_info;
 extern SR_PRIV struct sr_dev_driver peaktech_4370_driver_info;
 extern SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info;
 extern SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info;
+extern SR_PRIV struct sr_dev_driver radioshack_22_805_driver_info;
 extern SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info;
+extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver voltcraft_m3650d_driver_info;
+extern SR_PRIV struct sr_dev_driver voltcraft_m4650cr_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver voltcraft_vc830_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc840_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver uni_t_ut60a_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver uni_t_ut60e_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;
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
+extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info;
+extern SR_PRIV struct sr_dev_driver uni_t_ut60a_driver_info;
+extern SR_PRIV struct sr_dev_driver uni_t_ut60e_driver_info;
 extern SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
+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 */
 
@@ -167,12 +236,31 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_BRYMEN_DMM
 	&brymen_bm857_driver_info,
 #endif
+#ifdef HAVE_HW_CEM_DT_885X
+	&cem_dt_885x_driver_info,
+#endif
+#ifdef HAVE_HW_CENTER_3XX
+	&center_309_driver_info,
+	&voltcraft_k204_driver_info,
+#endif
 #ifdef HAVE_HW_COLEAD_SLM
 	&colead_slm_driver_info,
 #endif
-#ifdef HAVE_LA_DEMO
+#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
+#ifdef HAVE_HW_IKALOGIC_SCANAPLUS
+	&ikalogic_scanaplus_driver_info,
+#endif
+#ifdef HAVE_HW_KECHENG_KC_330B
+	&kecheng_kc_330b_driver_info,
+#endif
 #ifdef HAVE_HW_LASCAR_EL_USB
 	&lascar_el_usb_driver_info,
 #endif
@@ -180,37 +268,46 @@ static struct sr_dev_driver *drivers_list[] = {
 	&mic_98581_driver_info,
 	&mic_98583_driver_info,
 #endif
-#ifdef HAVE_HW_NEXUS_OSCIPRIME
-	&nexus_osciprime_driver_info,
+#ifdef HAVE_HW_NORMA_DMM
+	&norma_dmm_driver_info,
 #endif
-#ifdef HAVE_LA_OLS
+#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,
+#endif
+#ifdef HAVE_HW_TELEINFO
+	&teleinfo_driver_info,
 #endif
 #ifdef HAVE_HW_TONDAJ_SL_814
 	&tondaj_sl_814_driver_info,
 #endif
+#ifdef HAVE_HW_UNI_T_UT32X
+	&uni_t_ut32x_driver_info,
+#endif
 #ifdef HAVE_HW_VICTOR_DMM
 	&victor_dmm_driver_info,
 #endif
-#ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE
+#ifdef HAVE_HW_ZEROPLUS_LOGIC_CUBE
 	&zeroplus_logic_cube_driver_info,
 #endif
-#ifdef HAVE_LA_ASIX_SIGMA
+#ifdef HAVE_HW_ASIX_SIGMA
 	&asix_sigma_driver_info,
 #endif
-#ifdef HAVE_LA_CHRONOVU_LA8
+#ifdef HAVE_HW_CHRONOVU_LA8
 	&chronovu_la8_driver_info,
 #endif
-#ifdef HAVE_LA_LINK_MSO19
+#ifdef HAVE_HW_LINK_MSO19
 	&link_mso19_driver_info,
 #endif
 #ifdef HAVE_HW_ALSA
 	&alsa_driver_info,
 #endif
-#ifdef HAVE_LA_FX2LAFW
+#ifdef HAVE_HW_FX2LAFW
 	&fx2lafw_driver_info,
 #endif
 #ifdef HAVE_HW_HANTEK_DSO
@@ -230,17 +327,34 @@ static struct sr_dev_driver *drivers_list[] = {
 	&mastech_mas345_driver_info,
 	&va_va18b_driver_info,
 	&metex_m3640d_driver_info,
+	&metex_m4650cr_driver_info,
 	&peaktech_4370_driver_info,
 	&pce_pce_dm32_driver_info,
 	&radioshack_22_168_driver_info,
+	&radioshack_22_805_driver_info,
 	&radioshack_22_812_driver_info,
+	&tecpel_dmm_8061_ser_driver_info,
+	&voltcraft_m3650d_driver_info,
+	&voltcraft_m4650cr_driver_info,
 	&voltcraft_vc820_ser_driver_info,
+	&voltcraft_vc830_ser_driver_info,
 	&voltcraft_vc840_ser_driver_info,
+	&uni_t_ut60a_ser_driver_info,
+	&uni_t_ut60e_ser_driver_info,
+	&uni_t_ut61d_ser_driver_info,
 	&uni_t_ut61e_ser_driver_info,
+	&iso_tech_idm103n_driver_info,
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
+	&tecpel_dmm_8061_driver_info,
+	&uni_t_ut60a_driver_info,
+	&uni_t_ut60e_driver_info,
 	&uni_t_ut61d_driver_info,
+	&uni_t_ut61e_driver_info,
 	&voltcraft_vc820_driver_info,
+	&voltcraft_vc830_driver_info,
+	&voltcraft_vc840_driver_info,
+	&tenma_72_7745_driver_info,
 #endif
 	NULL,
 };
@@ -351,41 +465,73 @@ SR_PRIV void sr_hw_cleanup_all(void)
 	}
 }
 
-SR_PRIV struct sr_config *sr_config_make(int key, const void *value)
+/** A floating reference can be passed in for data.
+ * @private */
+SR_PRIV struct sr_config *sr_config_new(int key, GVariant *data)
 {
 	struct sr_config *src;
 
 	if (!(src = g_try_malloc(sizeof(struct sr_config))))
 		return NULL;
 	src->key = key;
-	src->value = value;
+	src->data = g_variant_ref_sink(data);
 
 	return src;
 }
 
+/** @private */
+SR_PRIV void sr_config_free(struct sr_config *src)
+{
+
+	if (!src || !src->data) {
+		sr_err("%s: invalid data!", __func__);
+		return;
+	}
+
+	g_variant_unref(src->data);
+	g_free(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 where the value will be stored. Must not be NULL.
- * @param sdi If the key is specific to a device, this must contain a
- *            pointer to the struct sr_dev_inst to be checked.
+ * @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.
  *
  * @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,
-		const void **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;
 
 	if (!driver || !data)
 		return SR_ERR;
 
-	ret = driver->config_get(key, data, sdi);
+	if (!driver->config_get)
+		return SR_ERR_ARG;
+
+	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);
+	}
 
 	return ret;
 }
@@ -394,27 +540,34 @@ 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 value The new value for the key, as a pointer to whatever type
- *        is appropriate for that key.
+ * @param data The new value for the key, as a GVariant with GVariantType
+ *        appropriate to that key. A floating reference can be passed
+ *        in; its refcount will be sunk and unreferenced after use.
  *
  * @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_set(const struct sr_dev_inst *sdi, int key,
-		const void *value)
+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;
 
-	if (!sdi || !sdi->driver || !value)
-		return SR_ERR;
+	g_variant_ref_sink(data);
 
-	if (!sdi->driver->config_set)
-		return SR_ERR_ARG;
+	if (!sdi || !sdi->driver || !data)
+		ret = SR_ERR;
+	else if (!sdi->driver->config_set)
+		ret = SR_ERR_ARG;
+	else
+		ret = sdi->driver->config_set(key, data, sdi, probe_group);
 
-	ret = sdi->driver->config_set(key, value, sdi);
+	g_variant_unref(data);
 
 	return ret;
 }
@@ -423,26 +576,35 @@ SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key,
  * 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 list of values, in whatever format is
- *             appropriate for that key.
- * @param sdi If the key is specific to a device, this must contain a
- *            pointer to the struct sr_dev_inst to be checked.
+ * @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.
  *
  * @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,
-		const void **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;
 
 	if (!driver || !data)
-		return SR_ERR;
-
-	ret = driver->config_list(key, data, sdi);
+		ret = SR_ERR;
+	else if (!driver->config_list)
+		ret = SR_ERR_ARG;
+	else if ((ret = driver->config_list(key, data, sdi, probe_group)) == SR_OK)
+		g_variant_ref_sink(*data);
 
 	return ret;
 }
@@ -450,7 +612,7 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver, int key,
 /**
  * Get information about a configuration key.
  *
- * @param opt The configuration key.
+ * @param key The configuration key.
  *
  * @return A pointer to a struct sr_config_info, or NULL if the key
  *         was not found.