X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flibsigrok-internal.h;h=0a4e804ded0ca3544d3f35d73551f3df2911aee7;hb=98edee7926b9827eec743bbfbfde9025089dc502;hp=28e26c1a1b8ed26e5daa2a7aefc14c30e356f5de;hpb=6c592ece705d4ec39ea3003a335cfe20d63aea47;p=libsigrok.git diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h index 28e26c1a..0a4e804d 100644 --- a/src/libsigrok-internal.h +++ b/src/libsigrok-internal.h @@ -438,8 +438,6 @@ struct sr_serial_dev_inst { char *port; /** Comm params for serial_set_paramstr(). */ char *serialcomm; - /** Port is non-blocking. */ - int nonblocking; /** libserialport port handle */ struct sp_port *data; /** libserialport event set */ @@ -620,7 +618,6 @@ SR_PRIV int soft_trigger_logic_check(struct soft_trigger_logic *st, uint8_t *buf enum { SERIAL_RDWR = 1, SERIAL_RDONLY = 2, - SERIAL_NONBLOCK = 4, }; typedef gboolean (*packet_valid_callback)(const uint8_t *buf); @@ -628,14 +625,10 @@ typedef gboolean (*packet_valid_callback)(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_write_blocking(struct sr_serial_dev_inst *serial, const void *buf, size_t count); SR_PRIV int serial_write_nonblocking(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_read_blocking(struct sr_serial_dev_inst *serial, void *buf, size_t count); SR_PRIV int serial_read_nonblocking(struct sr_serial_dev_inst *serial, void *buf,