*
* The correct way to get/use the libsigrok API functions is:
*
- @code{.c}
- #include <libsigrok/libsigrok.h>
- @endcode
+ * @code{.c}
+ * #include <libsigrok/libsigrok.h>
+ * @endcode
*/
/*
*/
/** Status/error codes returned by libsigrok functions. */
-enum {
+enum sr_error_code {
SR_OK = 0, /**< No error. */
SR_ERR = -1, /**< Generic/unspecified error. */
SR_ERR_MALLOC = -2, /**< Malloc/calloc/realloc error. */
*/
};
-#define SR_MAX_PROBENAME_LEN 32
+#define SR_MAX_CHANNELNAME_LEN 32
/* Handy little macros */
#define SR_HZ(n) (n)
#define SR_HZ_TO_NS(n) ((uint64_t)(1000000000ULL) / (n))
/** libsigrok loglevels. */
-enum {
+enum sr_loglevel {
SR_LOG_NONE = 0, /**< Output no messages at all. */
SR_LOG_ERR = 1, /**< Output error messages. */
SR_LOG_WARN = 2, /**< Output warnings. */
#endif
/** Type definition for callback function for data reception. */
-typedef int (*sr_receive_data_callback_t)(int fd, int revents, void *cb_data);
+typedef int (*sr_receive_data_callback)(int fd, int revents, void *cb_data);
/** Data types used by sr_config_info(). */
-enum {
+enum sr_datatype {
SR_T_UINT64 = 10000,
- SR_T_CHAR,
+ SR_T_STRING,
SR_T_BOOL,
SR_T_FLOAT,
SR_T_RATIONAL_PERIOD,
};
/** Value for sr_datafeed_packet.type. */
-enum {
+enum sr_packettype {
/** Payload is sr_datafeed_header. */
SR_DF_HEADER = 10000,
/** End of stream (no further data). */
};
/** Measured quantity, sr_datafeed_analog.mq. */
-enum {
+enum sr_mq {
SR_MQ_VOLTAGE = 10000,
SR_MQ_CURRENT,
SR_MQ_RESISTANCE,
SR_MQ_RELATIVE_HUMIDITY,
/** Time */
SR_MQ_TIME,
+ /** Wind speed */
+ SR_MQ_WIND_SPEED,
+ /** Pressure */
+ SR_MQ_PRESSURE,
};
/** Unit of measured quantity, sr_datafeed_analog.unit. */
-enum {
+enum sr_unit {
/** Volt */
SR_UNIT_VOLT = 10000,
/** Ampere (current). */
* a unitless quantity, for example.
*/
SR_UNIT_UNITLESS,
- /** Sound pressure level relative so 20 micropascals. */
+ /** Sound pressure level, in decibels, relative to 20 micropascals. */
SR_UNIT_DECIBEL_SPL,
/**
* Normalized (0 to 1) concentration of a substance or compound with 0
SR_UNIT_WATT,
/** Consumption [Wh]. */
SR_UNIT_WATT_HOUR,
+ /** Wind speed in meters per second. */
+ SR_UNIT_METER_SECOND,
+ /** Pressure in hectopascal */
+ SR_UNIT_HECTOPASCAL,
+ /** Relative humidity assuming air temperature of 293 kelvin (%rF). */
+ SR_UNIT_HUMIDITY_293K,
};
/** Values for sr_datafeed_analog.flags. */
-enum {
+enum sr_mqflag {
/** Voltage measurement is alternating current (AC). */
SR_MQFLAG_AC = 0x01,
/** Voltage measurement is direct current (DC). */
SR_MQFLAG_AVG = 0x40000,
};
+enum sr_trigger_matches {
+ SR_TRIGGER_ZERO = 1,
+ SR_TRIGGER_ONE,
+ SR_TRIGGER_RISING,
+ SR_TRIGGER_FALLING,
+ SR_TRIGGER_EDGE,
+ SR_TRIGGER_OVER,
+ SR_TRIGGER_UNDER,
+};
+
+/** The representation of a trigger, consisting of one or more stages
+ * containing one or more matches on a channel.
+ */
+struct sr_trigger {
+ /** A name for this trigger. This may be NULL if none is needed. */
+ char *name;
+ /** List of pointers to struct sr_trigger_stage. */
+ GSList *stages;
+};
+
+/** A trigger stage. */
+struct sr_trigger_stage {
+ /** Starts at 0. */
+ int stage;
+ /** List of pointers to struct sr_trigger_match. */
+ GSList *matches;
+};
+
+/** A channel to match and what to match it on. */
+struct sr_trigger_match {
+ /** The channel to trigger on. */
+ struct sr_channel *channel;
+ /** The trigger match to use.
+ * For logic channels, only the following matches may be used:
+ * SR_TRIGGER_ZERO
+ * SR_TRIGGER_ONE
+ * SR_TRIGGER_RISING
+ * SR_TRIGGER_FALLING
+ * SR_TRIGGER_EDGE
+ *
+ * For analog channels, only these matches may be used:
+ * SR_TRIGGER_RISING
+ * SR_TRIGGER_FALLING
+ * SR_TRIGGER_OVER
+ * SR_TRIGGER_UNDER
+ *
+ */
+ int match;
+ /** If the trigger match is one of SR_TRIGGER_OVER or SR_TRIGGER_UNDER,
+ * this contains the value to compare against. */
+ float value;
+};
+
/**
* @struct sr_context
* Opaque structure representing a libsigrok context.
/** Analog datafeed payload for type SR_DF_ANALOG. */
struct sr_datafeed_analog {
- /** The probes for which data is included in this packet. */
- GSList *probes;
+ /** The channels for which data is included in this packet. */
+ GSList *channels;
/** Number of samples in data */
int num_samples;
/** Measured quantity (voltage, current, temperature, and so on).
/** Bitmap with extra information about the MQ. Use SR_MQFLAG_AC, ... */
uint64_t mqflags;
/** The analog value(s). The data is interleaved according to
- * the probes list. */
+ * the channels list. */
float *data;
};
/** Output (file) format struct. */
struct sr_output {
- /**
- * A pointer to this output format's 'struct sr_output_format'.
- * The frontend can use this to call the module's callbacks.
- */
+ /** A pointer to this output's format. */
struct sr_output_format *format;
/**
* The device for which this output module is creating output. This
- * can be used by the module to find out probe names and numbers.
+ * can be used by the module to find out channel names and numbers.
*/
- struct sr_dev_inst *sdi;
+ const struct sr_dev_inst *sdi;
/**
* An optional parameter which the frontend can pass in to the
* output module. How the string is interpreted is entirely up to
* the module.
*/
- char *param;
+ GHashTable *params;
/**
* A generic pointer which can be used by the module to keep internal
*/
char *description;
- /** Datafeed type, SR_DF_HEADER, etc. */
- int df_type;
-
/**
* This function is called once, at the beginning of an output stream.
*
*/
int (*init) (struct sr_output *o);
- /**
- * Whenever a chunk of data comes in, it will be passed to the
- * output module via this function. The <code>data_in</code> and
- * <code>length_in</code> values refers to this data; the module
- * must not alter or g_free() this buffer.
- *
- * The function must allocate a buffer for storing its output, and
- * pass along a pointer to this buffer in the <code>data_out</code>
- * parameter, as well as storing the length of the buffer in
- * <code>length_out</code>. The calling frontend will g_free()
- * this buffer when it's done with it.
- *
- * IMPORTANT: The memory allocation much happen using a glib memory
- * allocation call (not a "normal" malloc) since g_free() will be
- * used to free the memory!
- *
- * If there is no output, this function MUST store NULL in the
- * <code>data_out</code> parameter, so the caller knows not to try
- * and g_free() it.
- *
- * Note: This API call is obsolete, use receive() instead.
- *
- * @param o Pointer to the respective 'struct sr_output'.
- * @param data_in Pointer to the input data buffer.
- * @param length_in Length of the input.
- * @param data_out Pointer to the allocated output buffer.
- * @param length_out Length (in bytes) of the output.
- *
- * @retval SR_OK Success
- * @retval other Negative error code.
- */
- int (*data) (struct sr_output *o, const uint8_t *data_in,
- uint64_t length_in, uint8_t **data_out,
- uint64_t *length_out);
-
- /**
- * This function is called when an event occurs in the datafeed
- * which the output module may need to be aware of. No data is
- * passed in, only the fact that the event occurs. The following
- * events can currently be passed in:
- *
- * - SR_DF_TRIGGER: At this point in the datafeed, the trigger
- * matched. The output module may mark this in some way, e.g. by
- * plotting a red line on a graph.
- *
- * - SR_DF_END: This marks the end of the datafeed. No more calls
- * into the output module will be done, so this is a good time to
- * free up any memory used to keep state, for example.
- *
- * Any output generated by this function must have a reference to
- * it stored in the <code>data_out</code> and <code>length_out</code>
- * parameters, or NULL if no output was generated.
- *
- * Note: This API call is obsolete, use receive() instead.
- *
- * @param o Pointer to the respective 'struct sr_output'.
- * @param event_type Type of event that occured.
- * @param data_out Pointer to the allocated output buffer.
- * @param length_out Length (in bytes) of the output.
- *
- * @retval SR_OK Success
- * @retval other Negative error code.
- */
- int (*event) (struct sr_output *o, int event_type, uint8_t **data_out,
- uint64_t *length_out);
-
/**
* This function is passed a copy of every packed in the data feed.
* Any output generated by the output module in response to the
* @retval SR_OK Success
* @retval other Negative error code.
*/
- int (*receive) (struct sr_output *o, const struct sr_dev_inst *sdi,
+ int (*receive) (struct sr_output *o,
const struct sr_datafeed_packet *packet, GString **out);
/**
int (*cleanup) (struct sr_output *o);
};
-/** Constants for probe type. */
-enum {
- /** Probe type is logic probe. */
- SR_PROBE_LOGIC = 10000,
- /** Probe type is analog probe. */
- SR_PROBE_ANALOG,
+/** Constants for channel type. */
+enum sr_channeltype {
+ /** Channel type is logic channel. */
+ SR_CHANNEL_LOGIC = 10000,
+ /** Channel type is analog channel. */
+ SR_CHANNEL_ANALOG,
};
-/** Information on single probe. */
-struct sr_probe {
- /** Number of probes, starting at 0. */
+/** Information on single channel. */
+struct sr_channel {
+ /** The index of this channel, starting at 0. Logic channels will
+ * be encoded according to this index in SR_DF_LOGIC packets. */
int index;
- /** Probe type (SR_PROBE_LOGIC, ...) */
+ /** Channel type (SR_CHANNEL_LOGIC, ...) */
int type;
- /** Is this probe enabled? */
+ /** Is this channel enabled? */
gboolean enabled;
- /** Name of probe. */
+ /** Name of channel. */
char *name;
- /** Trigger string, format like used by sigrok-cli */
- char *trigger;
};
/** Structure for groups of channels that have common properties. */
struct sr_channel_group {
/** Name of the channel group. */
char *name;
- /** List of sr_probe structs of the channels belonging to this group. */
+ /** List of sr_channel structs of the channels belonging to this group. */
GSList *channels;
/** Private data for driver use. */
void *priv;
struct sr_config_info {
/** Config key like SR_CONF_CONN, etc. */
int key;
- /** Data type like SR_T_CHAR, etc. */
+ /** Data type like SR_T_STRING, etc. */
int datatype;
/** Id string, e.g. "serialcomm". */
char *id;
};
/** Constants for device classes */
-enum {
+enum sr_configkey {
/*--- Device classes ------------------------------------------------*/
/** The device can act as logic analyzer. */
/** Coupling. */
SR_CONF_COUPLING,
- /** Trigger types. */
- SR_CONF_TRIGGER_TYPE,
+ /** Trigger matches. */
+ SR_CONF_TRIGGER_MATCH,
/** The device supports setting its sample interval, in ms. */
SR_CONF_SAMPLE_INTERVAL,
*/
SR_CONF_CENTER_FREQUENCY,
- /** The device supports setting the number of logic probes. */
- SR_CONF_NUM_LOGIC_PROBES,
+ /** The device supports setting the number of logic channels. */
+ SR_CONF_NUM_LOGIC_CHANNELS,
- /** The device supports setting the number of analog probes. */
- SR_CONF_NUM_ANALOG_PROBES,
+ /** The device supports setting the number of analog channels. */
+ SR_CONF_NUM_ANALOG_CHANNELS,
/** Output voltage. */
SR_CONF_OUTPUT_VOLTAGE,
/** The device has internal storage, into which data is logged. This
* starts or stops the internal logging. */
SR_CONF_DATALOG,
+
+ /** Device mode for multi-function devices. */
+ SR_CONF_DEVICE_MODE,
+
+ /** Self test mode. */
+ SR_CONF_TEST_MODE,
};
/** Device instance data
char *model;
/** Device version. */
char *version;
- /** List of probes. */
- GSList *probes;
+ /** List of channels. */
+ GSList *channels;
/** List of sr_channel_group structs */
GSList *channel_groups;
/** Device instance connection data (used?) */
};
/** Types of device instance, struct sr_dev_inst.type */
-enum {
+enum sr_dev_inst_type {
/** Device instance type for USB devices. */
SR_INST_USB = 10000,
/** Device instance type for serial port devices. */
};
/** Device instance status, struct sr_dev_inst.status */
-enum {
+enum sr_dev_inst_status {
/** The device instance was not found. */
SR_ST_NOT_FOUND = 10000,
/** The device instance was found, but is still booting. */
*/
int (*config_get) (int id, GVariant **data,
const struct sr_dev_inst *sdi,
- const struct sr_channel_group *channel_group);
+ const struct sr_channel_group *cg);
/** Set value of a configuration key in driver or a given device instance.
* @see sr_config_set(). */
int (*config_set) (int id, GVariant *data,
const struct sr_dev_inst *sdi,
- const struct sr_channel_group *channel_group);
- /** Probe status change.
- * @see sr_dev_probe_enable(), sr_dev_trigger_set(). */
- int (*config_probe_set) (const struct sr_dev_inst *sdi,
- struct sr_probe *probe, unsigned int changes);
+ const struct sr_channel_group *cg);
+ /** Channel status change.
+ * @see sr_dev_channel_enable(). */
+ int (*config_channel_set) (const struct sr_dev_inst *sdi,
+ struct sr_channel *ch, unsigned int changes);
/** Apply configuration settings to the device hardware.
* @see sr_config_commit().*/
int (*config_commit) (const struct sr_dev_inst *sdi);
*/
int (*config_list) (int info_id, GVariant **data,
const struct sr_dev_inst *sdi,
- const struct sr_channel_group *channel_group);
+ const struct sr_channel_group *cg);
/* Device-specific */
/** Open device */