X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fopenbench-logic-sniffer%2Fprotocol.h;h=00ed35bed177fdba2b031b8c5d579cbdd04b15fb;hb=0f96d9bc50555adf662904230e6ef860b0baad12;hp=612b069f6b9889c0665f23715a18c501f6dc4c6e;hpb=55eca716e5982bd8aace203ddb840583534415c0;p=libsigrok.git diff --git a/src/hardware/openbench-logic-sniffer/protocol.h b/src/hardware/openbench-logic-sniffer/protocol.h index 612b069f..00ed35be 100644 --- a/src/hardware/openbench-logic-sniffer/protocol.h +++ b/src/hardware/openbench-logic-sniffer/protocol.h @@ -99,8 +99,10 @@ #define OLS_NO_TRIGGER (-1) struct dev_context { + char **channel_names; + /* constant device properties: */ - int max_channels; + size_t max_channels; uint32_t max_samples; uint32_t max_samplerate; uint32_t protocol_version; @@ -123,7 +125,6 @@ struct dev_context { unsigned int rle_count; unsigned char sample[4]; - unsigned char tmp_sample[4]; unsigned char *raw_sample_buf; }; @@ -136,8 +137,7 @@ SR_PRIV int send_longcommand(struct sr_serial_dev_inst *serial, uint8_t command, SR_PRIV int ols_send_reset(struct sr_serial_dev_inst *serial); SR_PRIV int ols_prepare_acquisition(const struct sr_dev_inst *sdi); SR_PRIV uint32_t ols_channel_mask(const struct sr_dev_inst *sdi); -SR_PRIV struct dev_context *ols_dev_new(void); -SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial); +SR_PRIV int ols_get_metadata(struct sr_dev_inst *sdi); SR_PRIV int ols_set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate); SR_PRIV void abort_acquisition(const struct sr_dev_inst *sdi);