* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include <stdlib.h>
#include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
#include "protocol.h"
};
SR_PRIV struct sr_dev_driver teleinfo_driver_info;
-static struct sr_dev_driver *di = &teleinfo_driver_info;
-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 *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
struct drv_context *drvc;
struct dev_context *devc;
struct sr_serial_dev_inst *serial;
struct sr_dev_inst *sdi;
- struct sr_channel *ch;
GSList *devices = NULL, *l;
const char *conn = NULL, *serialcomm = NULL;
uint8_t buf[292];
sr_info("Probing serial port %s.", conn);
- drvc = di->priv;
+ drvc = di->context;
drvc->instances = NULL;
serial_flush(serial);
sdi->priv = devc;
sdi->driver = di;
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P");
- sdi->channels = g_slist_append(sdi->channels, ch);
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P");
if (devc->optarif == OPTARIF_BASE) {
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "BASE");
- sdi->channels = g_slist_append(sdi->channels, ch);
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "BASE");
} else if (devc->optarif == OPTARIF_HC) {
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HP");
- sdi->channels = g_slist_append(sdi->channels, ch);
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HC");
- sdi->channels = g_slist_append(sdi->channels, ch);
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HP");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HC");
} else if (devc->optarif == OPTARIF_EJP) {
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HN");
- sdi->channels = g_slist_append(sdi->channels, ch);
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPM");
- sdi->channels = g_slist_append(sdi->channels, ch);
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HN");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HPM");
} else if (devc->optarif == OPTARIF_BBR) {
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJB");
- sdi->channels = g_slist_append(sdi->channels, ch);
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJW");
- sdi->channels = g_slist_append(sdi->channels, ch);
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJR");
- sdi->channels = g_slist_append(sdi->channels, ch);
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJB");
- sdi->channels = g_slist_append(sdi->channels, ch);
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJW");
- sdi->channels = g_slist_append(sdi->channels, ch);
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJR");
- sdi->channels = g_slist_append(sdi->channels, ch);
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HPJB");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HPJW");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HPJR");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HCJB");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HCJW");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HCJR");
}
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "IINST");
- sdi->channels = g_slist_append(sdi->channels, ch);
-
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "PAPP");
- sdi->channels = g_slist_append(sdi->channels, ch);
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "IINST");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "PAPP");
drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi);
return devices;
}
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
{
- return ((struct drv_context *)(di->priv))->instances;
-}
-
-static int cleanup(void)
-{
- return std_dev_clear(di, NULL);
+ return ((struct drv_context *)(di->context))->instances;
}
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
switch (key) {
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:
return SR_ERR_NA;
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)
{
struct sr_serial_dev_inst *serial = sdi->conn;
struct dev_context *devc;
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;
- }
-
- devc->session_cb_data = cb_data;
+ devc = sdi->priv;
/*
* Reset the number of samples to take. If we've already collected our
devc->num_samples = 0;
devc->start_time = g_get_monotonic_time();
- /* Send header packet to the session bus. */
- std_session_send_df_header(cb_data, LOG_PREFIX);
+ std_session_send_df_header(sdi, LOG_PREFIX);
/* Poll every 50ms, or whenever some data comes in. */
serial_source_add(sdi->session, serial, G_IO_IN, 50,
return SR_OK;
}
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
- return std_serial_dev_acquisition_stop(sdi, cb_data,
+ return std_serial_dev_acquisition_stop(sdi,
std_serial_dev_close, sdi->conn, LOG_PREFIX);
}
.longname = "Teleinfo",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
.dev_close = std_serial_dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};