Constify a lot more items.

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

diff --git a/src/hardware/ikalogic-scanalogic2/protocol.c b/src/hardware/ikalogic-scanalogic2/protocol.c
index 7a7a2cb171b5ba210c26f660f875fcf03887ac0b..6db7026115faa0b31164ee9676986fcf8bd60938 100644 (file)
--- a/src/hardware/ikalogic-scanalogic2/protocol.c
+++ b/src/hardware/ikalogic-scanalogic2/protocol.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "protocol.h"
 
 extern struct sr_dev_driver ikalogic_scanalogic2_driver_info;
@@ -25,7 +26,7 @@ extern uint64_t sl2_samplerates[NUM_SAMPLERATES];
 
 static void stop_acquisition(struct sr_dev_inst *sdi)
 {
-       struct drv_context *drvc = sdi->driver->priv;
+       struct drv_context *drvc = sdi->driver->context;
        struct dev_context *devc;
        struct sr_datafeed_packet packet;
 
@@ -42,7 +43,7 @@ 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 drv_context *drvc = sdi->driver->context;
        struct dev_context *devc;
        struct sr_datafeed_packet packet;
 
@@ -215,7 +216,7 @@ SR_PRIV int ikalogic_scanalogic2_receive_data(int fd, int revents, void *cb_data
                return TRUE;
 
        di = sdi->driver;
-       drvc = di->priv;
+       drvc = di->context;
        current_time = g_get_monotonic_time();
 
        if (devc->state == STATE_WAIT_DATA_READY &&
@@ -643,7 +644,7 @@ SR_PRIV int sl2_get_device_info(struct sr_usb_dev_inst usb,
        uint8_t buffer[PACKET_LENGTH];
        int ret;
 
-       drvc = ikalogic_scanalogic2_driver_info.priv;
+       drvc = ikalogic_scanalogic2_driver_info.context;
 
        if (!dev_info)
                return SR_ERR_ARG;