Fix #442 by renaming sr_dev_driver.priv to .context

[libsigrok.git] / src / hardware / uni-t-ut32x / protocol.c

diff --git a/src/hardware/uni-t-ut32x/protocol.c b/src/hardware/uni-t-ut32x/protocol.c
index 65cb756bd87774dc4b275d5673710507d9654d94..0c7829f85c8d2069d04b999c6d2d34fa2f449fa3 100644 (file)
--- a/src/hardware/uni-t-ut32x/protocol.c
+++ b/src/hardware/uni-t-ut32x/protocol.c
@@ -17,13 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "protocol.h"
-
 #include <string.h>
 #include <math.h>
+#include "protocol.h"
 
 extern struct sr_dev_driver uni_t_ut32x_driver_info;
-static struct sr_dev_driver *di = &uni_t_ut32x_driver_info;
 
 static float parse_temperature(unsigned char *buf)
 {
@@ -147,7 +145,7 @@ static void process_packet(struct sr_dev_inst *sdi)
 
 }
 
-SR_PRIV void uni_t_ut32x_receive_transfer(struct libusb_transfer *transfer)
+SR_PRIV void LIBUSB_CALL uni_t_ut32x_receive_transfer(struct libusb_transfer *transfer)
 {
        struct dev_context *devc;
        struct sr_dev_inst *sdi;
@@ -194,6 +192,7 @@ SR_PRIV int uni_t_ut32x_handle_events(int fd, int revents, void *cb_data)
 {
        struct drv_context *drvc;
        struct dev_context *devc;
+       struct sr_dev_driver *di;
        struct sr_dev_inst *sdi;
        struct sr_datafeed_packet packet;
        struct sr_usb_dev_inst *usb;
@@ -204,11 +203,12 @@ SR_PRIV int uni_t_ut32x_handle_events(int fd, int revents, void *cb_data)
        (void)fd;
        (void)revents;
 
-       drvc = di->priv;
-
        if (!(sdi = cb_data))
                return TRUE;
 
+       di = sdi->driver;
+       drvc = di->context;
+
        if (!(devc = sdi->priv))
                return TRUE;
 
@@ -237,4 +237,3 @@ SR_PRIV int uni_t_ut32x_handle_events(int fd, int revents, void *cb_data)
 
        return TRUE;
 }
-