X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkecheng-kc-330b%2Fprotocol.c;h=e4550d2133220f9661d2c973f36e0644a9b9f826;hb=16fc7ee29ffa196d29a20fddd81234792f88b12c;hp=f563866861f1bc8c52aa8d9642c5126f60863f62;hpb=4f840ce965b1c30c5ab75afecc56193cbaf5c1b3;p=libsigrok.git diff --git a/src/hardware/kecheng-kc-330b/protocol.c b/src/hardware/kecheng-kc-330b/protocol.c index f5638668..e4550d21 100644 --- a/src/hardware/kecheng-kc-330b/protocol.c +++ b/src/hardware/kecheng-kc-330b/protocol.c @@ -17,6 +17,7 @@ * along with this program. If not, see . */ +#include #include #include "protocol.h" @@ -44,7 +45,7 @@ SR_PRIV int kecheng_kc_330b_handle_events(int fd, int revents, void *cb_data) devc = sdi->priv; usb = sdi->conn; di = sdi->driver; - drvc = di->priv; + drvc = di->context; memset(&tv, 0, sizeof(struct timeval)); libusb_handle_events_timeout_completed(drvc->sr_ctx->libusb_ctx, &tv, @@ -107,24 +108,24 @@ static void send_data(const struct sr_dev_inst *sdi, void *buf, unsigned int buf { struct dev_context *devc; struct sr_datafeed_packet packet; - struct sr_datafeed_analog analog; + struct sr_datafeed_analog_old analog; devc = sdi->priv; - memset(&analog, 0, sizeof(struct sr_datafeed_analog)); + memset(&analog, 0, sizeof(struct sr_datafeed_analog_old)); analog.mq = SR_MQ_SOUND_PRESSURE_LEVEL; analog.mqflags = devc->mqflags; analog.unit = SR_UNIT_DECIBEL_SPL; analog.channels = sdi->channels; analog.num_samples = buf_len; analog.data = buf; - packet.type = SR_DF_ANALOG; + packet.type = SR_DF_ANALOG_OLD; packet.payload = &analog; sr_session_send(devc->cb_data, &packet); } -SR_PRIV void kecheng_kc_330b_receive_transfer(struct libusb_transfer *transfer) +SR_PRIV void LIBUSB_CALL kecheng_kc_330b_receive_transfer(struct libusb_transfer *transfer) { struct dev_context *devc; struct sr_dev_inst *sdi;