NULL,
};
-/* default supported samplerates, can be overridden by device metadata */
+/* Default supported samplerates, can be overridden by device metadata. */
static const struct sr_samplerates samplerates = {
- SR_HZ(10),
- SR_MHZ(200),
- SR_HZ(1),
- NULL,
+ .low = SR_HZ(10),
+ .high = SR_MHZ(200),
+ .step = SR_HZ(1),
+ .list = NULL,
};
SR_PRIV struct sr_dev_driver ols_driver_info;
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)
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;
uint32_t trigger_config[4];
uint32_t data;
if (send_shortcommand(devc->serial, CMD_RUN) != SR_OK)
return SR_ERR;
+ /* Send header packet to the session bus. */
+ std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
+
sr_source_add(devc->serial->fd, G_IO_IN, -1, ols_receive_data,
cb_data);
- if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
- sr_err("Datafeed packet malloc failed.");
- return SR_ERR_MALLOC;
- }
-
- if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
- sr_err("Datafeed header malloc failed.");
- g_free(packet);
- 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);
-
- g_free(header);
- g_free(packet);
-
return SR_OK;
}