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 session_vdev *vdev;
- switch (info_id) {
- case SR_DI_HWCAPS:
- *data = hwcaps;
- break;
- case SR_DI_CUR_SAMPLERATE:
+ switch (id) {
+ case SR_CONF_SAMPLERATE:
if (sdi) {
vdev = sdi->priv;
*data = &vdev->samplerate;
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 session_vdev *vdev;
const uint64_t *tmp_u64;
vdev = sdi->priv;
- switch (hwcap) {
+ switch (id) {
case SR_CONF_SAMPLERATE:
tmp_u64 = value;
vdev->samplerate = *tmp_u64;
vdev->num_probes = *tmp_u64;
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)
+{
+
+ (void)sdi;
+
+ switch (key) {
+ case SR_CONF_DEVICE_OPTIONS:
+ *data = hwcaps;
+ 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 zip_stat zs;
struct session_vdev *vdev;
- struct sr_datafeed_header *header;
- struct sr_datafeed_packet *packet;
int ret;
vdev = sdi->priv;
return SR_ERR;
}
- /* freewheeling source */
- sr_session_source_add(-1, 0, 0, receive_data, cb_data);
-
- 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;
- }
-
/* Send header packet to the session bus. */
- packet->type = SR_DF_HEADER;
- packet->payload = (unsigned char *)header;
- header->feed_version = 1;
- gettimeofday(&header->starttime, NULL);
- sr_session_send(cb_data, packet);
+ std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
- g_free(header);
- g_free(packet);
+ /* freewheeling source */
+ sr_session_source_add(-1, 0, 0, receive_data, cb_data);
return SR_OK;
}
.api_version = 1,
.init = hw_init,
.cleanup = hw_cleanup,
+ .config_get = config_get,
+ .config_set = config_set,
+ .config_list = config_list,
.dev_open = hw_dev_open,
.dev_close = NULL,
- .info_get = hw_info_get,
- .dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = NULL,
};