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)
(void)options;
- devcnt = 0;
- devices = 0;
drvc = di->priv;
drvc->instances = NULL;
+ devcnt = 0;
+ devices = 0;
+
clear_instances();
/* Find all Hantek DSO devices and upload firmware to all of them. */
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_OK;
}
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
- uint64_t tmp;
-
- (void)sdi;
-
- switch (id) {
- case SR_DI_HWCAPS:
- *data = hwcaps;
- break;
- /* TODO remove this */
- case SR_CONF_SAMPLERATE:
- *data = &tmp;
- break;
- default:
- return SR_ERR_ARG;
- }
-
- return SR_OK;
-}
-
static int config_set(int id, const void *value, 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_BUFFERSIZE:
*data = buffersizes;
break;
void *cb_data)
{
const struct libusb_pollfd **lupfd;
- struct sr_datafeed_packet packet;
- struct sr_datafeed_header header;
struct dev_context *devc;
struct drv_context *drvc = di->priv;
int i;
free(lupfd);
/* 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);
return SR_OK;
}
.scan = hw_scan,
.dev_list = hw_dev_list,
.dev_clear = clear_instances,
- .config_get = config_get,
+ .config_get = NULL,
.config_set = config_set,
.config_list = config_list,
.dev_open = hw_dev_open,