libsigrok.h   libsigrok.h 
skipping to change at line 145 skipping to change at line 145
/** 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, SR_T_UINT64_RANGE,
SR_T_DOUBLE_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 218 skipping to change at line 219
*/ */
SR_UNIT_UNITLESS, SR_UNIT_UNITLESS,
/** Sound pressure level relative so 20 micropascals. */ /** Sound pressure level relative so 20 micropascals. */
SR_UNIT_DECIBEL_SPL, SR_UNIT_DECIBEL_SPL,
/** /**
* Normalized (0 to 1) concentration of a substance or compound with 0 * Normalized (0 to 1) concentration of a substance or compound with 0
* representing a concentration of 0%, and 1 being 100%. This is * representing a concentration of 0%, and 1 being 100%. This is
* represented as the fraction of number of particles of the substan ce. * represented as the fraction of number of particles of the substan ce.
*/ */
SR_UNIT_CONCENTRATION, SR_UNIT_CONCENTRATION,
SR_UNIT_REVOLUTIONS_PER_MINUTE,
SR_UNIT_VOLT_AMPERE,
SR_UNIT_WATT,
SR_UNIT_WATT_HOUR,
}; };
/** Values for sr_datafeed_analog.flags. */ /** Values for sr_datafeed_analog.flags. */
enum { enum {
/** Voltage measurement is alternating current (AC). */ /** Voltage measurement is alternating current (AC). */
SR_MQFLAG_AC = 0x01, SR_MQFLAG_AC = 0x01,
/** Voltage measurement is direct current (DC). */ /** Voltage measurement is direct current (DC). */
SR_MQFLAG_DC = 0x02, SR_MQFLAG_DC = 0x02,
/** This is a true RMS measurement. */ /** This is a true RMS measurement. */
SR_MQFLAG_RMS = 0x04, SR_MQFLAG_RMS = 0x04,
skipping to change at line 584 skipping to change at line 589
/** The device can act as a sound level meter. */ /** The device can act as a sound level meter. */
SR_CONF_SOUNDLEVELMETER, SR_CONF_SOUNDLEVELMETER,
/** The device can measure temperature. */ /** The device can measure temperature. */
SR_CONF_THERMOMETER, SR_CONF_THERMOMETER,
/** The device can measure humidity. */ /** The device can measure humidity. */
SR_CONF_HYGROMETER, SR_CONF_HYGROMETER,
/** The device can measure energy consumption. */
SR_CONF_ENERGYMETER,
/*--- Driver scan options ------------------------------------------ -*/ /*--- Driver scan options ------------------------------------------ -*/
/** /**
* Specification on how to connect to a device. * Specification on how to connect to a device.
* *
* In combination with SR_CONF_SERIALCOMM, this is a serial port in * In combination with SR_CONF_SERIALCOMM, this is a serial port in
* the form which makes sense to the OS (e.g., /dev/ttyS0). * the form which makes sense to the OS (e.g., /dev/ttyS0).
* Otherwise this specifies a USB device, either in the form of * Otherwise this specifies a USB device, either in the form of
* @verbatim <bus>.<address> @endverbatim (decimal, e.g. 1.65) or * @verbatim <bus>.<address> @endverbatim (decimal, e.g. 1.65) or
* @verbatim <vendorid>.<productid> @endverbatim * @verbatim <vendorid>.<productid> @endverbatim
skipping to change at line 684 skipping to change at line 692
/** Sound pressure level measurement range. */ /** Sound pressure level measurement range. */
SR_CONF_SPL_MEASUREMENT_RANGE, SR_CONF_SPL_MEASUREMENT_RANGE,
/** Max hold mode. */ /** Max hold mode. */
SR_CONF_HOLD_MAX, SR_CONF_HOLD_MAX,
/** Min hold mode. */ /** Min hold mode. */
SR_CONF_HOLD_MIN, SR_CONF_HOLD_MIN,
/** Logic low-high threshold range. */
SR_CONF_VOLTAGE_THRESHOLD,
/** The device supports using a external clock. */
SR_CONF_EXTERNAL_CLOCK,
/**
* The device supports swapping channels. Typical this is between
* buffered and unbuffered channels.
*/
SR_CONF_SWAP,
/*--- 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,
skipping to change at line 821 skipping to change at line 841
/* Dynamic */ /* Dynamic */
void *priv; void *priv;
}; };
struct sr_session { struct sr_session {
/** List of struct sr_dev pointers. */ /** List of struct sr_dev pointers. */
GSList *devs; GSList *devs;
/** List of struct datafeed_callback pointers. */ /** List of struct datafeed_callback pointers. */
GSList *datafeed_callbacks; GSList *datafeed_callbacks;
GTimeVal starttime; GTimeVal starttime;
gboolean running;
unsigned int num_sources; unsigned int num_sources;
/* /*
* Both "sources" and "pollfds" are of the same size and contain pai rs * Both "sources" and "pollfds" are of the same size and contain pai rs
* of descriptor and callback function. We can not embed the GPollFD * of descriptor and callback function. We can not embed the GPollFD
* into the source struct since we want to be able to pass the array * into the source struct since we want to be able to pass the array
* of all poll descriptors to g_poll(). * of all poll descriptors to g_poll().
*/ */
struct source *sources; struct source *sources;
 End of changes. 5 change blocks. 
0 lines changed or deleted 21 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 1 #define SR_PACKAGE_VERSION_MICRO 2
/** 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.1" #define SR_PACKAGE_VERSION_STRING "0.2.2"
/* /*
* 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 1 #define SR_LIB_VERSION_REVISION 2
/** 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:1:0" #define SR_LIB_VERSION_STRING "1:2: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/