Rename session_dev_id to cb_data everywhere.

[libsigrok.git] / hardware / fx2lafw / fx2lafw.c

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 1bbb45470bbbd5fb567cd38eab971752ff2f6079..0cebebab22d92cb05484951ed7f26fc90ae62487 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -688,7 +688,7 @@ static void finish_acquisition(struct dev_context *devc)
 
        /* Terminate session. */
        packet.type = SR_DF_END;
-       sr_session_send(devc->session_dev_id, &packet);
+       sr_session_send(devc->cb_data, &packet);
 
        /* Remove fds from polling. */
        lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
@@ -820,7 +820,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
                                         */
                                        packet.type = SR_DF_TRIGGER;
                                        packet.payload = NULL;
-                                       sr_session_send(devc->session_dev_id, &packet);
+                                       sr_session_send(devc->cb_data, &packet);
 
                                        /*
                                         * Send the samples that triggered it,
@@ -831,7 +831,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
                                        logic.unitsize = sizeof(*devc->trigger_buffer);
                                        logic.length = devc->trigger_stage * logic.unitsize;
                                        logic.data = devc->trigger_buffer;
-                                       sr_session_send(devc->session_dev_id, &packet);
+                                       sr_session_send(devc->cb_data, &packet);
 
                                        devc->trigger_stage = TRIGGER_FIRED;
                                        break;
@@ -861,7 +861,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
                logic.length = transfer->actual_length - trigger_offset_bytes;
                logic.unitsize = sample_width;
                logic.data = cur_buf + trigger_offset_bytes;
-               sr_session_send(devc->session_dev_id, &packet);
+               sr_session_send(devc->cb_data, &packet);
 
                devc->num_samples += cur_sample_count;
                if (devc->limit_samples &&
@@ -943,7 +943,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                return SR_ERR;
        }
 
-       devc->session_dev_id = cb_data;
+       devc->cb_data = cb_data;
        devc->num_samples = 0;
        devc->empty_transfer_count = 0;