X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fteleinfo%2Fapi.c;h=604dec7c7b2a53bb0e0bac386696b94e61506137;hb=8e2da1a650dade6529668d4b22e906ccec172b17;hp=4d8cecf0c20d3f00d085a918ae40b1b2e4349ba8;hpb=8e796cb438a80c6bcab5d44afaae0c74d757b673;p=libsigrok.git
diff --git a/hardware/teleinfo/api.c b/hardware/teleinfo/api.c
index 4d8cecf0..604dec7c 100644
--- a/hardware/teleinfo/api.c
+++ b/hardware/teleinfo/api.c
@@ -17,8 +17,24 @@
* along with this program. If not, see .
*/
+#include
+#include
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
#include "protocol.h"
+static const int32_t hwopts[] = {
+ SR_CONF_CONN,
+ SR_CONF_SERIALCOMM,
+};
+
+static const int32_t hwcaps[] = {
+ SR_CONF_ENERGYMETER,
+ SR_CONF_LIMIT_SAMPLES,
+ SR_CONF_LIMIT_MSEC,
+ SR_CONF_CONTINUOUS,
+};
+
SR_PRIV struct sr_dev_driver teleinfo_driver_info;
static struct sr_dev_driver *di = &teleinfo_driver_info;
@@ -30,16 +46,120 @@ 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_serial_dev_inst *serial;
+ struct sr_dev_inst *sdi;
+ struct sr_probe *probe;
+ GSList *devices = NULL, *l;
+ const char *conn = NULL, *serialcomm = NULL;
+ uint8_t buf[292];
+ size_t len = sizeof(buf);
+
+ for (l = options; l; l = l->next) {
+ struct sr_config *src = l->data;
+ switch (src->key) {
+ case SR_CONF_CONN:
+ conn = g_variant_get_string(src->data, NULL);
+ break;
+ case SR_CONF_SERIALCOMM:
+ serialcomm = g_variant_get_string(src->data, NULL);
+ break;
+ }
+ }
+ if (!conn)
+ return NULL;
+ if (!serialcomm)
+ serialcomm = "1200/7e1";
+
+ if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
+ return NULL;
+ if (serial_open(serial, SERIAL_RDONLY | SERIAL_NONBLOCK) != SR_OK)
+ return NULL;
- (void)options;
+ sr_info("Probing serial port %s.", conn);
- devices = NULL;
drvc = di->priv;
drvc->instances = NULL;
+ serial_flush(serial);
+
+ /* Let's get a bit of data and see if we can find a packet. */
+ if (serial_stream_detect(serial, buf, &len, len,
+ teleinfo_packet_valid, 3000, 1200) != SR_OK)
+ goto scan_cleanup;
+
+ sr_info("Found device on port %s.", conn);
+
+ if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "EDF", "Teleinfo", "")))
+ goto scan_cleanup;
+
+ if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
+ sr_err("Device context malloc failed.");
+ goto scan_cleanup;
+ }
+
+ devc->optarif = teleinfo_get_optarif(buf);
+
+ sdi->inst_type = SR_INST_SERIAL;
+ sdi->conn = serial;
+ sdi->priv = devc;
+ sdi->driver = di;
+
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P")))
+ goto scan_cleanup;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+
+ if (devc->optarif == OPTARIF_BASE) {
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "BASE")))
+ goto scan_cleanup;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ } else if (devc->optarif == OPTARIF_HC) {
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HP")))
+ goto scan_cleanup;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HC")))
+ goto scan_cleanup;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ } else if (devc->optarif == OPTARIF_EJP) {
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HN")))
+ goto scan_cleanup;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HPM")))
+ goto scan_cleanup;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ } else if (devc->optarif == OPTARIF_BBR) {
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HPJB")))
+ goto scan_cleanup;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HPJW")))
+ goto scan_cleanup;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HPJR")))
+ goto scan_cleanup;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HCJB")))
+ goto scan_cleanup;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HCJW")))
+ goto scan_cleanup;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HCJR")))
+ goto scan_cleanup;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ }
+
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "IINST")))
+ goto scan_cleanup;
+ sdi->probes = g_slist_append(sdi->probes, probe);
- /* TODO: scan for devices, either based on a SR_CONF_CONN option
- * or on a USB scan. */
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "PAPP")))
+ goto scan_cleanup;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+
+ drvc->instances = g_slist_append(drvc->instances, sdi);
+ devices = g_slist_append(devices, sdi);
+
+scan_cleanup:
+ serial_close(serial);
return devices;
}
@@ -56,9 +176,10 @@ static int dev_clear(void)
static int dev_open(struct sr_dev_inst *sdi)
{
- (void)sdi;
+ struct sr_serial_dev_inst *serial = sdi->conn;
- /* TODO: get handle from sdi->conn and open it. */
+ if (serial_open(serial, SERIAL_RDONLY | SERIAL_NONBLOCK) != SR_OK)
+ return SR_ERR;
sdi->status = SR_ST_ACTIVE;
@@ -67,104 +188,107 @@ static int dev_open(struct sr_dev_inst *sdi)
static int dev_close(struct sr_dev_inst *sdi)
{
- (void)sdi;
+ struct sr_serial_dev_inst *serial = sdi->conn;
- /* TODO: get handle from sdi->conn and close it. */
-
- sdi->status = SR_ST_INACTIVE;
+ if (serial && serial->fd != -1) {
+ serial_close(serial);
+ sdi->status = SR_ST_INACTIVE;
+ }
return SR_OK;
}
static int cleanup(void)
{
- dev_clear();
-
- /* TODO: free other driver resources, if any. */
-
- return SR_OK;
-}
-
-static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
-{
- int ret;
-
- (void)sdi;
- (void)data;
-
- ret = SR_OK;
- switch (key) {
- /* TODO */
- default:
- return SR_ERR_NA;
- }
-
- return ret;
+ return dev_clear();
}
static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
{
- int ret;
-
- (void)data;
+ struct dev_context *devc;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- ret = SR_OK;
+ if (!(devc = sdi->priv)) {
+ sr_err("sdi->priv was NULL.");
+ return SR_ERR_BUG;
+ }
+
switch (key) {
- /* TODO */
+ case SR_CONF_LIMIT_SAMPLES:
+ devc->limit_samples = g_variant_get_uint64(data);
+ sr_dbg("Setting sample limit to %" PRIu64 ".", devc->limit_samples);
+ break;
+ case SR_CONF_LIMIT_MSEC:
+ devc->limit_msec = g_variant_get_uint64(data);
+ sr_dbg("Setting time limit to %" PRIu64 "ms.", devc->limit_msec);
+ break;
default:
- ret = SR_ERR_NA;
+ return SR_ERR_NA;
}
- return ret;
+ return SR_OK;
}
static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
{
- int ret;
-
(void)sdi;
- (void)data;
- 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;
default:
return SR_ERR_NA;
}
- return ret;
+ return SR_OK;
}
-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 sr_serial_dev_inst *serial = sdi->conn;
+ struct dev_context *devc;
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;
+ }
- return SR_OK;
-}
+ devc->session_cb_data = cb_data;
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
-{
- (void)cb_data;
+ /*
+ * Reset the number of samples to take. If we've already collected our
+ * quota, but we start a new session, and don't reset this, we'll just
+ * quit without acquiring any new samples.
+ */
+ devc->num_samples = 0;
+ devc->start_time = g_get_monotonic_time();
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
+ /* Send header packet to the session bus. */
+ std_session_send_df_header(cb_data, LOG_PREFIX);
- /* TODO: stop acquisition. */
+ /* Poll every 50ms, or whenever some data comes in. */
+ sr_source_add(serial->fd, G_IO_IN, 50, teleinfo_receive_data, (void *)sdi);
return SR_OK;
}
+static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+{
+ return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
+ sdi->conn, LOG_PREFIX);
+}
+
SR_PRIV struct sr_dev_driver teleinfo_driver_info = {
.name = "teleinfo",
.longname = "Teleinfo",
@@ -174,12 +298,10 @@ SR_PRIV struct sr_dev_driver teleinfo_driver_info = {
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
- .config_get = config_get,
.config_set = config_set,
.config_list = config_list,
.dev_open = dev_open,
.dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
};