libsigrok.h   libsigrok.h 
skipping to change at line 75 skipping to change at line 75
/** Status/error codes returned by libsigrok functions. */ /** Status/error codes returned by libsigrok functions. */
enum { enum {
SR_OK = 0, /**< No error. */ SR_OK = 0, /**< No error. */
SR_ERR = -1, /**< Generic/unspecified error. */ SR_ERR = -1, /**< Generic/unspecified error. */
SR_ERR_MALLOC = -2, /**< Malloc/calloc/realloc error. */ SR_ERR_MALLOC = -2, /**< Malloc/calloc/realloc error. */
SR_ERR_ARG = -3, /**< Function argument error. */ SR_ERR_ARG = -3, /**< Function argument error. */
SR_ERR_BUG = -4, /**< Errors hinting at internal bugs. */ SR_ERR_BUG = -4, /**< Errors hinting at internal bugs. */
SR_ERR_SAMPLERATE = -5, /**< Incorrect samplerate. */ SR_ERR_SAMPLERATE = -5, /**< Incorrect samplerate. */
SR_ERR_NA = -6, /**< Not applicable. */ SR_ERR_NA = -6, /**< Not applicable. */
SR_ERR_DEV_CLOSED = -7, /**< Device is closed, but needs to be open. */ SR_ERR_DEV_CLOSED = -7, /**< Device is closed, but needs to be open. */
SR_ERR_TIMEOUT = -8, /**< A timeout occurred. */
/* /*
* Note: When adding entries here, don't forget to also update the * Note: When adding entries here, don't forget to also update the
* sr_strerror() and sr_strerror_name() functions in error.c. * sr_strerror() and sr_strerror_name() functions in error.c.
*/ */
}; };
#define SR_MAX_PROBENAME_LEN 32 #define SR_MAX_PROBENAME_LEN 32
/* Handy little macros */ /* Handy little macros */
skipping to change at line 143 skipping to change at line 144
/** Data types used by sr_config_info(). */ /** Data types used by sr_config_info(). */
enum { enum {
SR_T_UINT64 = 10000, SR_T_UINT64 = 10000,
SR_T_CHAR, SR_T_CHAR,
SR_T_BOOL, SR_T_BOOL,
SR_T_FLOAT, SR_T_FLOAT,
SR_T_RATIONAL_PERIOD, SR_T_RATIONAL_PERIOD,
SR_T_RATIONAL_VOLT, SR_T_RATIONAL_VOLT,
SR_T_KEYVALUE, SR_T_KEYVALUE,
SR_T_UINT64_RANGE,
}; };
/** Value for sr_datafeed_packet.type. */ /** Value for sr_datafeed_packet.type. */
enum { enum {
SR_DF_HEADER = 10000, SR_DF_HEADER = 10000,
SR_DF_END, SR_DF_END,
SR_DF_META, SR_DF_META,
SR_DF_TRIGGER, SR_DF_TRIGGER,
SR_DF_LOGIC, SR_DF_LOGIC,
SR_DF_ANALOG, SR_DF_ANALOG,
skipping to change at line 667 skipping to change at line 669
/** The device supports setting its sample interval, in ms. */ /** The device supports setting its sample interval, in ms. */
SR_CONF_SAMPLE_INTERVAL, SR_CONF_SAMPLE_INTERVAL,
/** Number of timebases, as related to SR_CONF_TIMEBASE. */ /** Number of timebases, as related to SR_CONF_TIMEBASE. */
SR_CONF_NUM_TIMEBASE, SR_CONF_NUM_TIMEBASE,
/** Number of vertical divisions, as related to SR_CONF_VDIV. */ /** Number of vertical divisions, as related to SR_CONF_VDIV. */
SR_CONF_NUM_VDIV, SR_CONF_NUM_VDIV,
/** Sound pressure level frequency weighting. */
SR_CONF_SPL_WEIGHT_FREQ,
/** Sound pressure level time weighting. */
SR_CONF_SPL_WEIGHT_TIME,
/** Sound pressure level measurement range. */
SR_CONF_SPL_MEASUREMENT_RANGE,
/** Max hold mode. */
SR_CONF_HOLD_MAX,
/** Min hold mode. */
SR_CONF_HOLD_MIN,
/*--- Special stuff ------------------------------------------------ -*/ /*--- Special stuff ------------------------------------------------ -*/
/** Scan options supported by the driver. */ /** Scan options supported by the driver. */
SR_CONF_SCAN_OPTIONS = 40000, SR_CONF_SCAN_OPTIONS = 40000,
/** Device options for a particular device. */ /** Device options for a particular device. */
SR_CONF_DEVICE_OPTIONS, SR_CONF_DEVICE_OPTIONS,
/** Session filename. */ /** Session filename. */
SR_CONF_SESSIONFILE, SR_CONF_SESSIONFILE,
/** The device supports specifying a capturefile to inject. */ /** The device supports specifying a capturefile to inject. */
SR_CONF_CAPTUREFILE, SR_CONF_CAPTUREFILE,
/** The device supports specifying the capturefile unit size. */ /** The device supports specifying the capturefile unit size. */
SR_CONF_CAPTURE_UNITSIZE, SR_CONF_CAPTURE_UNITSIZE,
/** The device supports setting the number of probes. */ /** The device supports setting the number of probes. */
SR_CONF_CAPTURE_NUM_PROBES, SR_CONF_CAPTURE_NUM_PROBES,
/** Power off the device. */
SR_CONF_POWER_OFF,
/** Data source for acquisition. If not present, acquisition from
* the device is always "live", i.e. acquisition starts when the
* frontend asks and the results are sent out as soon as possible.
*
* If present, it indicates that either the device has no live
* acquisition capability (for example a pure data logger), or
* there is a choice. sr_config_list() returns those choices.
*
* In any case if a device has live acquisition capabilities, it
* is always the default. */
SR_CONF_DATA_SOURCE,
/*--- Acquisition modes -------------------------------------------- -*/ /*--- Acquisition modes -------------------------------------------- -*/
/** /**
* The device supports setting a sample time limit (how long * The device supports setting a sample time limit (how long
* the sample acquisition should run, in ms). * the sample acquisition should run, in ms).
*/ */
SR_CONF_LIMIT_MSEC = 50000, SR_CONF_LIMIT_MSEC = 50000,
/** /**
* The device supports setting a sample number limit (how many * The device supports setting a sample number limit (how many
 End of changes. 4 change blocks. 
0 lines changed or deleted 32 lines changed or added


 version.h   version.h 
skipping to change at line 46 skipping to change at line 46
* Package version macros (can be used for conditional compilation). * Package version macros (can be used for conditional compilation).
*/ */
/** The libsigrok package 'major' version number. */ /** The libsigrok package 'major' version number. */
#define SR_PACKAGE_VERSION_MAJOR 0 #define SR_PACKAGE_VERSION_MAJOR 0
/** The libsigrok package 'minor' version number. */ /** The libsigrok package 'minor' version number. */
#define SR_PACKAGE_VERSION_MINOR 2 #define SR_PACKAGE_VERSION_MINOR 2
/** The libsigrok package 'micro' version number. */ /** The libsigrok package 'micro' version number. */
#define SR_PACKAGE_VERSION_MICRO 0 #define SR_PACKAGE_VERSION_MICRO 1
/** The libsigrok package version ("major.minor.micro") as string. */ /** The libsigrok package version ("major.minor.micro") as string. */
#define SR_PACKAGE_VERSION_STRING "0.2.0" #define SR_PACKAGE_VERSION_STRING "0.2.1"
/* /*
* Library/libtool version macros (can be used for conditional compilation) . * Library/libtool version macros (can be used for conditional compilation) .
*/ */
/** The libsigrok libtool 'current' version number. */ /** The libsigrok libtool 'current' version number. */
#define SR_LIB_VERSION_CURRENT 1 #define SR_LIB_VERSION_CURRENT 1
/** The libsigrok libtool 'revision' version number. */ /** The libsigrok libtool 'revision' version number. */
#define SR_LIB_VERSION_REVISION 0 #define SR_LIB_VERSION_REVISION 1
/** The libsigrok libtool 'age' version number. */ /** The libsigrok libtool 'age' version number. */
#define SR_LIB_VERSION_AGE 0 #define SR_LIB_VERSION_AGE 0
/** The libsigrok libtool version ("current:revision:age") as string. */ /** The libsigrok libtool version ("current:revision:age") as string. */
#define SR_LIB_VERSION_STRING "1:0:0" #define SR_LIB_VERSION_STRING "1:1:0"
/** @} */ /** @} */
#endif #endif
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/