Rename SR_T_CHAR to SR_T_STRING.

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index f233b8cc47b7da5d9a997037bf49f3d879fece32..0b6888d93c663376a9242a8de38dd99c2c82de04 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -41,9 +41,9 @@ extern "C" {
  *
  * 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
  */
 
 /*
@@ -63,7 +63,7 @@ extern "C" {
  */
 
 /** 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. */
@@ -92,7 +92,7 @@ enum {
 #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. */
@@ -132,12 +132,12 @@ enum {
 #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,
@@ -149,7 +149,7 @@ enum {
 };
 
 /** 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). */
@@ -169,7 +169,7 @@ enum {
 };
 
 /** Measured quantity, sr_datafeed_analog.mq. */
-enum {
+enum sr_mq {
        SR_MQ_VOLTAGE = 10000,
        SR_MQ_CURRENT,
        SR_MQ_RESISTANCE,
@@ -198,7 +198,7 @@ enum {
 };
 
 /** Unit of measured quantity, sr_datafeed_analog.unit. */
-enum {
+enum sr_unit {
        /** Volt */
        SR_UNIT_VOLT = 10000,
        /** Ampere (current). */
@@ -255,7 +255,7 @@ enum {
 };
 
 /** 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). */
@@ -526,7 +526,7 @@ struct sr_output_format {
 };
 
 /** Constants for channel type. */
-enum {
+enum sr_channeltype {
        /** Channel type is logic channel. */
        SR_CHANNEL_LOGIC = 10000,
        /** Channel type is analog channel. */
@@ -569,7 +569,7 @@ struct sr_config {
 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;
@@ -580,7 +580,7 @@ struct sr_config_info {
 };
 
 /** Constants for device classes */
-enum {
+enum sr_configkey {
        /*--- Device classes ------------------------------------------------*/
 
        /** The device can act as logic analyzer. */
@@ -828,6 +828,12 @@ enum {
        /** 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
@@ -858,7 +864,7 @@ struct sr_dev_inst {
 };
 
 /** 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. */
@@ -868,7 +874,7 @@ enum {
 };
 
 /** 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. */