X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcem-dt-885x%2Fapi.c;h=1b56227e2358b848fdfda8f2cdf334c750cbdab1;hb=0bcfc9dcd83e3bf8200a268782fddad1f15f17a7;hp=7e8c96a5211c626a5be4f70cd20af49db49e07b6;hpb=8fa9368eb41c7cb040a9eaef34aecc9f8a9e6d7e;p=libsigrok.git

diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c
index 7e8c96a5..1b56227e 100644
--- a/hardware/cem-dt-885x/api.c
+++ b/hardware/cem-dt-885x/api.c
@@ -17,8 +17,52 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <string.h>
 #include "protocol.h"
 
+#define SERIALCOMM "9600/8n1"
+/* 23ms is the longest interval between tokens. */
+#define MAX_SCAN_TIME 25 * 1000
+
+static const int32_t hwopts[] = {
+	SR_CONF_CONN,
+};
+
+static const int32_t hwcaps[] = {
+	SR_CONF_SOUNDLEVELMETER,
+	SR_CONF_LIMIT_SAMPLES,
+	SR_CONF_CONTINUOUS,
+	SR_CONF_SPL_WEIGHT_FREQ,
+	SR_CONF_SPL_WEIGHT_TIME,
+	SR_CONF_SPL_MEASUREMENT_RANGE,
+	SR_CONF_DATALOG,
+	SR_CONF_HOLD_MAX,
+	SR_CONF_HOLD_MIN,
+	SR_CONF_POWER_OFF,
+	SR_CONF_DATA_SOURCE,
+};
+
+static const char *weight_freq[] = {
+	"A",
+	"C",
+};
+
+static const char *weight_time[] = {
+	"F",
+	"S",
+};
+
+static const uint64_t meas_ranges[][2] = {
+	{ 30, 130 },
+	{ 30, 80 },
+	{ 50, 100 },
+	{ 80, 130 },
+};
+
+static const char *data_sources[] = {
+	"Live",
+	"Memory",
+};
 SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info;
 static struct sr_dev_driver *di = &cem_dt_885x_driver_info;
 
@@ -31,75 +75,161 @@ static int init(struct sr_context *sr_ctx)
 static GSList *scan(GSList *options)
 {
 	struct drv_context *drvc;
-	GSList *devices;
+	struct dev_context *devc;
+	struct sr_config *src;
+	struct sr_serial_dev_inst *serial;
+	struct sr_dev_inst *sdi;
+	struct sr_channel *ch;
+	GSList *l, *devices;
+	gint64 start;
+	const char *conn;
+	unsigned char c;
+
+	conn = NULL;
+	for (l = options; l; l = l->next) {
+		src = l->data;
+		if (src->key == SR_CONF_CONN)
+			conn = g_variant_get_string(src->data, NULL);
+	}
+	if (!conn)
+		return NULL;
 
-	(void)options;
+	if (!(serial = sr_serial_dev_inst_new(conn, SERIALCOMM)))
+		return NULL;
+
+	if (serial_open(serial, SERIAL_RDONLY | SERIAL_NONBLOCK) != SR_OK)
+		return NULL;
 
 	devices = NULL;
 	drvc = di->priv;
-	drvc->instances = NULL;
+	start = g_get_monotonic_time();
+	while (g_get_monotonic_time() - start < MAX_SCAN_TIME) {
+		if (serial_read(serial, &c, 1) == 1 && c == 0xa5) {
+			/* Found one. */
+			if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "CEM",
+					"DT-885x", NULL)))
+				return NULL;
+
+			if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
+				sr_dbg("Device context malloc failed.");
+				return NULL;
+			}
+			devc->cur_mqflags = 0;
+			devc->recording = -1;
+			devc->cur_meas_range = 0;
+			devc->cur_data_source = DATA_SOURCE_LIVE;
+			devc->enable_data_source_memory = FALSE;
+
+			if (!(sdi->conn = sr_serial_dev_inst_new(conn, SERIALCOMM)))
+				return NULL;
+
+			sdi->inst_type = SR_INST_SERIAL;
+			sdi->priv = devc;
+			sdi->driver = di;
+			if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "SPL")))
+				return NULL;
+			sdi->channels = g_slist_append(sdi->channels, ch);
+			drvc->instances = g_slist_append(drvc->instances, sdi);
+			devices = g_slist_append(devices, sdi);
+			break;
+		}
+		/* It takes about 1ms for a byte to come in. */
+		g_usleep(1000);
+	}
 
