X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fcenter-3xx%2Fapi.c;h=7fe70fa9a8030bc01223d053849973c7eb8dcecc;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=3827c63959006e78790c0703ed319b5887bba42d;hpb=4f840ce965b1c30c5ab75afecc56193cbaf5c1b3;p=libsigrok.git

diff --git a/src/hardware/center-3xx/api.c b/src/hardware/center-3xx/api.c
index 3827c639..7fe70fa9 100644
--- a/src/hardware/center-3xx/api.c
+++ b/src/hardware/center-3xx/api.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <config.h>
 #include "protocol.h"
 
 static const uint32_t scanopts[] = {
@@ -37,7 +38,6 @@ static const uint32_t devopts[] = {
 
 static const char *channel_names[] = {
 	"T1", "T2", "T3", "T4",
-	NULL,
 };
 
 SR_PRIV struct sr_dev_driver center_309_driver_info;
@@ -80,7 +80,7 @@ static GSList *center_scan(const char *conn, const char *serialcomm, int idx)
 	if (serial_open(serial, SERIAL_RDWR) != SR_OK)
 		return NULL;
 
-	drvc = center_devs[idx].di->priv;
+	drvc = center_devs[idx].di->context;
 	devices = NULL;
 	serial_flush(serial);
 
@@ -96,10 +96,8 @@ static GSList *center_scan(const char *conn, const char *serialcomm, int idx)
 	sdi->priv = devc;
 	sdi->driver = center_devs[idx].di;
 
-	for (i = 0; i <  center_devs[idx].num_channels; i++) {
-		sr_channel_new(sdi, i, SR_CHANNEL_ANALOG,
-				    TRUE, channel_names[i]);
-	}
+	for (i = 0; i < center_devs[idx].num_channels; i++)
+		sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_names[i]);
 
 	drvc->instances = g_slist_append(drvc->instances, sdi);
 	devices = g_slist_append(devices, sdi);
@@ -143,7 +141,7 @@ static GSList *scan(GSList *options, int idx)
 
 static GSList *dev_list(int idx)
 {
-	return ((struct drv_context *)(center_devs[idx].di->priv))->instances;
+	return ((struct drv_context *)(center_devs[idx].di->context))->instances;
 }
 
 static int cleanup(int idx)
@@ -220,7 +218,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	devc->num_samples = 0;
 	devc->starttime = g_get_monotonic_time();
 
-	/* Send header packet to the session bus. */
 	std_session_send_df_header(cb_data, LOG_PREFIX);
 
 	/* Poll every 500ms, or whenever some data comes in. */
@@ -240,20 +237,19 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 /* Driver-specific API function wrappers */
 #define HW_INIT(X) \
 static int init_##X(struct sr_dev_driver *d, \
-		struct sr_context *sr_ctx) { \
-	(void) d; return init(sr_ctx, X); }
+	struct sr_context *sr_ctx) { (void)d; return init(sr_ctx, X); }
 #define HW_CLEANUP(X) \
 static int cleanup_##X(const struct sr_dev_driver *d) { \
-	(void) d; return cleanup(X); }
+	(void)d; return cleanup(X); }
 #define HW_SCAN(X) \
 static GSList *scan_##X(struct sr_dev_driver *d, GSList *options) { \
-	(void) d; return scan(options, X); }
+	(void)d; return scan(options, X); }
 #define HW_DEV_LIST(X) \
 static GSList *dev_list_##X(const struct sr_dev_driver *d) { \
-	(void) d; return dev_list(X); }
+	(void)d; return dev_list(X); }
 #define HW_DEV_CLEAR(X) \
 static int dev_clear_##X(const struct sr_dev_driver *d) { \
-	(void) d; return dev_clear(X); }
+	(void)d; return dev_clear(X); }
 #define HW_DEV_ACQUISITION_START(X) \
 static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \
 void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); }
@@ -282,7 +278,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
 	.dev_close = std_serial_dev_close, \
 	.dev_acquisition_start = dev_acquisition_start_##ID_UPPER, \
 	.dev_acquisition_stop = dev_acquisition_stop, \
-	.priv = NULL, \
+	.context = NULL, \
 };
 
 DRV(center_309, CENTER_309, "center-309", "Center 309")