X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-ut32x%2Fprotocol.h;h=969ccfa65d3a4212cd8759914899d1b422706cae;hb=06f0872ea95f88a2f944f0c9b7a477a7793dfe06;hp=8513117cba92edf0e1402951620376dc58430c65;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git diff --git a/src/hardware/uni-t-ut32x/protocol.h b/src/hardware/uni-t-ut32x/protocol.h index 8513117c..969ccfa6 100644 --- a/src/hardware/uni-t-ut32x/protocol.h +++ b/src/hardware/uni-t-ut32x/protocol.h @@ -22,7 +22,7 @@ #include #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" #define LOG_PREFIX "uni-t-ut32x" @@ -34,11 +34,11 @@ #define USB_INTERFACE 0 #define USB_CONFIGURATION 1 -#define EP_IN 0x80 | 2 +#define EP_IN (0x80 | 2) #define EP_OUT 2 enum { - DATA_SOURCE_LIVE, + DATA_SOURCE_LIVE, DATA_SOURCE_MEMORY, }; @@ -58,7 +58,6 @@ struct dev_context { uint64_t num_samples; unsigned char buf[8]; struct libusb_transfer *xfer; - void *cb_data; /* Temporary state across callbacks */ unsigned char packet[32]; @@ -66,6 +65,6 @@ struct dev_context { }; SR_PRIV int uni_t_ut32x_handle_events(int fd, int revents, void *cb_data); -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); #endif