X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-ut32x%2Fprotocol.c;h=1a910b3aa27b232fb84cbd4b0253c7fcfd2fd338;hb=7c91c22a31a5017117116fa1fe6c2addbac813f1;hp=65cb756bd87774dc4b275d5673710507d9654d94;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git diff --git a/src/hardware/uni-t-ut32x/protocol.c b/src/hardware/uni-t-ut32x/protocol.c index 65cb756b..1a910b3a 100644 --- 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 . */ -#include "protocol.h" - #include #include +#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) { @@ -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->priv; + 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; } -