X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-ut32x%2Fapi.c;h=2c63c279ee451f57546006f8c68e5c51bf8c3f43;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=bd792ea1e2354190b7b2ca77670c669b031e7ccc;hpb=dcd438ee3523098201c7937e75e55775da3b506f;p=libsigrok.git

diff --git a/src/hardware/uni-t-ut32x/api.c b/src/hardware/uni-t-ut32x/api.c
index bd792ea1..2c63c279 100644
--- a/src/hardware/uni-t-ut32x/api.c
+++ b/src/hardware/uni-t-ut32x/api.c
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "protocol.h"
-
+#include <config.h>
 #include <string.h>
+#include "protocol.h"
 
 static const uint32_t devopts[] = {
 	SR_CONF_THERMOMETER,
@@ -28,10 +28,8 @@ static const uint32_t devopts[] = {
 	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[] = {
@@ -53,10 +51,10 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	struct sr_dev_inst *sdi;
 	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;
@@ -83,8 +81,9 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 			sdi->driver = di;
 			sdi->inst_type = SR_INST_USB;
 			sdi->conn = l->data;
-			for (i = 0; i < 3; i++)
-				sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channels[i]);
+			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;
@@ -101,7 +100,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 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)
@@ -111,7 +110,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 	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;
 	}
@@ -122,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__)
@@ -154,7 +153,7 @@ 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;
 	}
@@ -177,7 +176,7 @@ 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;
 
@@ -224,7 +223,7 @@ 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;
 	}
@@ -285,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;
 
@@ -304,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)))
@@ -367,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,
 };