-	/* TODO: scan for devices, either based on a SR_CONF_CONN option
-	 * or on a USB scan. */
+	serial_close(serial);
 
 	return devices;
 }
 
 static GSList *dev_list(void)
 {
-	struct drv_context *drvc;
-
-	drvc = di->priv;
-
-	return drvc->instances;
-}
-
-static int dev_clear(void)
-{
-	return std_dev_clear(di, NULL);
+	return ((struct drv_context *)(di->priv))->instances;
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
 {
-	(void)sdi;
+	struct sr_serial_dev_inst *serial;
 
-	/* TODO: get handle from sdi->conn and open it. */
+	serial = sdi->conn;
+	if (serial_open(serial, SERIAL_RDWR) != SR_OK)
+		return SR_ERR;
 
 	sdi->status = SR_ST_ACTIVE;
 
 	return SR_OK;
 }
 
-static int dev_close(struct sr_dev_inst *sdi)
-{
-	(void)sdi;
-
-	/* TODO: get handle from sdi->conn and close it. */
-
-	sdi->status = SR_ST_INACTIVE;
-
-	return SR_OK;
-}
-
 static int cleanup(void)
 {
-	dev_clear();
-
-	/* TODO: free other driver resources, if any. */
-
-	return SR_OK;
+	return std_dev_clear(di, NULL);
 }
 
-static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
+		const struct sr_channel_group *cg)
 {
-	int ret;
+	struct dev_context *devc;
+	GVariant *range[2];
+	uint64_t low, high;
+	int tmp, ret;
 
-	(void)sdi;
-	(void)data;
+	(void)cg;
 
+	if (!sdi)
+		return SR_ERR_ARG;
+
+	devc = sdi->priv;
 	ret = SR_OK;
 	switch (key) {
-	/* TODO */
+	case SR_CONF_LIMIT_SAMPLES:
+		*data = g_variant_new_uint64(devc->limit_samples);
+		break;
+	case SR_CONF_DATALOG:
+		if ((ret = cem_dt_885x_recording_get(sdi, &tmp)) == SR_OK)
+			*data = g_variant_new_boolean(tmp);
+		break;
+	case SR_CONF_SPL_WEIGHT_FREQ:
+		tmp = cem_dt_885x_weight_freq_get(sdi);
+		if (tmp == SR_MQFLAG_SPL_FREQ_WEIGHT_A)
+			*data = g_variant_new_string("A");
+		else if (tmp == SR_MQFLAG_SPL_FREQ_WEIGHT_C)
+			*data = g_variant_new_string("C");
+		else
+			return SR_ERR;
+		break;
+	case SR_CONF_SPL_WEIGHT_TIME:
+		tmp = cem_dt_885x_weight_time_get(sdi);
+		if (tmp == SR_MQFLAG_SPL_TIME_WEIGHT_F)
+			*data = g_variant_new_string("F");
+		else if (tmp == SR_MQFLAG_SPL_TIME_WEIGHT_S)
+			*data = g_variant_new_string("S");
+		else
+			return SR_ERR;
+		break;
+	case SR_CONF_HOLD_MAX:
+		if ((ret = cem_dt_885x_holdmode_get(sdi, &tmp)) == SR_OK)
+			*data = g_variant_new_boolean(tmp == SR_MQFLAG_MAX);
+		break;
+	case SR_CONF_HOLD_MIN:
+		if ((ret = cem_dt_885x_holdmode_get(sdi, &tmp)) == SR_OK)
+			*data = g_variant_new_boolean(tmp == SR_MQFLAG_MIN);
+		break;
+	case SR_CONF_SPL_MEASUREMENT_RANGE:
+		if ((ret = cem_dt_885x_meas_range_get(sdi, &low, &high)) == SR_OK) {
+			range[0] = g_variant_new_uint64(low);
+			range[1] = g_variant_new_uint64(high);
+			*data = g_variant_new_tuple(range, 2);
+		}
+		break;
+	case SR_CONF_POWER_OFF:
+		*data = g_variant_new_boolean(FALSE);
+		break;
+	case SR_CONF_DATA_SOURCE:
+		if (devc->cur_data_source == DATA_SOURCE_LIVE)
+			*data = g_variant_new_string("Live");
+		else
+			*data = g_variant_new_string("Memory");
+		break;
 	default:
 		return SR_ERR_NA;
 	}
@@ -107,18 +237,89 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
 	return ret;
 }
 
