X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fagilent-dmm%2Fapi.c;h=c0b10e0701d131a414ce99e451fafcd31d43ed4f;hb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;hp=0e2bc7d8a357b459342c3935d1eb790b14a326f0;hpb=63f7cb9791d2b5fbd32a897e94790c9a6def8462;p=libsigrok.git

diff --git a/hardware/agilent-dmm/api.c b/hardware/agilent-dmm/api.c
index 0e2bc7d8..c0b10e07 100644
--- a/hardware/agilent-dmm/api.c
+++ b/hardware/agilent-dmm/api.c
@@ -28,24 +28,19 @@
 #include "agilent-dmm.h"
 
 static const int hwopts[] = {
-	SR_HWOPT_CONN,
-	SR_HWOPT_SERIALCOMM,
+	SR_CONF_CONN,
+	SR_CONF_SERIALCOMM,
 	0,
 };
 
 static const int hwcaps[] = {
-	SR_HWCAP_MULTIMETER,
-	SR_HWCAP_LIMIT_SAMPLES,
-	SR_HWCAP_LIMIT_MSEC,
-	SR_HWCAP_CONTINUOUS,
+	SR_CONF_MULTIMETER,
+	SR_CONF_LIMIT_SAMPLES,
+	SR_CONF_LIMIT_MSEC,
+	SR_CONF_CONTINUOUS,
 	0,
 };
 
-static const char *probe_names[] = {
-	"Probe",
-	NULL,
-};
-
 extern const struct agdmm_job agdmm_jobs_u123x[];
 extern const struct agdmm_recv agdmm_recvs_u123x[];
 extern const struct agdmm_job agdmm_jobs_u125x[];
@@ -94,18 +89,9 @@ static int clear_instances(void)
 	return SR_OK;
 }
 
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
 {
-	struct drv_context *drvc;
-
-	if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
-		sr_err("Driver context malloc failed.");
-		return SR_ERR_MALLOC;
-	}
-
-	di->priv = drvc;
-
-	return SR_OK;
+	return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
 }
 
 static GSList *hw_scan(GSList *options)
@@ -113,10 +99,11 @@ static GSList *hw_scan(GSList *options)
 	struct sr_dev_inst *sdi;
 	struct drv_context *drvc;
 	struct dev_context *devc;
-	struct sr_hwopt *opt;
+	struct sr_config *src;
 	struct sr_probe *probe;
+	struct sr_serial_dev_inst *serial;
 	GSList *l, *devices;
-	int len, fd, i;
+	int len, i;
 	const char *conn, *serialcomm;
 	char *buf, **tokens;
 
@@ -126,34 +113,29 @@ static GSList *hw_scan(GSList *options)
 	devices = NULL;
 	conn = serialcomm = NULL;
 	for (l = options; l; l = l->next) {
-		opt = l->data;
-		switch (opt->hwopt) {
-		case SR_HWOPT_CONN:
-			conn = opt->value;
+		src = l->data;
+		switch (src->key) {
+		case SR_CONF_CONN:
+			conn = src->value;
 			break;
-		case SR_HWOPT_SERIALCOMM:
-			serialcomm = opt->value;
+		case SR_CONF_SERIALCOMM:
+			serialcomm = src->value;
 			break;
 		}
 	}
 	if (!conn)
 		return NULL;
+	if (!serialcomm)
+		serialcomm = SERIALCOMM;
 
-	if ((fd = serial_open(conn, O_RDWR|O_NONBLOCK)) == -1) {
-		sr_err("Unable to open %s: %s.", conn, strerror(errno));
+	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
 		return NULL;
-	}
 
-	if (!serialcomm)
-		serialcomm = SERIALCOMM;
-	if (serial_set_paramstr(fd, serialcomm) != SR_OK) {
-		sr_err("Unable to set serial parameters: %s.",
-		       strerror(errno));
+	if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
 		return NULL;
-	}
 
-	serial_flush(fd);
-	if (serial_write(fd, "*IDN?\r\n", 7) == -1) {
+	serial_flush(serial);
+	if (serial_write(serial, "*IDN?\r\n", 7) == -1) {
 		sr_err("Unable to send identification string: %s.",
 		       strerror(errno));
 		return NULL;
@@ -164,7 +146,7 @@ static GSList *hw_scan(GSList *options)
 		sr_err("Serial buffer malloc failed.");
 		return NULL;
 	}
-	serial_readline(fd, &buf, &len, 150);
+	serial_readline(serial, &buf, &len, 150);
 	if (!len)
 		return NULL;
 
@@ -182,7 +164,7 @@ static GSList *hw_scan(GSList *options)
 				return NULL;
 			}
 			devc->profile = &supported_agdmm[i];
-			devc->serial = sr_serial_dev_inst_new(conn, -1);
+			devc->serial = serial;
 			devc->cur_mq = -1;
 			sdi->priv = devc;
 			sdi->driver = di;
@@ -197,18 +179,16 @@ static GSList *hw_scan(GSList *options)
 	g_strfreev(tokens);
 	g_free(buf);
 
-	serial_close(fd);
+	serial_close(serial);
+	if (!devices)
+		sr_serial_dev_inst_free(serial);
 
 	return devices;
 }
 
 static GSList *hw_dev_list(void)
 {
-	struct drv_context *drvc;
-
-	drvc = di->priv;
-
-	return drvc->instances;
+	return ((struct drv_context *)(di->priv))->instances;
 }
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
@@ -220,13 +200,9 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
 		return SR_ERR_BUG;
 	}
 
