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

unify sr_datafeed_meta_* into one struct containing sr_config 

struct sr_config is the new name for sr_hwopt. Its companion meta
struct, sr_hwcap_option, was renamed sr_config_info.
This commit is contained in:
Bert Vermeulen 2013-01-06 16:37:41 +01:00
parent 86c02e6554
commit 9a5693a5ac
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libsigrok.h
View File

@ -148,11 +148,10 @@ struct sr_rational {
enum { enum {
SR_DF_HEADER = 10000, SR_DF_HEADER = 10000,
SR_DF_END, SR_DF_END,
SR_DF_META,
SR_DF_TRIGGER, SR_DF_TRIGGER,
SR_DF_LOGIC, SR_DF_LOGIC,
SR_DF_META_LOGIC,
SR_DF_ANALOG, SR_DF_ANALOG,
SR_DF_META_ANALOG,
SR_DF_FRAME_BEGIN, SR_DF_FRAME_BEGIN,
SR_DF_FRAME_END, SR_DF_FRAME_END,
}; };
@ -276,6 +275,10 @@ struct sr_datafeed_header {
struct timeval starttime; struct timeval starttime;
}; };
struct sr_datafeed_meta {
GSList *config;
};
struct sr_datafeed_meta_logic { struct sr_datafeed_meta_logic {
int num_probes; int num_probes;
uint64_t samplerate; uint64_t samplerate;
@ -368,11 +371,19 @@ struct sr_probe {
char *trigger; char *trigger;
}; };
struct sr_hwopt { struct sr_config {
int hwopt; int key;
const void *value; const void *value;
}; };
struct sr_config_info {
int key;
char *id;
char *name;
char *description;
int datatype;
};
/** Hardware driver options. */ /** Hardware driver options. */
enum { enum {
/** /**
@ -515,13 +526,6 @@ enum {
SR_HWCAP_CONTINUOUS, SR_HWCAP_CONTINUOUS,
}; };
struct sr_hwcap_option {
int hwcap;
int type;
char *description;
char *shortname;
};
struct sr_dev_inst { struct sr_dev_inst {
struct sr_dev_driver *driver; struct sr_dev_driver *driver;
int index; int index;