X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok-internal.h;h=d96803cb32725d7ed06017a1cd27b1922dff17af;hb=8c012adbc15fcb00aee23f472b08b108d46b818b;hp=6874e4efdb2f3bdf20917cc11c7f7212b8d655b7;hpb=de4d3f99d9e76c5a51916d3bcfef89423055d43f;p=libsigrok.git diff --git a/libsigrok-internal.h b/libsigrok-internal.h index 6874e4ef..d96803cb 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 @@ -37,9 +43,20 @@ #define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a) #endif +/* Versions < 2.30.0 of glib don't have g_match_info_unref(). */ +#if !GLIB_CHECK_VERSION(2,30,0) +#define g_match_info_unref g_match_info_free +#endif + /* Size of a datastore chunk in units */ #define DATASTORE_CHUNKSIZE (512 * 1024) +struct sr_context { +#ifdef HAVE_LIBUSB_1_0 + libusb_context *libusb_ctx; +#endif +}; + #ifdef HAVE_LIBUSB_1_0 struct sr_usb_dev_inst { uint8_t bus; @@ -53,20 +70,14 @@ struct sr_usb_dev_inst { #define SERIAL_PARITY_ODD 2 struct sr_serial_dev_inst { char *port; + char *serialcomm; int fd; }; -#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); -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 void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial); +/* Private driver context. */ +struct drv_context { + GSList *instances; +}; /*--- log.c -----------------------------------------------------------------*/ @@ -77,39 +88,62 @@ SR_PRIV int sr_info(const char *format, ...); SR_PRIV int sr_warn(const char *format, ...); SR_PRIV int sr_err(const char *format, ...); -/*--- hwdriver.c ------------------------------------------------------------*/ - -SR_PRIV void sr_hw_cleanup_all(void); - -/*--- session.c -------------------------------------------------------------*/ +/*--- device.c --------------------------------------------------------------*/ -SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi, - struct sr_datafeed_packet *packet); +SR_PRIV struct sr_probe *sr_probe_new(int index, int type, + gboolean enabled, const char *name); /* Generic device instances */ 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 struct sr_dev_inst *sr_dev_inst_get(GSList *dev_insts, int dev_index); SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi); -SR_PRIV struct sr_probe *sr_probe_new(int index, int type, - gboolean enabled, const char *name); +#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); +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, + const char *serialcomm); +SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial); + + +/*--- hwdriver.c ------------------------------------------------------------*/ + +SR_PRIV void sr_hw_cleanup_all(void); SR_PRIV int sr_source_remove(int fd); SR_PRIV int sr_source_add(int fd, int events, int timeout, sr_receive_data_callback_t cb, void *cb_data); +/*--- session.c -------------------------------------------------------------*/ + +SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi, + struct sr_datafeed_packet *packet); + /*--- 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); +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); +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 -----------------------------------------------*/ @@ -121,15 +155,49 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration, const char *filename); #endif -/*--- hardware/common/misc.c ------------------------------------------------*/ +/*--- hardware/common/usb.c -------------------------------------------------*/ #ifdef HAVE_LIBUSB_1_0 -SR_PRIV int opendev2(int dev_index, struct sr_dev_inst **sdi, - libusb_device *dev, struct libusb_device_descriptor *des, - int *skip, uint16_t vid, uint16_t pid, int interface); -SR_PRIV int opendev3(struct sr_dev_inst **sdi, libusb_device *dev, - struct libusb_device_descriptor *des, - uint16_t vid, uint16_t pid, int interface); +SR_PRIV GSList *sr_usb_connect(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, + struct fs9721_info *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; +}; + +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, + struct metex14_info *info); + #endif