X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fcolead-slm%2Fapi.c;h=cd8647df5f6e4be8456e2d016cde77fd2d942250;hb=1f706c21a2977c768692f72d09b35633628d2b0d;hp=eedffbfbf56097c157ead4fbc5a19f5c88ec352e;hpb=4f840ce965b1c30c5ab75afecc56193cbaf5c1b3;p=libsigrok.git
diff --git a/src/hardware/colead-slm/api.c b/src/hardware/colead-slm/api.c
index eedffbfb..cd8647df 100644
--- a/src/hardware/colead-slm/api.c
+++ b/src/hardware/colead-slm/api.c
@@ -17,15 +17,15 @@
* along with this program. If not, see .
*/
+#include
#include
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-#include "protocol.h"
#include
#include
#include
-#include
#include
+#include
+#include "libsigrok-internal.h"
+#include "protocol.h"
/* The Colead SL-5868P uses this. */
#define SERIALCOMM "2400/8n1"
@@ -58,7 +58,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
GSList *devices, *l;
const char *conn, *serialcomm;
- drvc = di->priv;
+ drvc = di->context;
drvc->instances = NULL;
devices = NULL;
@@ -98,7 +98,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
static GSList *dev_list(const struct sr_dev_driver *di)
{
- return ((struct drv_context *)(di->priv))->instances;
+ return ((struct drv_context *)(di->context))->instances;
}
static int dev_open(struct sr_dev_inst *sdi)
@@ -137,18 +137,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
switch (key) {
case SR_CONF_LIMIT_MSEC:
/* TODO: not yet implemented */
- if (g_variant_get_uint64(data) == 0) {
- sr_err("LIMIT_MSEC can't be 0.");
- return SR_ERR;
- }
devc->limit_msec = g_variant_get_uint64(data);;
- sr_dbg("Setting time limit to %" PRIu64 "ms.",
- devc->limit_msec);
break;
case SR_CONF_LIMIT_SAMPLES:
devc->limit_samples = g_variant_get_uint64(data);
- sr_dbg("Setting sample limit to %" PRIu64 ".",
- devc->limit_samples);
break;
default:
return SR_ERR_NA;
@@ -227,5 +219,5 @@ SR_PRIV struct sr_dev_driver colead_slm_driver_info = {
.dev_close = std_serial_dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};