build: Portability fixes.

[libsigrok.git] / hardware / ikalogic-scanalogic2 / protocol.h

diff --git a/hardware/ikalogic-scanalogic2/protocol.h b/hardware/ikalogic-scanalogic2/protocol.h
index 6cdb607254a0d10b3eb69649d57133ff05ac5567..5e7c7b3b40686e9a149681dbf747709f2c1566ed 100644 (file)
--- a/hardware/ikalogic-scanalogic2/protocol.h
+++ b/hardware/ikalogic-scanalogic2/protocol.h
@@ -47,9 +47,7 @@
 #define USB_HID_REPORT_TYPE_FEATURE    0x300
 
 #define NUM_SAMPLERATES                        11
-#define NUM_PROBES                     4
-
-#define TRIGGER_TYPES                  "rfc"
+#define NUM_CHANNELS                   4
 
 /*
  * Number of sample bytes and samples the device can acquire. Note that the
@@ -151,8 +149,8 @@ struct dev_context {
 
        void *cb_data;
 
-       /* Array to provide an index based access to all probes. */
-       const struct sr_channel *probes[NUM_PROBES];
+       /* Array to provide an index based access to all channels. */
+       const struct sr_channel *channels[NUM_CHANNELS];
 
        struct libusb_transfer *xfer_in, *xfer_out;
 
@@ -194,7 +192,7 @@ struct dev_context {
         * channel except the last one. The samples of the last channel will be
         * processed directly after they will be received.
         */
-       uint8_t sample_buffer[NUM_PROBES - 1][MAX_DEV_SAMPLE_BYTES];
+       uint8_t sample_buffer[NUM_CHANNELS - 1][MAX_DEV_SAMPLE_BYTES];
 
        /* Expected number of sample packets for each channel. */
        uint16_t num_sample_packets;
@@ -208,11 +206,11 @@ struct dev_context {
        /* Channel number that is currently processed. */
        uint8_t channel;
 
-       /* Number of enabled probes. */
-       unsigned int num_enabled_probes;
+       /* Number of enabled channels. */
+       unsigned int num_enabled_channels;
 
-       /* Array to provide a sequential access to all enabled probe indices. */
-       uint8_t probe_map[NUM_PROBES];
+       /* Array to provide a sequential access to all enabled channel indices. */
+       uint8_t channel_map[NUM_CHANNELS];
 
        /* Indicates whether a transfer failed. */
        gboolean transfer_error;
@@ -225,7 +223,7 @@ SR_PRIV int sl2_set_samplerate(const struct sr_dev_inst *sdi,
                uint64_t samplerate);
 SR_PRIV int sl2_set_limit_samples(const struct sr_dev_inst *sdi,
                                  uint64_t limit_samples);
-SR_PRIV void sl2_configure_trigger(const struct sr_dev_inst *sdi);
+SR_PRIV int sl2_convert_trigger(const struct sr_dev_inst *sdi);
 SR_PRIV int sl2_set_capture_ratio(const struct sr_dev_inst *sdi,
                                  uint64_t capture_ratio);
 SR_PRIV int sl2_set_after_trigger_delay(const struct sr_dev_inst *sdi,