X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fzeroplus.c;h=f51f918311d445f32c8036af9fb2178f3bf7d1e4;hb=f8b07fc6c37cc40dbcc3c6bc607d6e3137b532e4;hp=27ce1dd9607c44d92c25b485327c4708d8f74360;hpb=d261dbbfcc7317f2fd9aa9c08473dc4a7b6b2b30;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 27ce1dd9..f51f9183 100644
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -233,7 +233,7 @@ static struct sr_dev_inst *zp_open_dev(int dev_index)
 	struct sr_dev_inst *sdi;
 	libusb_device **devlist;
 	struct libusb_device_descriptor des;
-	int err, i;
+	int i;
 
 	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
 		return NULL;
@@ -244,7 +244,7 @@ static struct sr_dev_inst *zp_open_dev(int dev_index)
 		libusb_get_device_list(usb_context, &devlist);
 		for (i = 0; devlist[i]; i++) {
 			/* TODO: Error handling. */
-			err = opendev4(&sdi, devlist[i], &des);
+			opendev4(&sdi, devlist[i], &des);
 		}
 	} else {
 		/* Status must be SR_ST_ACTIVE, i.e. already in use... */
@@ -613,7 +613,7 @@ static int hw_dev_config_set(int dev_index, int hwcap, void *value)
 	}
 }
 
-static int hw_dev_acquisition_start(int dev_index, gpointer session_data)
+static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 {
 	struct sr_dev_inst *sdi;
 	struct sr_datafeed_packet packet;
@@ -655,7 +655,7 @@ static int hw_dev_acquisition_start(int dev_index, gpointer session_data)
 	gettimeofday(&header.starttime, NULL);
 	header.samplerate = ctx->cur_samplerate;
 	header.num_logic_probes = ctx->num_channels;
-	sr_session_bus(session_data, &packet);
+	sr_session_send(cb_data, &packet);
 
 	if (!(buf = g_try_malloc(PACKET_SIZE))) {
 		sr_err("zp: %s: buf malloc failed", __func__);
@@ -676,27 +676,27 @@ static int hw_dev_acquisition_start(int dev_index, gpointer session_data)
 		logic.length = PACKET_SIZE;
 		logic.unitsize = 4;
 		logic.data = buf;
-		sr_session_bus(session_data, &packet);
+		sr_session_send(cb_data, &packet);
 		samples_read += res / 4;
 	}
 	analyzer_read_stop(ctx->usb->devhdl);
 	g_free(buf);
 
 	packet.type = SR_DF_END;
-	sr_session_bus(session_data, &packet);
+	sr_session_send(cb_data, &packet);
 
 	return SR_OK;
 }
 
-/* This stops acquisition on ALL devices, ignoring dev_index. */
-static int hw_dev_acquisition_stop(int dev_index, gpointer session_dev_id)
+/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
+static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
 {
 	struct sr_datafeed_packet packet;
 	struct sr_dev_inst *sdi;
 	struct context *ctx;
 
 	packet.type = SR_DF_END;
-	sr_session_bus(session_dev_id, &packet);
+	sr_session_send(cb_data, &packet);
 
 	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
 		sr_err("zp: %s: sdi was NULL", __func__);
@@ -714,7 +714,7 @@ static int hw_dev_acquisition_stop(int dev_index, gpointer session_dev_id)
 	return SR_OK;
 }
 
-SR_PRIV struct sr_dev_plugin zeroplus_logic_cube_plugin_info = {
+SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = {
 	.name = "zeroplus-logic-cube",
 	.longname = "Zeroplus Logic Cube LAP-C series",
 	.api_version = 1,