Use common usb_source_add and usb_source_remove functions.

[libsigrok.git] / hardware / ikalogic-scanalogic2 / protocol.c

diff --git a/hardware/ikalogic-scanalogic2/protocol.c b/hardware/ikalogic-scanalogic2/protocol.c
index 4c06e96dbd04b4951c668d4499480c47e96833a1..87218de57eb09d5f057b673f9f142f988fb477ff 100644 (file)
--- a/hardware/ikalogic-scanalogic2/protocol.c
+++ b/hardware/ikalogic-scanalogic2/protocol.c
@@ -26,17 +26,14 @@ extern uint64_t sl2_samplerates[NUM_SAMPLERATES];
 
 static void stop_acquisition(struct sr_dev_inst *sdi)
 {
+       struct drv_context *drvc = sdi->driver->priv;
        struct dev_context *devc;
        struct sr_datafeed_packet packet;
-       unsigned int i;
 
        devc = sdi->priv;
 
        /* Remove USB file descriptors from polling. */
-       for (i = 0; i < devc->num_usbfd; i++)
-               sr_source_remove(devc->usbfd[i]);
-
-       g_free(devc->usbfd);
+       usb_source_remove(drvc->sr_ctx);
 
        packet.type = SR_DF_END;
        sr_session_send(devc->cb_data, &packet);
@@ -46,17 +43,14 @@ static void stop_acquisition(struct sr_dev_inst *sdi)
 
 static void abort_acquisition(struct sr_dev_inst *sdi)
 {
+       struct drv_context *drvc = sdi->driver->priv;
        struct dev_context *devc;
        struct sr_datafeed_packet packet;
-       unsigned int i;
 
        devc = sdi->priv;
 
        /* Remove USB file descriptors from polling. */
-       for (i = 0; i < devc->num_usbfd; i++)
-               sr_source_remove(devc->usbfd[i]);
-
-       g_free(devc->usbfd);
+       usb_source_remove(drvc->sr_ctx);
 
        packet.type = SR_DF_END;
        sr_session_send(devc->cb_data, &packet);