#define SERIALCOMM "115200/8n1"
+static const int hwopts[] = {
+ SR_CONF_CONN,
+ SR_CONF_SERIALCOMM,
+ 0,
+};
+
static const int hwcaps[] = {
- SR_HWCAP_LOGIC_ANALYZER,
- SR_HWCAP_SAMPLERATE,
- SR_HWCAP_CAPTURE_RATIO,
- SR_HWCAP_LIMIT_SAMPLES,
- SR_HWCAP_RLE,
+ SR_CONF_LOGIC_ANALYZER,
+ SR_CONF_SAMPLERATE,
+ SR_CONF_CAPTURE_RATIO,
+ SR_CONF_LIMIT_SAMPLES,
+ SR_CONF_RLE,
0,
};
/* Probes are numbered 0-31 (on the PCB silkscreen). */
SR_PRIV const char *ols_probe_names[NUM_PROBES + 1] = {
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7",
- "8",
- "9",
- "10",
- "11",
- "12",
- "13",
- "14",
- "15",
- "16",
- "17",
- "18",
- "19",
- "20",
- "21",
- "22",
- "23",
- "24",
- "25",
- "26",
- "27",
- "28",
- "29",
- "30",
- "31",
+ "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12",
+ "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23",
+ "24", "25", "26", "27", "28", "29", "30", "31",
NULL,
};
static GSList *hw_scan(GSList *options)
{
- struct sr_hwopt *opt;
+ struct sr_config *src;
struct sr_dev_inst *sdi;
struct drv_context *drvc;
struct dev_context *devc;
conn = serialcomm = NULL;
for (l = options; l; l = l->next) {
- opt = l->data;
- switch (opt->hwopt) {
- case SR_HWOPT_CONN:
- conn = opt->value;
+ src = l->data;
+ switch (src->key) {
+ case SR_CONF_CONN:
+ conn = src->value;
break;
- case SR_HWOPT_SERIALCOMM:
- serialcomm = opt->value;
+ case SR_CONF_SERIALCOMM:
+ serialcomm = src->value;
break;
}
}
return ret;
}
-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)
{
struct dev_context *devc;
- switch (info_id) {
+ switch (id) {
+ case SR_DI_HWOPTS:
+ *data = hwopts;
+ break;
case SR_DI_HWCAPS:
*data = hwcaps;
break;
- case SR_DI_NUM_PROBES:
- *data = GINT_TO_POINTER(1);
- break;
- case SR_DI_PROBE_NAMES:
- *data = ols_probe_names;
- break;
case SR_DI_SAMPLERATES:
*data = &samplerates;
break;
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)
{
struct dev_context *devc;
int ret;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR;
- switch (hwcap) {
- case SR_HWCAP_SAMPLERATE:
+ switch (id) {
+ case SR_CONF_SAMPLERATE:
ret = ols_set_samplerate(sdi, *(const uint64_t *)value,
&samplerates);
break;
- case SR_HWCAP_LIMIT_SAMPLES:
+ case SR_CONF_LIMIT_SAMPLES:
tmp_u64 = value;
if (*tmp_u64 < MIN_NUM_SAMPLES)
return SR_ERR;
sr_info("Sample limit is %" PRIu64 ".", devc->limit_samples);
ret = SR_OK;
break;
- case SR_HWCAP_CAPTURE_RATIO:
+ case SR_CONF_CAPTURE_RATIO:
devc->capture_ratio = *(const uint64_t *)value;
if (devc->capture_ratio < 0 || devc->capture_ratio > 100) {
devc->capture_ratio = 0;
} else
ret = SR_OK;
break;
- case SR_HWCAP_RLE:
+ case SR_CONF_RLE:
if (GPOINTER_TO_INT(value)) {
sr_info("Enabling RLE.");
devc->flag_reg |= FLAG_RLE;
{
struct sr_datafeed_packet *packet;
struct sr_datafeed_header *header;
- struct sr_datafeed_meta_logic meta;
struct dev_context *devc;
uint32_t trigger_config[4];
uint32_t data;
gettimeofday(&header->starttime, NULL);
sr_session_send(cb_data, packet);
- /* Send metadata about the SR_DF_LOGIC packets to come. */
- packet->type = SR_DF_META_LOGIC;
- packet->payload = &meta;
- meta.samplerate = devc->cur_samplerate;
- meta.num_probes = NUM_PROBES;
- sr_session_send(cb_data, packet);
-
g_free(header);
g_free(packet);
.scan = hw_scan,
.dev_list = hw_dev_list,
.dev_clear = hw_cleanup,
+ .config_get = config_get,
+ .config_set = config_set,
.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,