#include "libsigrok-internal.h"
#include "protocol.h"
-static const int hwcaps[] = {
+static const int32_t hwcaps[] = {
SR_CONF_SAMPLERATE,
SR_CONF_LIMIT_SAMPLES,
SR_CONF_CONTINUOUS,
- 0,
};
SR_PRIV struct sr_dev_driver alsa_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)
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 SR_ERR;
}
+ sdi->status = SR_ST_ACTIVE;
+
return SR_OK;
}
devc = sdi->priv;
- sr_dbg("Closing device.");
-
if (devc->capture_handle) {
sr_dbg("Closing PCM device.");
if ((ret = snd_pcm_close(devc->capture_handle)) < 0) {
sr_err("Failed to close device: %s.",
snd_strerror(ret));
devc->capture_handle = NULL;
+ sdi->status = SR_ST_INACTIVE;
}
} else {
sr_dbg("No capture handle, no need to close audio device.");
return SR_OK;
}
-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;
- if (id != SR_DI_HWCAPS) /* For SR_DI_HWCAPS sdi will be NULL. */
- devc = sdi->priv;
-
switch (id) {
- case SR_DI_HWCAPS:
- *data = hwcaps;
- break;
- case SR_DI_CUR_SAMPLERATE:
- *data = &devc->cur_samplerate;
+ case SR_CONF_SAMPLERATE:
+ devc = sdi->priv;
+ *data = g_variant_new_uint64(devc->cur_samplerate);
break;
default:
- return SR_ERR_ARG;
+ return SR_ERR_NA;
}
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)
{
struct dev_context *devc;
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR_DEV_CLOSED;
+
devc = sdi->priv;
switch (id) {
case SR_CONF_SAMPLERATE:
- alsa_set_samplerate(sdi, *(const uint64_t *)value);
+ alsa_set_samplerate(sdi, g_variant_get_uint64(data));
break;
case SR_CONF_LIMIT_SAMPLES:
- devc->limit_samples = *(const uint64_t *)value;
+ devc->limit_samples = g_variant_get_uint64(data);
break;
default:
- sr_err("Unknown capability: %d.", id);
- return SR_ERR;
+ return SR_ERR_NA;
}
return SR_OK;
}
-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)
{
struct dev_context *devc;
+ GVariant *gvar;
+ GVariantBuilder gvb;
+ int i;
(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:
if (!sdi || !sdi->priv)
return SR_ERR_ARG;
devc = sdi->priv;
- if (!devc->supp_rates.list) {
+ if (!devc->samplerates) {
sr_err("Instance did not contain a samplerate list.");
return SR_ERR_ARG;
}
- *data = &devc->supp_rates;
+ for (i = 0; devc->samplerates[i]; i++)
+ ;
+ g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
+ gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
+ devc->samplerates, i, sizeof(uint64_t));
+ g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
+ *data = g_variant_builder_end(&gvb);
break;
default:
- return SR_ERR_ARG;
+ return SR_ERR_NA;
}
return SR_OK;
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 count, ret;
char *endianness;
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR_DEV_CLOSED;
+
devc = sdi->priv;
devc->cb_data = cb_data;
devc->num_samples = 0;
}
/* Send header packet to the session bus. */
- sr_dbg("Sending SR_DF_HEADER packet.");
- packet.type = SR_DF_HEADER;
- packet.payload = (uint8_t *)&header;
- header.feed_version = 1;
- gettimeofday(&header.starttime, NULL);
- sr_session_send(devc->cb_data, &packet);
+ std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
/* Poll every 10ms, or whenever some data comes in. */
sr_source_add(devc->ufds[0].fd, devc->ufds[0].events, 10,