From: Joel Holdsworth <redacted>
Date: Sun, 4 Mar 2012 14:34:16 +0000 (+0000)
Subject: fx2lafw: Fixed a compiler error, and made cv_data consistent with saleae-logic.c
X-Git-Tag: libsigrok-0.1.0~66
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=c8f2c9dda4027fe723aabccb4265629c374afcd9;p=libsigrok.git

fx2lafw: Fixed a compiler error, and made cv_data consistent with saleae-logic.c
---

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index d0834ded..20be9f84 100644
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -633,7 +633,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 	gettimeofday(&header->starttime, NULL);
 	header->samplerate = 24000000UL;
 	header->num_logic_probes = ctx->profile->num_probes;
-	sr_session_send(session_dev_id, packet);
+	sr_session_send(cb_data, packet);
 	g_free(header);
 	g_free(packet);
 
@@ -641,7 +641,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 }
 
 /* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
-static int hw_dev_acquisition_stop(int dev_index, void *session_dev_id)
+static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
 {
 	struct sr_datafeed_packet packet;
 
@@ -649,7 +649,7 @@ static int hw_dev_acquisition_stop(int dev_index, void *session_dev_id)
 	(void)dev_index;
 
 	packet.type = SR_DF_END;
-	sr_session_send(session_dev_id, &packet);
+	sr_session_send(cb_data, &packet);
 
 	receive_transfer(NULL);