X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-ut32x%2Fapi.c;h=2c63c279ee451f57546006f8c68e5c51bf8c3f43;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=52f0c476867b16f5c3fe0b846f2242a80352c3a2;hpb=584560f142e1b17b9f4ef9069bd3724f2f77e750;p=libsigrok.git
diff --git a/src/hardware/uni-t-ut32x/api.c b/src/hardware/uni-t-ut32x/api.c
index 52f0c476..2c63c279 100644
--- a/src/hardware/uni-t-ut32x/api.c
+++ b/src/hardware/uni-t-ut32x/api.c
@@ -17,21 +17,19 @@
* along with this program. If not, see .
*/
-#include "protocol.h"
-
+#include
#include
+#include "protocol.h"
-static const uint32_t hwcaps[] = {
+static const uint32_t devopts[] = {
SR_CONF_THERMOMETER,
- SR_CONF_LIMIT_SAMPLES,
SR_CONF_CONTINUOUS,
- SR_CONF_DATA_SOURCE,
+ SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};
-static char *channels[] = {
- "T1",
- "T2",
- "T1-T2",
+static const char *channel_names[] = {
+ "T1", "T2", "T1-T2",
};
static const char *data_sources[] = {
@@ -40,26 +38,23 @@ static const char *data_sources[] = {
};
SR_PRIV struct sr_dev_driver uni_t_ut32x_driver_info;
-static struct sr_dev_driver *di = &uni_t_ut32x_driver_info;
-
-static int init(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
{
return std_init(sr_ctx, di, LOG_PREFIX);
}
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
struct drv_context *drvc;
struct dev_context *devc;
struct sr_dev_inst *sdi;
- struct sr_channel *ch;
struct sr_config *src;
GSList *usb_devices, *devices, *l;
- int i;
+ unsigned int i;
const char *conn;
- drvc = di->priv;
+ drvc = di->context;
drvc->instances = NULL;
conn = NULL;
@@ -79,25 +74,17 @@ static GSList *scan(GSList *options)
/* We have a list of sr_usb_dev_inst matching the connection
* string. Wrap them in sr_dev_inst and we're done. */
for (l = usb_devices; l; l = l->next) {
- if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, VENDOR,
- MODEL, NULL)))
- return NULL;
+ sdi = g_malloc0(sizeof(struct sr_dev_inst));
+ sdi->status = SR_ST_INACTIVE;
+ sdi->vendor = g_strdup(VENDOR);
+ sdi->model = g_strdup(MODEL);
sdi->driver = di;
sdi->inst_type = SR_INST_USB;
sdi->conn = l->data;
- for (i = 0; i < 3; i++) {
- if (!(ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE,
- channels[i]))) {
- sr_dbg("Channel malloc failed.");
- return NULL;
- }
- sdi->channels = g_slist_append(sdi->channels, ch);
- }
-
- if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
- sr_dbg("Device context malloc failed.");
- return NULL;
- }
+ for (i = 0; i < ARRAY_SIZE(channel_names); i++)
+ sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE,
+ channel_names[i]);
+ devc = g_malloc0(sizeof(struct dev_context));
sdi->priv = devc;
devc->limit_samples = 0;
devc->data_source = DEFAULT_DATA_SOURCE;
@@ -111,18 +98,19 @@ static GSList *scan(GSList *options)
return devices;
}
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
{
- return ((struct drv_context *)(di->priv))->instances;
+ return ((struct drv_context *)(di->context))->instances;
}
static int dev_open(struct sr_dev_inst *sdi)
{
+ struct sr_dev_driver *di = sdi->driver;
struct drv_context *drvc;
struct sr_usb_dev_inst *usb;
int ret;
- if (!(drvc = di->priv)) {
+ if (!(drvc = di->context)) {
sr_err("Driver was not initialized.");
return SR_ERR;
}
@@ -133,7 +121,7 @@ static int dev_open(struct sr_dev_inst *sdi)
return SR_ERR;
/*
- * The libusbx 1.0.9 darwin backend is broken: it can report a kernel
+ * The libusb 1.0.9 Darwin backend is broken: it can report a kernel
* driver being active, but detaching it always returns an error.
*/
#if !defined(__APPLE__)
@@ -162,9 +150,10 @@ static int dev_open(struct sr_dev_inst *sdi)
static int dev_close(struct sr_dev_inst *sdi)
{
+ struct sr_dev_driver *di = sdi->driver;
struct sr_usb_dev_inst *usb;
- if (!di->priv) {
+ if (!di->context) {
sr_err("Driver was not initialized.");
return SR_ERR;
}
@@ -182,19 +171,17 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
{
int ret;
struct drv_context *drvc;
- if (!(drvc = di->priv))
+ if (!(drvc = di->context))
/* Can get called on an unused driver, doesn't matter. */
return SR_OK;
-
ret = std_dev_clear(di, NULL);
g_free(drvc);
- di->priv = NULL;
return ret;
}
@@ -227,8 +214,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
+ struct sr_dev_driver *di = sdi->driver;
struct dev_context *devc;
- int ret;
const char *tmp_str;
(void)cg;
@@ -236,18 +223,16 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- if (!di->priv) {
+ if (!di->context) {
sr_err("Driver was not initialized.");
return SR_ERR;
}
devc = sdi->priv;
- ret = SR_OK;
+
switch (key) {
case SR_CONF_LIMIT_SAMPLES:
devc->limit_samples = g_variant_get_uint64(data);
- sr_dbg("Setting sample limit to %" PRIu64 ".",
- devc->limit_samples);
break;
case SR_CONF_DATA_SOURCE:
tmp_str = g_variant_get_string(data, NULL);
@@ -259,23 +244,22 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
return SR_ERR;
break;
default:
- ret = SR_ERR_NA;
+ return SR_ERR_NA;
}
- return ret;
+ return SR_OK;
}
static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
-
(void)sdi;
(void)cg;
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- hwcaps, ARRAY_SIZE(hwcaps), sizeof(uint32_t));
+ devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
break;
case SR_CONF_DATA_SOURCE:
*data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources));
@@ -290,6 +274,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
static int dev_acquisition_start(const struct sr_dev_inst *sdi,
void *cb_data)
{
+ struct sr_dev_driver *di = sdi->driver;
struct drv_context *drvc;
struct dev_context *devc;
struct sr_usb_dev_inst *usb;
@@ -299,7 +284,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- drvc = di->priv;
+ drvc = di->context;
devc = sdi->priv;
usb = sdi->conn;
@@ -318,7 +303,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
return SR_ERR;
}
- /* Send header packet to the session bus. */
std_session_send_df_header(cb_data, LOG_PREFIX);
if (!(devc->xfer = libusb_alloc_transfer(0)))
@@ -381,5 +365,5 @@ SR_PRIV struct sr_dev_driver uni_t_ut32x_driver_info = {
.dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};