X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffluke-dmm%2Fapi.c;h=599f1115ef8f6345de5fd16107651496daeb9558;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=e590a4cc8aff6cb4fc4e7a1c014c7c2870e34705;hpb=91219afc75c9aa1d0c5e2da5c03343c1e43eb6df;p=libsigrok.git

diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c
index e590a4cc..599f1115 100644
--- a/src/hardware/fluke-dmm/api.c
+++ b/src/hardware/fluke-dmm/api.c
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
-#include <errno.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "fluke-dmm.h"
 
@@ -40,9 +40,8 @@ static const uint32_t devopts[] = {
 };
 
 SR_PRIV struct sr_dev_driver flukedmm_driver_info;
-static struct sr_dev_driver *di = &flukedmm_driver_info;
 
-static char *scan_conn[] = {
+static const char *scan_conn[] = {
 	/* 287/289 */
 	"115200/8n1",
 	/* 187/189 */
@@ -57,19 +56,20 @@ static const struct flukedmm_profile supported_flukedmm[] = {
 	{ FLUKE_189, "189", 100, 1000 },
 	{ FLUKE_287, "287", 100, 1000 },
 	{ FLUKE_190, "199B", 1000, 3500 },
+	{ FLUKE_289, "289", 100, 1000 },
 };
 
-static int init(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
 	return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
-static GSList *fluke_scan(const char *conn, const char *serialcomm)
+static GSList *fluke_scan(struct sr_dev_driver *di, const char *conn,
+		const char *serialcomm)
 {
 	struct sr_dev_inst *sdi;
 	struct drv_context *drvc;
 	struct dev_context *devc;
-	struct sr_channel *ch;
 	struct sr_serial_dev_inst *serial;
 	GSList *devices;
 	int retry, len, i, s;
@@ -80,7 +80,7 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 	if (serial_open(serial, SERIAL_RDWR) != SR_OK)
 		return NULL;
 
-	drvc = di->priv;
+	drvc = di->context;
 	b = buf;
 	retry = 0;
 	devices = NULL;
@@ -132,8 +132,7 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 				sdi->conn = serial;
 				sdi->priv = devc;
 				sdi->driver = di;
-				ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1");
-				sdi->channels = g_slist_append(sdi->channels, ch);
+				sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
 				drvc->instances = g_slist_append(drvc->instances, sdi);
 				devices = g_slist_append(devices, sdi);
 				break;
@@ -151,7 +150,7 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 	return devices;
 }
 
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
 	struct sr_config *src;
 	GSList *l, *devices;
@@ -176,26 +175,26 @@ static GSList *scan(GSList *options)
 	devices = NULL;
 	if (serialcomm) {
 		/* Use the provided comm specs. */
-		devices = fluke_scan(conn, serialcomm);
+		devices = fluke_scan(di, conn, serialcomm);
 	} else {
 		for (i = 0; scan_conn[i]; i++) {
-			if ((devices = fluke_scan(conn, scan_conn[i])))
+			if ((devices = fluke_scan(di, conn, scan_conn[i])))
 				break;
 			/* The Scopemeter 199B, at least, requires this
 			 * after all the 115k/9.6k confusion. */
-			g_usleep(5000);
+			g_usleep(5 * 1000);
 		}
 	}
 
 	return devices;
 }
 
-static GSList *dev_list(void)
+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 cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
 {
 	return std_dev_clear(di, NULL);
 }
@@ -218,18 +217,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;
@@ -275,7 +266,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 	devc->cb_data = cb_data;
 
-	/* Send header packet to the session bus. */
 	std_session_send_df_header(cb_data, LOG_PREFIX);
 
 	/* Poll every 100ms, or whenever some data comes in. */
@@ -315,5 +305,5 @@ SR_PRIV struct sr_dev_driver flukedmm_driver_info = {
 	.dev_close = std_serial_dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };