X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbrymen-dmm%2Fapi.c;h=b1c5339c5a18b8b8accb47f9c504061e5bc023eb;hb=41812aca436805b0614f2a8f31cf2f8ce494aea0;hp=0db5c2d83a7f8b9fba78eed01cab5eba673f6ccb;hpb=f57d8ffe66612a1fdc20ed09c222f8ea59bd84d4;p=libsigrok.git

diff --git a/src/hardware/brymen-dmm/api.c b/src/hardware/brymen-dmm/api.c
index 0db5c2d8..b1c5339c 100644
--- a/src/hardware/brymen-dmm/api.c
+++ b/src/hardware/brymen-dmm/api.c
@@ -34,7 +34,7 @@ static const uint32_t devopts[] = {
 SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
 static struct sr_dev_driver *di = &brymen_bm857_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);
 }
@@ -44,15 +44,13 @@ static GSList *brymen_scan(const char *conn, const char *serialcomm)
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
 	struct drv_context *drvc;
-	struct sr_channel *ch;
 	struct sr_serial_dev_inst *serial;
 	GSList *devices;
 	int ret;
 	uint8_t buf[128];
 	size_t len;
 
-	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
-		return NULL;
+	serial = sr_serial_dev_inst_new(conn, serialcomm);
 
 	if (serial_open(serial, SERIAL_RDWR) != SR_OK)
 		return NULL;
@@ -82,14 +80,10 @@ static GSList *brymen_scan(const char *conn, const char *serialcomm)
 	devc = g_malloc0(sizeof(struct dev_context));
 	sdi->inst_type = SR_INST_SERIAL;
 	sdi->conn = serial;
-	drvc = di->priv;
+	drvc = di->context;
 	sdi->priv = devc;
 	sdi->driver = di;
-
-	if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1")))
-		goto scan_cleanup;
-
-	sdi->channels = g_slist_append(sdi->channels, ch);
+	sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
 	drvc->instances = g_slist_append(drvc->instances, sdi);
 	devices = g_slist_append(devices, sdi);
 
@@ -99,7 +93,7 @@ scan_cleanup:
 	return devices;
 }
 
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
 	struct drv_context *drvc;
 	struct sr_config *src;
@@ -107,7 +101,7 @@ static GSList *scan(GSList *options)
 	const char *conn, *serialcomm;
 
 	devices = NULL;
-	drvc = di->priv;
+	drvc = di->context;
 	drvc->instances = NULL;
 
 	conn = serialcomm = NULL;
@@ -136,12 +130,12 @@ 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 cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
 {
 	return std_dev_clear(di, NULL);
 }
@@ -255,5 +249,5 @@ SR_PRIV struct sr_dev_driver brymen_bm857_driver_info = {
 	.dev_close = std_serial_dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };