X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok-internal.h;h=d9f2bcd8a33c4aae06b9bb4660ff1c40a950e3ed;hb=dccfe015868b5f1a5a5996983164d135ec561596;hp=640ab0bed0ce3df237a0c038bb0ee7f456732054;hpb=b8072700c1bc7d13ba004fd897668b56cec4ac62;p=libsigrok.git diff --git a/libsigrok-internal.h b/libsigrok-internal.h index 640ab0be..d9f2bcd8 100644 --- a/libsigrok-internal.h +++ b/libsigrok-internal.h @@ -27,6 +27,12 @@ #include #endif +/** + * @file + * + * libsigrok private header file, only to be used internally. + */ + /*--- Macros ----------------------------------------------------------------*/ #ifndef ARRAY_SIZE @@ -46,6 +52,9 @@ #define DATASTORE_CHUNKSIZE (512 * 1024) struct sr_context { +#ifdef HAVE_LIBUSB_1_0 + libusb_context *libusb_ctx; +#endif }; #ifdef HAVE_LIBUSB_1_0 @@ -61,11 +70,13 @@ struct sr_usb_dev_inst { #define SERIAL_PARITY_ODD 2 struct sr_serial_dev_inst { char *port; + char *serialcomm; int fd; }; /* Private driver context. */ struct drv_context { + struct sr_context *sr_ctx; GSList *instances; }; @@ -87,8 +98,8 @@ SR_PRIV struct sr_probe *sr_probe_new(int index, int type, SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status, const char *vendor, const char *model, const char *version); SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi); -#ifdef HAVE_LIBUSB_1_0 +#ifdef HAVE_LIBUSB_1_0 /* USB-specific instances */ SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus, uint8_t address, struct libusb_device_handle *hdl); @@ -96,8 +107,8 @@ SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb); #endif /* Serial-specific instances */ -SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new( - const char *port, int fd); +SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port, + const char *serialcomm); SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial); @@ -115,17 +126,31 @@ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi, /*--- hardware/common/serial.c ----------------------------------------------*/ -SR_PRIV GSList *list_serial_ports(void); -SR_PRIV int serial_open(const char *pathname, int flags); -SR_PRIV int serial_close(int fd); -SR_PRIV int serial_flush(int fd); -SR_PRIV int serial_write(int fd, const void *buf, size_t count); -SR_PRIV int serial_read(int fd, void *buf, size_t count); -SR_PRIV void *serial_backup_params(int fd); -SR_PRIV void serial_restore_params(int fd, void *backup); -SR_PRIV int serial_set_params(int fd, int baudrate, int bits, int parity, - int stopbits, int flowcontrol); -SR_PRIV int serial_set_paramstr(int fd, const char *paramstr); +enum { + SERIAL_RDWR = 1, + SERIAL_RDONLY = 2, + SERIAL_NONBLOCK = 4, +}; + +typedef gboolean (*packet_valid_t)(const uint8_t *buf); + +SR_PRIV int serial_open(struct sr_serial_dev_inst *serial, int flags); +SR_PRIV int serial_close(struct sr_serial_dev_inst *serial); +SR_PRIV int serial_flush(struct sr_serial_dev_inst *serial); +SR_PRIV int serial_write(struct sr_serial_dev_inst *serial, + const void *buf, size_t count); +SR_PRIV int serial_read(struct sr_serial_dev_inst *serial, void *buf, + size_t count); +SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate, + int bits, int parity, int stopbits, int flowcontrol, int rts, int dtr); +SR_PRIV int serial_set_paramstr(struct sr_serial_dev_inst *serial, + const char *paramstr); +SR_PRIV int serial_readline(struct sr_serial_dev_inst *serial, char **buf, + int *buflen, gint64 timeout_ms); +SR_PRIV int serial_stream_detect(struct sr_serial_dev_inst *serial, + uint8_t *buf, size_t *buflen, + size_t packet_size, packet_valid_t is_valid, + uint64_t timeout_ms, int baudrate); /*--- hardware/common/ezusb.c -----------------------------------------------*/ @@ -137,4 +162,56 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration, const char *filename); #endif +/*--- hardware/common/usb.c -------------------------------------------------*/ + +#ifdef HAVE_LIBUSB_1_0 +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 + +/*--- hardware/common/dmm/fs9922.c ------------------------------------------*/ + +SR_PRIV int sr_dmm_parse_fs9922(const uint8_t *buf, float *floatval, + struct sr_datafeed_analog *analog); + +/*--- hardware/common/dmm/fs9721.c ------------------------------------------*/ + +#define FS9721_PACKET_SIZE 14 + +struct fs9721_info { + gboolean is_ac, is_dc, is_auto, is_rs232, is_micro, is_nano, is_kilo; + gboolean is_diode, is_milli, is_percent, is_mega, is_beep, is_farad; + gboolean is_ohm, is_rel, is_hold, is_ampere, is_volt, is_hz, is_bat; + gboolean is_c2c1_11, is_c2c1_10, is_c2c1_01, is_c2c1_00, is_sign; +}; + +SR_PRIV gboolean sr_fs9721_is_packet_start(uint8_t b); +SR_PRIV gboolean sr_fs9721_packet_valid(const uint8_t *buf); +SR_PRIV int sr_fs9721_parse(const uint8_t *buf, float *floatval, + struct sr_datafeed_analog *analog, void *info); + +/*--- hardware/common/dmm/metex14.c -----------------------------------------*/ + +#define METEX14_PACKET_SIZE 14 + +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, is_gain, is_decibel, is_hfe, is_unitless; +}; + +SR_PRIV int sr_metex14_packet_request(struct sr_serial_dev_inst *serial); +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