-static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
+		const struct sr_channel_group *cg)
 {
-	int ret;
+	struct dev_context *devc;
+	uint64_t tmp_u64, low, high;
+	unsigned int i;
+	int tmp, ret;
+	const char *tmp_str;
 
-	(void)data;
+	(void)cg;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
+	if (!(devc = sdi->priv)) {
+		sr_err("sdi->priv was NULL.");
+		return SR_ERR_BUG;
+	}
+
 	ret = SR_OK;
 	switch (key) {
-	/* TODO */
+	case SR_CONF_LIMIT_SAMPLES:
+		tmp_u64 = g_variant_get_uint64(data);
+		devc->limit_samples = tmp_u64;
+		ret = SR_OK;
+		break;
+	case SR_CONF_DATALOG:
+		ret = cem_dt_885x_recording_set(sdi, g_variant_get_boolean(data));
+		break;
+	case SR_CONF_SPL_WEIGHT_FREQ:
+		tmp_str = g_variant_get_string(data, NULL);
+		if (!strcmp(tmp_str, "A"))
+			ret = cem_dt_885x_weight_freq_set(sdi,
+					SR_MQFLAG_SPL_FREQ_WEIGHT_A);
+		else if (!strcmp(tmp_str, "C"))
+			ret = cem_dt_885x_weight_freq_set(sdi,
+					SR_MQFLAG_SPL_FREQ_WEIGHT_C);
+		else
+			return SR_ERR_ARG;
+		break;
+	case SR_CONF_SPL_WEIGHT_TIME:
+		tmp_str = g_variant_get_string(data, NULL);
+		if (!strcmp(tmp_str, "F"))
+			ret = cem_dt_885x_weight_time_set(sdi,
+					SR_MQFLAG_SPL_TIME_WEIGHT_F);
+		else if (!strcmp(tmp_str, "S"))
+			ret = cem_dt_885x_weight_time_set(sdi,
+					SR_MQFLAG_SPL_TIME_WEIGHT_S);
+		else
+			return SR_ERR_ARG;
+		break;
+	case SR_CONF_HOLD_MAX:
+		tmp = g_variant_get_boolean(data) ? SR_MQFLAG_MAX : 0;
+		ret = cem_dt_885x_holdmode_set(sdi, tmp);
+		break;
+	case SR_CONF_HOLD_MIN:
+		tmp = g_variant_get_boolean(data) ? SR_MQFLAG_MIN : 0;
+		ret = cem_dt_885x_holdmode_set(sdi, tmp);
+		break;
+	case SR_CONF_SPL_MEASUREMENT_RANGE:
+		g_variant_get(data, "(tt)", &low, &high);
+		ret = SR_ERR_ARG;
+		for (i = 0; i < ARRAY_SIZE(meas_ranges); i++) {
+			if (meas_ranges[i][0] == low && meas_ranges[i][1] == high) {
+				ret = cem_dt_885x_meas_range_set(sdi, low, high);
+				break;
+			}
+		}
+		break;
+	case SR_CONF_POWER_OFF:
+		if (g_variant_get_boolean(data))
+			ret = cem_dt_885x_power_off(sdi);
+		break;
+	case SR_CONF_DATA_SOURCE:
+		tmp_str = g_variant_get_string(data, NULL);
+		if (!strcmp(tmp_str, "Live"))
+			devc->cur_data_source = DATA_SOURCE_LIVE;
+		else if (!strcmp(tmp_str, "Memory"))
+			devc->cur_data_source = DATA_SOURCE_MEMORY;
+		else
+			return SR_ERR;
+		devc->enable_data_source_memory = devc->cur_data_source == DATA_SOURCE_MEMORY;
+		break;
 	default:
 		ret = SR_ERR_NA;
 	}
@@ -126,16 +327,46 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
 	return ret;
 }
 
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+		const struct sr_channel_group *cg)
 {
+	GVariant *tuple, *range[2];
+	GVariantBuilder gvb;
+	unsigned int i;
 	int ret;
 
 	(void)sdi;
-	(void)data;
+	(void)cg;
 
 	ret = SR_OK;
 	switch (key) {
-	/* TODO */
+	case SR_CONF_SCAN_OPTIONS:
+		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+				hwopts, ARRAY_SIZE(hwopts), sizeof(int32_t));
+		break;
+	case SR_CONF_DEVICE_OPTIONS:
+		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+				hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
+		break;
+	case SR_CONF_SPL_WEIGHT_FREQ:
+		*data = g_variant_new_strv(weight_freq, ARRAY_SIZE(weight_freq));
+		break;
+	case SR_CONF_SPL_WEIGHT_TIME:
+		*data = g_variant_new_strv(weight_time, ARRAY_SIZE(weight_time));
+		break;
+	case SR_CONF_SPL_MEASUREMENT_RANGE:
+		g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+		for (i = 0; i < ARRAY_SIZE(meas_ranges); i++) {
+			range[0] = g_variant_new_uint64(meas_ranges[i][0]);
+			range[1] = g_variant_new_uint64(meas_ranges[i][1]);
+			tuple = g_variant_new_tuple(range, 2);
+			g_variant_builder_add_value(&gvb, tuple);
+		}
+		*data = g_variant_builder_end(&gvb);
+		break;
+	case SR_CONF_DATA_SOURCE:
+		*data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources));
+		break;
 	default:
 		return SR_ERR_NA;
 	}
