BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Joel Holdsworth 2012-03-04 14:34:16 +00:00
parent 0abee5076f
commit c8f2c9dda4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hardware/fx2lafw/fx2lafw.c
View File

@ -633,7 +633,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
gettimeofday(&header->starttime, NULL); gettimeofday(&header->starttime, NULL);
header->samplerate = 24000000UL; header->samplerate = 24000000UL;
header->num_logic_probes = ctx->profile->num_probes; 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(header);
g_free(packet); 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. */ /* 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; 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; (void)dev_index;
packet.type = SR_DF_END; packet.type = SR_DF_END;
sr_session_send(session_dev_id, &packet); sr_session_send(cb_data, &packet);
receive_transfer(NULL); receive_transfer(NULL);