-	devc->serial->fd = serial_open(devc->serial->port, O_RDWR | O_NONBLOCK);
-	if (devc->serial->fd == -1) {
-		sr_err("Couldn't open serial port '%s'.",
-		       devc->serial->port);
+	if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
 		return SR_ERR;
-	}
-	serial_set_paramstr(devc->serial->fd, SERIALCOMM);
+
 	sdi->status = SR_ST_ACTIVE;
 
 	return SR_OK;
@@ -236,14 +212,10 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 
-	if (!(devc = sdi->priv)) {
-		sr_err("sdi->priv was NULL.");
-		return SR_ERR_BUG;
-	}
+	devc = sdi->priv;
 
 	if (devc->serial && devc->serial->fd != -1) {
-		serial_close(devc->serial->fd);
-		devc->serial->fd = -1;
+		serial_close(devc->serial);
 		sdi->status = SR_ST_INACTIVE;
 	}
 
@@ -258,34 +230,7 @@ static int hw_cleanup(void)
 	return SR_OK;
 }
 
-static int hw_info_get(int info_id, const void **data,
-       const struct sr_dev_inst *sdi)
-{
-
-	(void)sdi;
-
-	switch (info_id) {
-	case SR_DI_HWOPTS:
-		*data = hwopts;
-		break;
-	case SR_DI_HWCAPS:
-		*data = hwcaps;
-		break;
-	case SR_DI_NUM_PROBES:
-		*data = GINT_TO_POINTER(1);
-		break;
-	case SR_DI_PROBE_NAMES:
-		*data = probe_names;
-		break;
-	default:
-		return SR_ERR_ARG;
-	}
-
-	return SR_OK;
-}
-
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
-		const void *value)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 
@@ -297,8 +242,8 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		return SR_ERR_BUG;
 	}
 
-	switch (hwcap) {
-	case SR_HWCAP_LIMIT_MSEC:
+	switch (id) {
+	case SR_CONF_LIMIT_MSEC:
 		/* TODO: not yet implemented */
 		if (*(const uint64_t *)value == 0) {
 			sr_err("LIMIT_MSEC can't be 0.");
@@ -308,13 +253,13 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		sr_dbg("Setting time limit to %" PRIu64 "ms.",
 		       devc->limit_msec);
 		break;
-	case SR_HWCAP_LIMIT_SAMPLES:
+	case SR_CONF_LIMIT_SAMPLES:
 		devc->limit_samples = *(const uint64_t *)value;
 		sr_dbg("Setting sample limit to %" PRIu64 ".",
 		       devc->limit_samples);
 		break;
 	default:
-		sr_err("Unknown capability: %d.", hwcap);
+		sr_err("Unknown capability: %d.", id);
 		return SR_ERR;
 		break;
 	}
@@ -322,12 +267,28 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 	return SR_OK;
 }
 
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+
+	(void)sdi;
+
+	switch (key) {
+	case SR_CONF_SCAN_OPTIONS:
+		*data = hwopts;
+		break;
+	case SR_CONF_DEVICE_OPTIONS:
+		*data = hwcaps;
+		break;
+	default:
+		return SR_ERR_ARG;
+	}
+
+	return SR_OK;
+}
+
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 		void *cb_data)
 {
-	struct sr_datafeed_packet packet;
-	struct sr_datafeed_header header;
-	struct sr_datafeed_meta_analog meta;
 	struct dev_context *devc;
 
 	if (!(devc = sdi->priv)) {
@@ -335,24 +296,10 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 		return SR_ERR_BUG;
 	}
 
-	sr_dbg("Starting acquisition.");
-
 	devc->cb_data = cb_data;
 
 	/* Send header packet to the session bus. */
-	sr_dbg("Sending SR_DF_HEADER.");
-	packet.type = SR_DF_HEADER;
-	packet.payload = (uint8_t *)&header;
-	header.feed_version = 1;
-	gettimeofday(&header.starttime, NULL);
-	sr_session_send(devc->cb_data, &packet);
-
-	/* Send metadata about the SR_DF_ANALOG packets to come. */
-	sr_dbg("Sending SR_DF_META_ANALOG.");
-	packet.type = SR_DF_META_ANALOG;
-	packet.payload = &meta;
-	meta.num_probes = 1;
-	sr_session_send(devc->cb_data, &packet);
+	std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
 
 	/* Poll every 100ms, or whenever some data comes in. */
 	sr_source_add(devc->serial->fd, G_IO_IN, 100, agdmm_receive_data, (void *)sdi);
@@ -396,10 +343,10 @@ SR_PRIV struct sr_dev_driver agdmm_driver_info = {
 	.scan = hw_scan,
 	.dev_list = hw_dev_list,
 	.dev_clear = clear_instances,
+	.config_set = config_set,
+	.config_list = config_list,
 	.dev_open = hw_dev_open,
 	.dev_close = hw_dev_close,
-	.info_get = hw_info_get,
-	.dev_config_set = hw_dev_config_set,
 	.dev_acquisition_start = hw_dev_acquisition_start,
 	.dev_acquisition_stop = hw_dev_acquisition_stop,
 	.priv = NULL,