X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flibsigrok-internal.h;h=c79524cf1c056f6cb075e18d8a42ce57940c9964;hb=67785f2568f20de7350b09ff6049ecec225af498;hp=e1623f629b0e2c675cf59386eea95d542e8bf5bb;hpb=ad5aa993ae5f5277755ed9c6e99fd647f4fa0d7b;p=libsigrok.git diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h index e1623f62..c79524cf 100644 --- a/src/libsigrok-internal.h +++ b/src/libsigrok-internal.h @@ -29,6 +29,9 @@ #include "config.h" #include +#ifdef HAVE_LIBHIDAPI +#include +#endif #ifdef HAVE_LIBSERIALPORT #include #endif @@ -727,6 +730,10 @@ struct sr_usb_dev_inst { struct sr_serial_dev_inst; #ifdef HAVE_SERIAL_COMM struct ser_lib_functions; +struct ser_hid_chip_functions; +struct sr_bt_desc; +typedef void (*serial_rx_chunk_callback)(struct sr_serial_dev_inst *serial, + void *cb_data, const void *buf, size_t count); struct sr_serial_dev_inst { /** Port name, e.g. '/dev/tty42'. */ char *port; @@ -740,10 +747,45 @@ struct sr_serial_dev_inst { int stop_bits; } comm_params; GString *rcv_buffer; + serial_rx_chunk_callback rx_chunk_cb_func; + void *rx_chunk_cb_data; #ifdef HAVE_LIBSERIALPORT /** libserialport port handle */ struct sp_port *sp_data; #endif +#ifdef HAVE_LIBHIDAPI + enum ser_hid_chip_t { + SER_HID_CHIP_UNKNOWN, /**!< place holder */ + SER_HID_CHIP_SIL_CP2110, /**!< SiLabs CP2110 */ + SER_HID_CHIP_WCH_CH9325, /**!< WCH CH9325 */ + SER_HID_CHIP_LAST, /**!< sentinel */ + } hid_chip; + struct ser_hid_chip_functions *hid_chip_funcs; + char *usb_path; + char *usb_serno; + const char *hid_path; + hid_device *hid_dev; + GSList *hid_source_args; +#endif +#ifdef HAVE_BLUETOOTH + enum ser_bt_conn_t { + SER_BT_CONN_UNKNOWN, /**!< place holder */ + SER_BT_CONN_RFCOMM, /**!< BT classic, RFCOMM channel */ + SER_BT_CONN_BLE122, /**!< BLE, BLE122 module, indications */ + SER_BT_CONN_NRF51, /**!< BLE, Nordic nRF51, notifications */ + SER_BT_CONN_CC254x, /**!< BLE, TI CC254x, notifications */ + SER_BT_CONN_MAX, /**!< sentinel */ + } bt_conn_type; + char *bt_addr_local; + char *bt_addr_remote; + size_t bt_rfcomm_channel; + uint16_t bt_notify_handle_read; + uint16_t bt_notify_handle_write; + uint16_t bt_notify_handle_cccd; + uint16_t bt_notify_value_cccd; + struct sr_bt_desc *bt_desc; + GSList *bt_source_args; +#endif }; #endif @@ -1121,6 +1163,8 @@ SR_PRIV int serial_read_blocking(struct sr_serial_dev_inst *serial, void *buf, size_t count, unsigned int timeout_ms); SR_PRIV int serial_read_nonblocking(struct sr_serial_dev_inst *serial, void *buf, size_t count); +SR_PRIV int serial_set_read_chunk_cb(struct sr_serial_dev_inst *serial, + serial_rx_chunk_callback cb, void *cb_data); 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, @@ -1131,7 +1175,7 @@ SR_PRIV int serial_stream_detect(struct sr_serial_dev_inst *serial, uint8_t *buf, size_t *buflen, size_t packet_size, packet_valid_callback is_valid, - uint64_t timeout_ms, int baudrate); + uint64_t timeout_ms); SR_PRIV int sr_serial_extract_options(GSList *options, const char **serial_device, const char **serial_options); SR_PRIV int serial_source_add(struct sr_session *session, @@ -1177,6 +1221,75 @@ struct ser_lib_functions { size_t (*get_rx_avail)(struct sr_serial_dev_inst *serial); }; extern SR_PRIV struct ser_lib_functions *ser_lib_funcs_libsp; +SR_PRIV int ser_name_is_hid(struct sr_serial_dev_inst *serial); +extern SR_PRIV struct ser_lib_functions *ser_lib_funcs_hid; +SR_PRIV int ser_name_is_bt(struct sr_serial_dev_inst *serial); +extern SR_PRIV struct ser_lib_functions *ser_lib_funcs_bt; + +#ifdef HAVE_LIBHIDAPI +struct vid_pid_item { + uint16_t vid, pid; +}; +#define VID_PID_TERM ALL_ZERO + +struct ser_hid_chip_functions { + const char *chipname; + const char *chipdesc; + const struct vid_pid_item *vid_pid_items; + const int max_bytes_per_request; + int (*set_params)(struct sr_serial_dev_inst *serial, + int baudrate, int bits, int parity, int stopbits, + int flowcontrol, int rts, int dtr); + int (*read_bytes)(struct sr_serial_dev_inst *serial, + uint8_t *data, int space, unsigned int timeout); + int (*write_bytes)(struct sr_serial_dev_inst *serial, + const uint8_t *data, int space); + int (*flush)(struct sr_serial_dev_inst *serial); + int (*drain)(struct sr_serial_dev_inst *serial); +}; +extern SR_PRIV struct ser_hid_chip_functions *ser_hid_chip_funcs_ch9325; +extern SR_PRIV struct ser_hid_chip_functions *ser_hid_chip_funcs_cp2110; +SR_PRIV const char *ser_hid_chip_find_name_vid_pid(uint16_t vid, uint16_t pid); +#endif +#endif + +/*--- bt/ API ---------------------------------------------------------------*/ + +#ifdef HAVE_BLUETOOTH +SR_PRIV const char *sr_bt_adapter_get_address(size_t idx); + +struct sr_bt_desc; +typedef void (*sr_bt_scan_cb)(void *cb_data, const char *addr, const char *name); +typedef int (*sr_bt_data_cb)(void *cb_data, uint8_t *data, size_t dlen); + +SR_PRIV struct sr_bt_desc *sr_bt_desc_new(void); +SR_PRIV void sr_bt_desc_free(struct sr_bt_desc *desc); + +SR_PRIV int sr_bt_config_cb_scan(struct sr_bt_desc *desc, + sr_bt_scan_cb cb, void *cb_data); +SR_PRIV int sr_bt_config_cb_data(struct sr_bt_desc *desc, + sr_bt_data_cb cb, void *cb_data); +SR_PRIV int sr_bt_config_addr_local(struct sr_bt_desc *desc, const char *addr); +SR_PRIV int sr_bt_config_addr_remote(struct sr_bt_desc *desc, const char *addr); +SR_PRIV int sr_bt_config_rfcomm(struct sr_bt_desc *desc, size_t channel); +SR_PRIV int sr_bt_config_notify(struct sr_bt_desc *desc, + uint16_t read_handle, uint16_t write_handle, + uint16_t cccd_handle, uint16_t cccd_value); + +SR_PRIV int sr_bt_scan_le(struct sr_bt_desc *desc, int duration); +SR_PRIV int sr_bt_scan_bt(struct sr_bt_desc *desc, int duration); + +SR_PRIV int sr_bt_connect_ble(struct sr_bt_desc *desc); +SR_PRIV int sr_bt_connect_rfcomm(struct sr_bt_desc *desc); +SR_PRIV void sr_bt_disconnect(struct sr_bt_desc *desc); + +SR_PRIV ssize_t sr_bt_read(struct sr_bt_desc *desc, + void *data, size_t len); +SR_PRIV ssize_t sr_bt_write(struct sr_bt_desc *desc, + const void *data, size_t len); + +SR_PRIV int sr_bt_start_notify(struct sr_bt_desc *desc); +SR_PRIV int sr_bt_check_notify(struct sr_bt_desc *desc); #endif /*--- ezusb.c ---------------------------------------------------------------*/ @@ -1619,8 +1732,10 @@ SR_PRIV int sr_kern_parse(const uint8_t *buf, float *floatval, struct sr_sw_limits { uint64_t limit_samples; + uint64_t limit_frames; uint64_t limit_msec; uint64_t samples_read; + uint64_t frames_read; uint64_t start_time; }; @@ -1632,6 +1747,8 @@ SR_PRIV void sr_sw_limits_acquisition_start(struct sr_sw_limits *limits); SR_PRIV gboolean sr_sw_limits_check(struct sr_sw_limits *limits); SR_PRIV void sr_sw_limits_update_samples_read(struct sr_sw_limits *limits, uint64_t samples_read); +SR_PRIV void sr_sw_limits_update_frames_read(struct sr_sw_limits *limits, + uint64_t frames_read); SR_PRIV void sr_sw_limits_init(struct sr_sw_limits *limits); #endif