#include "protocol.h"
static const int hwcaps[] = {
- SR_HWCAP_SAMPLERATE,
- SR_HWCAP_LIMIT_SAMPLES,
- SR_HWCAP_CONTINUOUS,
+ SR_CONF_SAMPLERATE,
+ SR_CONF_LIMIT_SAMPLES,
+ SR_CONF_CONTINUOUS,
0,
};
-static const char *probe_names[] = {
- "Channel 0", "Channel 1",
- NULL,
-};
-
SR_PRIV struct sr_dev_driver alsa_driver_info;
static struct sr_dev_driver *di = &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)
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) {
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)
{
struct dev_context *devc;
- if (info_id != SR_DI_HWCAPS) /* For SR_DI_HWCAPS sdi will be NULL. */
+ switch (id) {
+ case SR_CONF_SAMPLERATE:
devc = sdi->priv;
-
- switch (info_id) {
- case SR_DI_HWCAPS:
- *data = hwcaps;
- break;
- case SR_DI_NUM_PROBES:
- *data = &devc->num_probes;
- break;
- case SR_DI_PROBE_NAMES:
- *data = probe_names;
- break;
- case SR_DI_CUR_SAMPLERATE:
*data = &devc->cur_samplerate;
break;
- case SR_DI_SAMPLERATES:
- if (!devc->supp_rates.list) {
- sr_err("Instance did not contain a samplerate list.");
- return SR_ERR_ARG;
- }
- *data = &devc->supp_rates;
- break;
default:
- sr_err("Invalid info_id: %d.", info_id);
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)
{
struct dev_context *devc;
devc = sdi->priv;
- switch (hwcap) {
- case SR_HWCAP_SAMPLERATE:
+ switch (id) {
+ case SR_CONF_SAMPLERATE:
alsa_set_samplerate(sdi, *(const uint64_t *)value);
break;
- case SR_HWCAP_LIMIT_SAMPLES:
+ case SR_CONF_LIMIT_SAMPLES:
devc->limit_samples = *(const uint64_t *)value;
break;
default:
- sr_err("Unknown capability: %d.", hwcap);
+ sr_err("Unknown capability: %d.", id);
return SR_ERR;
}
return SR_OK;
}
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+ struct dev_context *devc;
+
+ (void)sdi;
+
+ switch (key) {
+ case SR_CONF_DEVICE_OPTIONS:
+ *data = hwcaps;
+ break;
+ case SR_CONF_SAMPLERATE:
+ if (!sdi || !sdi->priv)
+ return SR_ERR_ARG;
+ devc = sdi->priv;
+ if (!devc->supp_rates.list) {
+ sr_err("Instance did not contain a samplerate list.");
+ return SR_ERR_ARG;
+ }
+ *data = &devc->supp_rates;
+ break;
+ default:
+ return SR_ERR_ARG;
+ }
+
+ 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 sr_datafeed_meta_analog meta;
struct dev_context *devc;
int count, ret;
char *endianness;
sr_err("Unable to obtain poll descriptors count.");
return SR_ERR;
}
- sr_spew("Obtained poll descriptor count: %d.", count);
if (!(devc->ufds = g_try_malloc(count * sizeof(struct pollfd)))) {
sr_err("Failed to malloc ufds.");
return SR_ERR_MALLOC;
}
- sr_err("Getting %d poll descriptors.", count);
+ sr_spew("Getting %d poll descriptors.", count);
ret = snd_pcm_poll_descriptors(devc->capture_handle, devc->ufds, count);
if (ret < 0) {
sr_err("Unable to obtain poll descriptors: %s.",
}
/* 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);
-
- /* Send metadata about the SR_DF_ANALOG packets to come. */
- sr_dbg("Sending SR_DF_META_ANALOG packet.");
- packet.type = SR_DF_META_ANALOG;
- packet.payload = &meta;
- meta.num_probes = devc->num_probes;
- 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,
.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