@@ -143,17 +374,31 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
 	return ret;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi,
-				    void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
-	(void)sdi;
-	(void)cb_data;
+	struct dev_context *devc;
+	struct sr_serial_dev_inst *serial;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	/* TODO: configure hardware, reset acquisition state, set up
-	 * callbacks and send header packet. */
+	if (!(devc = sdi->priv)) {
+		sr_err("sdi->priv was NULL.");
+		return SR_ERR_BUG;
+	}
+
+	devc->cb_data = cb_data;
+	devc->state = ST_INIT;
+	devc->num_samples = 0;
+	devc->buf_len = 0;
+
+	/* 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. */
+	serial = sdi->conn;
+	serial_source_add(serial, G_IO_IN, 150, cem_dt_885x_receive_data,
+			(void *)sdi);
 
 	return SR_OK;
 }
@@ -165,9 +410,8 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	/* TODO: stop acquisition. */
-
-	return SR_OK;
+	return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
+			sdi->conn, LOG_PREFIX);
 }
 
 SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info = {
@@ -178,12 +422,12 @@ SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info = {
 	.cleanup = cleanup,
 	.scan = scan,
 	.dev_list = dev_list,
-	.dev_clear = dev_clear,
+	.dev_clear = NULL,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,
 	.dev_open = dev_open,
-	.dev_close = dev_close,
+	.dev_close = std_serial_dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.priv = NULL,