BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Header cleanup.

This commit is contained in:
Bert Vermeulen 2013-01-25 15:16:39 +01:00
parent 0d485e30c6
commit aeba33ba21
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libsigrok.h
View File

@ -286,6 +286,7 @@ struct sr_datafeed_logic {
}; };
struct sr_datafeed_analog { struct sr_datafeed_analog {
/** The probes for which data is included in this packet. */
GSList *probes; GSList *probes;
int num_samples; int num_samples;
/** Measured quantity (voltage, current, temperature, and so on). */ /** Measured quantity (voltage, current, temperature, and so on). */
@ -294,7 +295,8 @@ struct sr_datafeed_analog {
int unit; int unit;
/** Bitmap with extra information about the MQ. */ /** Bitmap with extra information about the MQ. */
uint64_t mqflags; uint64_t mqflags;
/** The analog value. */ /** The analog value(s). The data is interleaved according to
* the probes list. */
float *data; float *data;
}; };
@ -467,23 +469,20 @@ enum {
/*--- Special stuff -------------------------------------------------*/ /*--- Special stuff -------------------------------------------------*/
/** Scan options supported by the driver. */ /** Scan options supported by the driver. */
SR_CONF_SCAN_OPTIONS, 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 = 40000, SR_CONF_SESSIONFILE,
/* TODO: Better description. */
/** The device supports specifying a capturefile to inject. */ /** The device supports specifying a capturefile to inject. */
SR_CONF_CAPTUREFILE, SR_CONF_CAPTUREFILE,
/* TODO: Better description. */
/** The device supports specifying the capturefile unit size. */ /** The device supports specifying the capturefile unit size. */
SR_CONF_CAPTURE_UNITSIZE, SR_CONF_CAPTURE_UNITSIZE,
/* TODO: Better description. */
/** 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,