X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=fd8dc49d174515f0470dac69703ddd841b9f6110;hb=refs%2Ftags%2Fdsupstream;hp=4635f3c4b7ace23bd64b39b295197e3d3d1becbf;hpb=bc1c2f001a3b8499052348ec45155313153b2194;p=libsigrok.git

diff --git a/hwdriver.c b/hwdriver.c
index 4635f3c4..fd8dc49d 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
@@ -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,8 @@ 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_RLE, SR_T_BOOL, "rle",
 		"Run Length Encoding", NULL},
 	{SR_CONF_TRIGGER_SLOPE, SR_T_UINT64, "triggerslope",
@@ -101,9 +103,6 @@ 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;
-#endif
 #ifdef HAVE_LA_OLS
 extern SR_PRIV struct sr_dev_driver ols_driver_info;
 #endif
@@ -125,9 +124,6 @@ extern SR_PRIV struct sr_dev_driver asix_sigma_driver_info;
 #ifdef HAVE_LA_CHRONOVU_LA8
 extern SR_PRIV struct sr_dev_driver chronovu_la8_driver_info;
 #endif
-#ifdef HAVE_LA_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
@@ -156,13 +152,20 @@ 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_8060_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc840_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;
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
+extern SR_PRIV struct sr_dev_driver tecpel_dmm_8060_driver_info;
+extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_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_vc840_driver_info;
 #endif
 /** @endcond */
 
@@ -183,9 +186,6 @@ 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,
-#endif
 #ifdef HAVE_LA_OLS
 	&ols_driver_info,
 #endif
@@ -207,9 +207,6 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_LA_CHRONOVU_LA8
 	&chronovu_la8_driver_info,
 #endif
-#ifdef HAVE_LA_LINK_MSO19
-	&link_mso19_driver_info,
-#endif
 #ifdef HAVE_HW_ALSA
 	&alsa_driver_info,
 #endif
@@ -238,13 +235,20 @@ static struct sr_dev_driver *drivers_list[] = {
 	&radioshack_22_168_driver_info,
 	&radioshack_22_805_driver_info,
 	&radioshack_22_812_driver_info,
+	&tecpel_dmm_8060_ser_driver_info,
+	&tecpel_dmm_8061_ser_driver_info,
 	&voltcraft_vc820_ser_driver_info,
 	&voltcraft_vc840_ser_driver_info,
+	&uni_t_ut61d_ser_driver_info,
 	&uni_t_ut61e_ser_driver_info,
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
+	&tecpel_dmm_8060_driver_info,
+	&tecpel_dmm_8061_driver_info,
 	&uni_t_ut61d_driver_info,
+	&uni_t_ut61e_driver_info,
 	&voltcraft_vc820_driver_info,
+	&voltcraft_vc840_driver_info,
 #endif
 	NULL,
 };
@@ -368,6 +372,19 @@ SR_PRIV struct sr_config *sr_config_new(int key, GVariant *data)
 	return src;
 }
 
+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.
  *
@@ -395,6 +412,9 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, int key,
 	if (!driver || !data)
 		return SR_ERR;
 
+	if (!driver->config_get)
+		return SR_ERR_ARG;
+
 	if ((ret = driver->config_get(key, data, sdi)) == SR_OK) {
 		/* Got a floating reference from the driver. Sink it here,
 		 * caller will need to unref when done with it. */
@@ -459,8 +479,10 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver, int key,
 {
 	int ret;
 
-	if (!driver || !data || !driver->config_list)
+	if (!driver || !data)
 		ret = SR_ERR;
+	else if (!driver->config_list)
+		ret = SR_ERR_ARG;
 	else if ((ret = driver->config_list(key, data, sdi)) == SR_OK)
 		g_variant_ref_sink(*data);