X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok-internal.h;h=e63ea9305bdf3180215423686f02ed5bb370c9d9;hb=a567547e205eca58065f21aa5b1502a34ba315b3;hp=fa79110187df8a8b008a69871ac6dcec6216d6c0;hpb=05f134abc2641e6e4d3a22a8dda19460819af16e;p=libsigrok.git diff --git a/libsigrok-internal.h b/libsigrok-internal.h index fa791101..e63ea930 100644 --- a/libsigrok-internal.h +++ b/libsigrok-internal.h @@ -76,6 +76,7 @@ struct sr_serial_dev_inst { /* Private driver context. */ struct drv_context { + struct sr_context *sr_ctx; GSList *instances; }; @@ -121,7 +122,7 @@ SR_PRIV int sr_source_add(int fd, int events, int timeout, /*--- session.c -------------------------------------------------------------*/ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi, - struct sr_datafeed_packet *packet); + const struct sr_datafeed_packet *packet); /*--- hardware/common/serial.c ----------------------------------------------*/ @@ -164,7 +165,7 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration, /*--- hardware/common/usb.c -------------------------------------------------*/ #ifdef HAVE_LIBUSB_1_0 -SR_PRIV GSList *sr_usb_connect(libusb_context *usb_ctx, const char *conn); +SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn); SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb); #endif @@ -207,7 +208,10 @@ SR_PRIV int sr_metex14_parse(const uint8_t *buf, float *floatval, /*--- hardware/common/dmm/rs9lcd.c ------------------------------------------*/ -#define RS_22_812_PACKET_SIZE 9 +#define RS9LCD_PACKET_SIZE 9 + +/* Dummy info struct. The parser does not use it. */ +struct rs9lcd_info {}; SR_PRIV gboolean sr_rs9lcd_packet_valid(const uint8_t *buf); SR_PRIV int sr_rs9lcd_parse(const uint8_t *buf, float *floatval,