#include "protocol.h"
-static const int hwcaps[] = {
+static const int32_t hwcaps[] = {
+ SR_CONF_OSCILLOSCOPE,
SR_CONF_LOGIC_ANALYZER,
SR_CONF_SAMPLERATE,
SR_CONF_TRIGGER_SLOPE,
// SR_CONF_CAPTURE_RATIO,
SR_CONF_LIMIT_SAMPLES,
// SR_CONF_RLE,
- 0,
};
/*
* See also: http://www.linkinstruments.com/images/mso19_1113.gif
*/
SR_PRIV const char *mso19_probe_names[NUM_PROBES + 1] = {
- "0", "1", "2", "3", "4", "5", "6", "7", NULL
+ /* Note: DSO needs to be first. */
+ "DSO", "0", "1", "2", "3", "4", "5", "6", "7", NULL,
};
-/*supported samplerates */
-static const struct sr_samplerates samplerates = {
+static const uint64_t samplerates[] = {
SR_HZ(100),
SR_MHZ(200),
SR_HZ(100),
- NULL,
};
SR_PRIV struct sr_dev_driver link_mso19_driver_info;
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)
GSList *l;
struct sr_config *src;
struct udev *udev;
+ int ptype;
(void)options;
src = l->data;
switch (src->key) {
case SR_CONF_CONN:
- conn = src->value;
+ conn = g_variant_get_string(src->data, NULL);
break;
case SR_CONF_SERIALCOMM:
- serialcomm = src->value;
+ serialcomm = g_variant_get_string(src->data, NULL);
break;
}
}
for (i = 0; i < NUM_PROBES; i++) {
struct sr_probe *probe;
- if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE,
+ ptype = (i == 0) ? SR_PROBE_ANALOG : SR_PROBE_LOGIC;
+ if (!(probe = sr_probe_new(i, ptype, TRUE,
mso19_probe_names[i])))
return 0;
sdi->probes = g_slist_append(sdi->probes, probe);
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)
return ret;
}
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
+static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
switch (id) {
- case SR_DI_HWCAPS:
- *data = hwcaps;
- break;
- case SR_DI_SAMPLERATES:
- *data = &samplerates;
- break;
- case SR_DI_TRIGGER_TYPES:
- *data = (char *)TRIGGER_TYPES;
- break;
- case SR_DI_CUR_SAMPLERATE:
+ case SR_CONF_SAMPLERATE:
if (sdi) {
devc = sdi->priv;
- *data = &devc->cur_rate;
+ *data = g_variant_new_uint64(devc->cur_rate);
} else
return SR_ERR;
break;
return SR_OK;
}
-static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
{
int ret;
struct dev_context *devc;
uint64_t num_samples, slope;
int trigger_pos;
- float pos;
+ double pos;
devc = sdi->priv;
switch (id) {
case SR_CONF_SAMPLERATE:
// FIXME
- return mso_configure_rate(sdi, *(const uint64_t *)value);
+ return mso_configure_rate(sdi, g_variant_get_uint64(data));
ret = SR_OK;
break;
case SR_CONF_LIMIT_SAMPLES:
- num_samples = *(uint64_t *)value;
- if (num_samples < 1024) {
- sr_err("minimum of 1024 samples required");
+ num_samples = g_variant_get_uint64(data);
+ if (num_samples != 1024) {
+ sr_err("Only 1024 samples are supported.");
ret = SR_ERR_ARG;
} else {
devc->limit_samples = num_samples;
ret = SR_OK;
break;
case SR_CONF_TRIGGER_SLOPE:
- slope = *(uint64_t *)value;
+ slope = g_variant_get_uint64(data);
if (slope != SLOPE_NEGATIVE && slope != SLOPE_POSITIVE) {
sr_err("Invalid trigger slope");
ret = SR_ERR_ARG;
}
break;
case SR_CONF_HORIZ_TRIGGERPOS:
- pos = *(float *)value;
+ pos = g_variant_get_double(data);
if (pos < 0 || pos > 255) {
sr_err("Trigger position (%f) should be between 0 and 255.", pos);
ret = SR_ERR_ARG;
return ret;
}
-static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
{
+ GVariant *gvar;
+ GVariantBuilder gvb;
(void)sdi;
switch (key) {
+ 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_SAMPLERATE:
- *data = &samplerates;
+ g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
+ gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), samplerates,
+ ARRAY_SIZE(samplerates), sizeof(uint64_t));
+ g_variant_builder_add(&gvb, "{sv}", "samplerate-steps", gvar);
+ *data = g_variant_builder_end(&gvb);
+ break;
+ case SR_CONF_TRIGGER_TYPE:
+ *data = g_variant_new_string(TRIGGER_TYPE);
break;
default:
return SR_ERR_ARG;
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 dev_context *devc;
int ret = SR_ERR;
if (ret != SR_OK)
return ret;
- sr_source_add(devc->serial->fd, G_IO_IN, -1, mso_receive_data, cb_data);
+ /* Reset trigger state. */
+ devc->trigger_state = 0x00;
- if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
- sr_err("Datafeed packet malloc failed.");
- return SR_ERR_MALLOC;
- }
+ /* Send header packet to the session bus. */
+ std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
- if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
- sr_err("Datafeed header malloc failed.");
- g_free(packet);
- return SR_ERR_MALLOC;
- }
+ /* Our first probe is analog, the other 8 are of type 'logic'. */
+ /* TODO. */
- packet->type = SR_DF_HEADER;
- packet->payload = (unsigned char *)header;
- header->feed_version = 1;
- gettimeofday(&header->starttime, NULL);
- sr_session_send(cb_data, packet);
-
- g_free(header);
- g_free(packet);
+ sr_source_add(devc->serial->fd, G_IO_IN, -1, mso_receive_data, cb_data);
return SR_OK;
}