]> sigrok.org Git - libsigrok.git/commitdiff
fx2lafw: Fixed a compiler error, and made cv_data consistent with saleae-logic.c
authorJoel Holdsworth <redacted>
Sun, 4 Mar 2012 14:34:16 +0000 (14:34 +0000)
committerJoel Holdsworth <redacted>
Wed, 7 Mar 2012 07:51:31 +0000 (07:51 +0000)
hardware/fx2lafw/fx2lafw.c

index d0834dedb870dcfb169456c4dce30c0a6cd7a79e..20be9f8469319a9dda9c1ca5082f6906533f23f3 100644 (file)
@@ -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);