/* TODO: Should be configurable. */
#define BUFSIZE 4096
+#define STR_PATTERN_SIGROK "sigrok"
+#define STR_PATTERN_RANDOM "random"
+#define STR_PATTERN_INC "incremental"
+#define STR_PATTERN_ALL_LOW "all-low"
+#define STR_PATTERN_ALL_HIGH "all-high"
+
/* Supported patterns which we can generate */
enum {
/**
GIOChannel *channels[2];
uint8_t sample_generator;
uint64_t samples_counter;
- void *session_dev_id;
+ void *cb_data;
int64_t starttime;
};
static const int hwcaps[] = {
- SR_HWCAP_LOGIC_ANALYZER,
- SR_HWCAP_DEMO_DEV,
- SR_HWCAP_SAMPLERATE,
- SR_HWCAP_PATTERN_MODE,
- SR_HWCAP_LIMIT_SAMPLES,
- SR_HWCAP_LIMIT_MSEC,
- SR_HWCAP_CONTINUOUS,
+ SR_CONF_LOGIC_ANALYZER,
+ SR_CONF_DEMO_DEV,
+ SR_CONF_SAMPLERATE,
+ SR_CONF_PATTERN_MODE,
+ SR_CONF_LIMIT_SAMPLES,
+ SR_CONF_LIMIT_MSEC,
+ SR_CONF_CONTINUOUS,
};
static const struct sr_samplerates samplerates = {
- SR_HZ(1),
- SR_GHZ(1),
- SR_HZ(1),
- NULL,
+ .low = SR_HZ(1),
+ .high = SR_GHZ(1),
+ .step = SR_HZ(1),
+ .list = NULL,
};
static const char *pattern_strings[] = {
/* We name the probes 0-7 on our demo driver. */
static const char *probe_names[NUM_PROBES + 1] = {
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7",
+ "0", "1", "2", "3", "4", "5", "6", "7",
NULL,
};
/* List of struct sr_dev_inst, maintained by dev_open()/dev_close(). */
SR_PRIV struct sr_dev_driver demo_driver_info;
-static struct sr_dev_driver *ddi = &demo_driver_info;
+static struct sr_dev_driver *di = &demo_driver_info;
static uint64_t cur_samplerate = SR_KHZ(200);
static uint64_t limit_samples = 0;
static uint64_t limit_msec = 0;
static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
-static int hw_init(void)
+static int clear_instances(void)
{
- struct drv_context *drvc;
-
- if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
- sr_err("Driver context malloc failed.");
- return SR_ERR_MALLOC;
- }
- ddi->priv = drvc;
+ /* Nothing needed so far. */
return SR_OK;
}
+static int hw_init(struct sr_context *sr_ctx)
+{
+ return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
+}
+
static GSList *hw_scan(GSList *options)
{
struct sr_dev_inst *sdi;
(void)options;
- drvc = ddi->priv;
+ drvc = di->priv;
+
devices = NULL;
sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL);
sr_err("%s: sr_dev_inst_new failed", __func__);
return 0;
}
- sdi->driver = ddi;
+ sdi->driver = di;
for (i = 0; probe_names[i]; i++) {
if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE,
static GSList *hw_dev_list(void)
{
- struct drv_context *drvc;
-
- drvc = ddi->priv;
-
- return drvc->instances;
+ return ((struct drv_context *)(di->priv))->instances;
}
static int hw_dev_open(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int hw_info_get(int info_id, const void **data,
- const struct sr_dev_inst *sdi)
+static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
{
(void)sdi;
- switch (info_id) {
- case SR_DI_HWCAPS:
- *data = hwcaps;
- break;
- case SR_DI_NUM_PROBES:
- *data = GINT_TO_POINTER(NUM_PROBES);
- break;
- case SR_DI_PROBE_NAMES:
- *data = probe_names;
+ switch (id) {
+ case SR_CONF_SAMPLERATE:
+ *data = &cur_samplerate;
break;
- case SR_DI_SAMPLERATES:
- *data = &samplerates;
+ case SR_CONF_LIMIT_SAMPLES:
+ *data = &limit_samples;
break;
- case SR_DI_CUR_SAMPLERATE:
- *data = &cur_samplerate;
+ case SR_CONF_LIMIT_MSEC:
+ *data = &limit_msec;
break;
- case SR_DI_PATTERNS:
- *data = &pattern_strings;
+ case SR_CONF_PATTERN_MODE:
+ switch (default_pattern) {
+ case PATTERN_SIGROK:
+ *data = STR_PATTERN_SIGROK;
+ break;
+ case PATTERN_RANDOM:
+ *data = STR_PATTERN_RANDOM;
+ break;
+ case PATTERN_INC:
+ *data = STR_PATTERN_INC;
+ break;
+ case PATTERN_ALL_LOW:
+ *data = STR_PATTERN_ALL_LOW;
+ break;
+ case PATTERN_ALL_HIGH:
+ *data = STR_PATTERN_ALL_HIGH;
+ break;
+ }
break;
default:
return SR_ERR_ARG;
return SR_OK;
}
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
- const void *value)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
{
int ret;
const char *stropt;
(void)sdi;
- if (hwcap == SR_HWCAP_SAMPLERATE) {
+ if (id == SR_CONF_SAMPLERATE) {
cur_samplerate = *(const uint64_t *)value;
sr_dbg("%s: setting samplerate to %" PRIu64, __func__,
cur_samplerate);
ret = SR_OK;
- } else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) {
+ } else if (id == SR_CONF_LIMIT_SAMPLES) {
limit_msec = 0;
limit_samples = *(const uint64_t *)value;
sr_dbg("%s: setting limit_samples to %" PRIu64, __func__,
limit_samples);
ret = SR_OK;
- } else if (hwcap == SR_HWCAP_LIMIT_MSEC) {
+ } else if (id == SR_CONF_LIMIT_MSEC) {
limit_msec = *(const uint64_t *)value;
limit_samples = 0;
sr_dbg("%s: setting limit_msec to %" PRIu64, __func__,
limit_msec);
ret = SR_OK;
- } else if (hwcap == SR_HWCAP_PATTERN_MODE) {
+ } else if (id == SR_CONF_PATTERN_MODE) {
stropt = value;
ret = SR_OK;
- if (!strcmp(stropt, "sigrok")) {
+ if (!strcmp(stropt, STR_PATTERN_SIGROK)) {
default_pattern = PATTERN_SIGROK;
- } else if (!strcmp(stropt, "random")) {
+ } else if (!strcmp(stropt, STR_PATTERN_RANDOM)) {
default_pattern = PATTERN_RANDOM;
- } else if (!strcmp(stropt, "incremental")) {
+ } else if (!strcmp(stropt, STR_PATTERN_INC)) {
default_pattern = PATTERN_INC;
- } else if (!strcmp(stropt, "all-low")) {
+ } else if (!strcmp(stropt, STR_PATTERN_ALL_LOW)) {
default_pattern = PATTERN_ALL_LOW;
- } else if (!strcmp(stropt, "all-high")) {
+ } else if (!strcmp(stropt, STR_PATTERN_ALL_HIGH)) {
default_pattern = PATTERN_ALL_HIGH;
} else {
ret = SR_ERR;
return ret;
}
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+
+ (void)sdi;
+
+ switch (key) {
+ case SR_CONF_DEVICE_OPTIONS:
+ *data = hwcaps;
+ break;
+ case SR_CONF_SAMPLERATE:
+ *data = &samplerates;
+ break;
+ case SR_CONF_PATTERN_MODE:
+ *data = &pattern_strings;
+ break;
+ default:
+ return SR_ERR_ARG;
+ }
+
+ return SR_OK;
+}
+
static void samples_generator(uint8_t *buf, uint64_t size,
struct dev_context *devc)
{
logic.length = sending_now;
logic.unitsize = 1;
logic.data = buf;
- sr_session_send(devc->session_dev_id, &packet);
+ sr_session_send(devc->cb_data, &packet);
devc->samples_counter += sending_now;
}
-
- if (devc->samples_counter >= limit_samples) {
- sr_spew("We sent a total of %" PRIu64 " samples.",
- devc->samples_counter);
- /* Make sure we don't receive more packets. */
+ if (limit_samples && devc->samples_counter >= limit_samples) {
+ sr_info("Requested number of samples reached.");
hw_dev_acquisition_stop(NULL, cb_data);
return TRUE;
}
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 sr_datafeed_meta_logic meta;
struct dev_context *devc;
(void)sdi;
- sr_dbg("Starting acquisition.");
-
/* TODO: 'devc' is never g_free()'d? */
if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
sr_err("%s: devc malloc failed", __func__);
}
devc->sample_generator = default_pattern;
- devc->session_dev_id = cb_data;
+ devc->cb_data = cb_data;
devc->samples_counter = 0;
/*
sr_session_source_add_channel(devc->channels[0], G_IO_IN | G_IO_ERR,
40, receive_data, devc);
- if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
- sr_err("%s: packet malloc failed", __func__);
- return SR_ERR_MALLOC;
- }
-
- if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
- sr_err("%s: header malloc failed", __func__);
- return SR_ERR_MALLOC;
- }
-
- packet->type = SR_DF_HEADER;
- packet->payload = header;
- header->feed_version = 1;
- gettimeofday(&header->starttime, NULL);
- sr_session_send(devc->session_dev_id, packet);
-
- /* Send metadata about the SR_DF_LOGIC packets to come. */
- packet->type = SR_DF_META_LOGIC;
- packet->payload = &meta;
- meta.samplerate = cur_samplerate;
- meta.num_probes = NUM_PROBES;
- sr_session_send(devc->session_dev_id, packet);
+ /* Send header packet to the session bus. */
+ std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
/* We use this timestamp to decide how many more samples to send. */
devc->starttime = g_get_monotonic_time();
- g_free(header);
- g_free(packet);
-
return SR_OK;
}
/* Send last packet. */
packet.type = SR_DF_END;
- sr_session_send(devc->session_dev_id, &packet);
+ sr_session_send(devc->cb_data, &packet);
return SR_OK;
}
.cleanup = hw_cleanup,
.scan = hw_scan,
.dev_list = hw_dev_list,
+ .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,
- .info_get = hw_info_get,
- .dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop,
.priv = NULL,
projects / libsigrok.git / blobdiff