X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok-internal.h;h=d9f2bcd8a33c4aae06b9bb4660ff1c40a950e3ed;hb=123d97b17715204c58b795b8e6cbecc55725e5d3;hp=bed792b0f6d31af8c1f71d7de88a9942a363ff1e;hpb=ce3777ada98c5099d2867653f25239b85cf55708;p=libsigrok.git diff --git a/libsigrok-internal.h b/libsigrok-internal.h index bed792b0..d9f2bcd8 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; }; @@ -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 @@ -197,7 +198,7 @@ struct metex14_info { gboolean is_ac, is_dc, is_resistance, is_capacity, is_temperature; gboolean is_diode, is_frequency, is_ampere, is_volt, is_farad; gboolean is_hertz, is_ohm, is_celsius, is_nano, is_micro, is_milli; - gboolean is_kilo, is_mega; + gboolean is_kilo, is_mega, is_gain, is_decibel, is_hfe, is_unitless; }; SR_PRIV int sr_metex14_packet_request(struct sr_serial_dev_inst *serial); @@ -205,4 +206,12 @@ SR_PRIV gboolean sr_metex14_packet_valid(const uint8_t *buf); SR_PRIV int sr_metex14_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info); +/*--- hardware/common/dmm/rs9lcd.c ------------------------------------------*/ + +#define RS9LCD_PACKET_SIZE 9 + +SR_PRIV gboolean sr_rs9lcd_packet_valid(const uint8_t *buf); +SR_PRIV int sr_rs9lcd_parse(const uint8_t *buf, float *floatval, + struct sr_datafeed_analog *analog, void *info); + #endif