static const int hwcaps[] = {
SR_CONF_THERMOMETER,
SR_CONF_HYGROMETER,
+ SR_CONF_DATALOG,
SR_CONF_LIMIT_SAMPLES,
0
};
+/* Terrible hack */
+static int BOOL_TRUE = TRUE;
+static int BOOL_FALSE = FALSE;
+
/* Properly close and free all devices. */
static int clear_instances(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;
- }
-
- drvc->sr_ctx = sr_ctx;
- di->priv = drvc;
-
- return SR_OK;
+ return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
}
static GSList *hw_scan(GSList *options)
(void)options;
- if (!(drvc = di->priv)) {
- sr_err("Driver was not initialized.");
- return NULL;
- }
+ drvc = di->priv;
/* USB scan is always authoritative. */
clear_instances();
static GSList *hw_dev_list(void)
{
- struct drv_context *drvc;
-
- if (!(drvc = di->priv)) {
- sr_err("Driver was not initialized.");
- return NULL;
- }
-
- return drvc->instances;
+ return ((struct drv_context *)(di->priv))->instances;
}
static int hw_dev_open(struct sr_dev_inst *sdi)
libusb_release_interface(devc->usb->devhdl, LASCAR_INTERFACE);
libusb_close(devc->usb->devhdl);
devc->usb->devhdl = NULL;
- g_free(devc->config);
sdi->status = SR_ST_INACTIVE;
static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
{
- (void)sdi;
+ struct dev_context *devc;
+ int ret;
+ devc = sdi->priv;
switch (id) {
- case SR_DI_HWOPTS:
- *data = hwopts;
+ case SR_CONF_DATALOG:
+ if (!sdi)
+ return SR_ERR_ARG;
+ if ((ret = lascar_is_logging(sdi)) == -1)
+ return SR_ERR;
+ *data = ret ? &BOOL_TRUE : &BOOL_FALSE;
break;
- case SR_DI_HWCAPS:
- *data = hwcaps;
+ case SR_CONF_LIMIT_SAMPLES:
+ *data = &devc->limit_samples;
break;
default:
return SR_ERR_ARG;
devc = sdi->priv;
ret = SR_OK;
switch (id) {
+ case SR_CONF_DATALOG:
+ if (*(int *)value) {
+ /* Start logging. */
+ ret = lascar_start_logging(sdi);
+ } else {
+ /* Stop logging. */
+ ret = lascar_stop_logging(sdi);
+ }
+ break;
case SR_CONF_LIMIT_SAMPLES:
devc->limit_samples = *(const uint64_t *)value;
sr_dbg("Setting sample limit to %" PRIu64 ".",
return ret;
}
+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 void mark_xfer(struct libusb_transfer *xfer)
{
static int lascar_proc_config(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
- int ret;
+ int dummy, ret;
devc = sdi->priv;
- if (!(devc->config = lascar_get_config(devc->usb->devhdl)))
+ if (lascar_get_config(devc->usb->devhdl, devc->config, &dummy) != SR_OK)
return SR_ERR;
ret = SR_OK;
void *cb_data)
{
struct sr_datafeed_packet packet;
- struct sr_datafeed_header header;
+ struct sr_datafeed_meta meta;
+ struct sr_config *src;
struct dev_context *devc;
- struct drv_context *drvc = di->priv;
+ struct drv_context *drvc;
struct libusb_transfer *xfer_in, *xfer_out;
const struct libusb_pollfd **pfd;
struct timeval tv;
+ uint64_t interval;
int ret, i;
unsigned char cmd[3], resp[4], *buf;
return SR_ERR;
}
+ drvc = di->priv;
devc = sdi->priv;
devc->cb_data = cb_data;
sr_dbg("Starting log retrieval.");
/* 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;
+ std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
+
+ interval = (devc->config[0x1c] | (devc->config[0x1d] << 8)) * 1000;
+ packet.type = SR_DF_META;
+ packet.payload = &meta;
+ src = sr_config_make(SR_CONF_SAMPLE_INTERVAL, (const void *)&interval);
+ meta.config = g_slist_append(NULL, src);
sr_session_send(devc->cb_data, &packet);
+ g_free(src);
if (devc->logged_samples == 0) {
/* This ensures the frontend knows the session is done. */
.dev_clear = clear_instances,
.config_get = config_get,
.config_set = config_set,
+ .config_list = config_list,
.dev_open = hw_dev_open,
.dev_close = hw_dev_close,
.dev_acquisition_start = hw_dev_acquisition_start,