*/
/** The libsigrok package 'major' version number. */
-#define LIBSIGROK_MAJOR_VERSION @LIBSIGROK_MAJOR_VERSION@
+#define SR_PACKAGE_VERSION_MAJOR @SR_PACKAGE_VERSION_MAJOR@
/** The libsigrok package 'minor' version number. */
-#define LIBSIGROK_MINOR_VERSION @LIBSIGROK_MINOR_VERSION@
+#define SR_PACKAGE_VERSION_MINOR @SR_PACKAGE_VERSION_MINOR@
/** The libsigrok package 'micro' version number. */
-#define LIBSIGROK_MICRO_VERSION @LIBSIGROK_MICRO_VERSION@
+#define SR_PACKAGE_VERSION_MICRO @SR_PACKAGE_VERSION_MICRO@
/** The libsigrok package version ("major.minor.micro") as string. */
-#define LIBSIGROK_VERSION_STRING "@LIBSIGROK_VERSION@"
+#define SR_PACKAGE_VERSION_STRING "@SR_PACKAGE_VERSION@"
/*
* Library/libtool version macros (can be used for conditional compilation).
*/
/** The libsigrok libtool 'current' version number. */
-#define LIBSIGROK_LT_CURRENT @LIBSIGROK_LT_CURRENT@
+#define SR_LIB_VERSION_CURRENT @SR_LIB_VERSION_CURRENT@
/** The libsigrok libtool 'revision' version number. */
-#define LIBSIGROK_LT_REVISION @LIBSIGROK_LT_REVISION@
+#define SR_LIB_VERSION_REVISION @SR_LIB_VERSION_REVISION@
/** The libsigrok libtool 'age' version number. */
-#define LIBSIGROK_LT_AGE @LIBSIGROK_LT_AGE@
+#define SR_LIB_VERSION_AGE @SR_LIB_VERSION_AGE@
/** The libsigrok libtool version ("current:revision:age") as string. */
-#define LIBSIGROK_LT_VERSION_STRING "@LIBSIGROK_LT_VERSION@"
+#define SR_LIB_VERSION_STRING "@SR_LIB_VERSION@"
/*
* Status/error codes returned by libsigrok functions.
*
* This uses the 'visibility' feature of gcc (requires gcc >= 4.0).
*
+ * This feature is not available on MinGW/Windows, as it is a feature of
+ * ELF files and MinGW/Windows uses PE files.
+ *
* Details: http://gcc.gnu.org/wiki/Visibility
*/
/* Marks public libsigrok API symbols. */
+#ifndef _WIN32
#define SR_API __attribute__((visibility("default")))
+#else
+#define SR_API
+#endif
/* Marks private, non-public libsigrok symbols (not part of the API). */
+#ifndef _WIN32
#define SR_PRIV __attribute__((visibility("hidden")))
+#else
+#define SR_PRIV
+#endif
typedef int (*sr_receive_data_callback_t)(int fd, int revents, void *cb_data);
SR_DF_END,
SR_DF_TRIGGER,
SR_DF_LOGIC,
- SR_DF_PD,
+ SR_DF_META_LOGIC,
+ SR_DF_ANALOG,
+ SR_DF_META_ANALOG,
};
struct sr_datafeed_packet {
struct sr_datafeed_header {
int feed_version;
struct timeval starttime;
+};
+
+struct sr_datafeed_meta_logic {
+ int num_probes;
uint64_t samplerate;
- int num_logic_probes;
};
struct sr_datafeed_logic {
void *data;
};
+struct sr_datafeed_meta_analog {
+ int num_probes;
+};
+
+struct sr_datafeed_analog {
+ int num_samples;
+ float *data;
+};
+
struct sr_input {
struct sr_input_format *format;
char *param;
char *description;
int df_type;
int (*init) (struct sr_output *o);
- int (*data) (struct sr_output *o, const char *data_in,
- uint64_t length_in, char **data_out, uint64_t *length_out);
- int (*event) (struct sr_output *o, int event_type, char **data_out,
+ int (*data) (struct sr_output *o, const uint8_t *data_in,
+ uint64_t length_in, uint8_t **data_out,
+ uint64_t *length_out);
+ int (*event) (struct sr_output *o, int event_type, uint8_t **data_out,
uint64_t *length_out);
};
/** The device can act as logic analyzer. */
SR_HWCAP_LOGIC_ANALYZER,
- /* TODO: SR_HWCAP_SCOPE, SW_HWCAP_PATTERN_GENERATOR, etc.? */
+ /** The device can act as an oscilloscope. */
+ SR_HWCAP_OSCILLOSCOPE,
/*--- Device types --------------------------------------------------*/
/** The device supports Run Length Encoding. */
SR_HWCAP_RLE,
+ /** The device supports setting trigger slope. */
+ SR_HWCAP_TRIGGERSLOPE,
+
/*--- Special stuff -------------------------------------------------*/
/* TODO: Better description. */
*/
SR_HWCAP_CONTINUOUS,
- /* TODO: SR_HWCAP_JUST_SAMPLE or similar. */
};
struct sr_hwcap_option {