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

Header cleanup: remove unused structs.

This commit is contained in:
Bert Vermeulen 2013-01-22 11:18:18 +01:00
parent 431ec7ca4a
commit 08a9260ba4
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libsigrok.h
View File

@ -125,7 +125,7 @@ enum {
typedef int (*sr_receive_data_callback_t)(int fd, int revents, void *cb_data); typedef int (*sr_receive_data_callback_t)(int fd, int revents, void *cb_data);
/** Data types used by hardware drivers for dev_config_set(). */ /** Data types used by sr_config_info(). */
enum { enum {
SR_T_UINT64 = 10000, SR_T_UINT64 = 10000,
SR_T_CHAR, SR_T_CHAR,
@ -279,21 +279,12 @@ struct sr_datafeed_meta {
GSList *config; GSList *config;
}; };
struct sr_datafeed_meta_logic {
int num_probes;
uint64_t samplerate;
};
struct sr_datafeed_logic { struct sr_datafeed_logic {
uint64_t length; uint64_t length;
uint16_t unitsize; uint16_t unitsize;
void *data; void *data;
}; };
struct sr_datafeed_meta_analog {
int num_probes;
};
struct sr_datafeed_analog { struct sr_datafeed_analog {
int num_samples; int num_samples;
/** Measured quantity (voltage, current, temperature, and so on). */ /** Measured quantity (voltage, current, temperature, and so on). */
@ -333,9 +324,11 @@ struct sr_output_format {
char *description; char *description;
int df_type; int df_type;
int (*init) (struct sr_output *o); int (*init) (struct sr_output *o);
/* Obsolete, use recv() instead. */
int (*data) (struct sr_output *o, const uint8_t *data_in, int (*data) (struct sr_output *o, const uint8_t *data_in,
uint64_t length_in, uint8_t **data_out, uint64_t length_in, uint8_t **data_out,
uint64_t *length_out); uint64_t *length_out);
/* Obsolete, use recv() instead. */
int (*event) (struct sr_output *o, int event_type, uint8_t **data_out, int (*event) (struct sr_output *o, int event_type, uint8_t **data_out,
uint64_t *length_out); uint64_t *length_out);
GString *(*recv) (struct sr_output *o, const struct sr_dev_inst *sdi, GString *(*recv) (struct sr_output *o, const struct sr_dev_inst *sdi,
@ -343,27 +336,13 @@ struct sr_output_format {
int (*cleanup) (struct sr_output *o); int (*cleanup) (struct sr_output *o);
}; };
/*
* This represents a generic device connected to the system.
* For device-specific information, ask the driver. The driver_index refers
* to the device index within that driver; it may be handling more than one
* device. All relevant driver calls take a dev_index parameter for this.
*/
struct sr_dev {
/** Which driver handles this device. */
struct sr_dev_driver *driver;
/** A driver may handle multiple devices of the same type. */
int driver_index;
/** List of struct sr_probe pointers. */
GSList *probes;
};
enum { enum {
SR_PROBE_LOGIC = 10000, SR_PROBE_LOGIC = 10000,
SR_PROBE_ANALOG, SR_PROBE_ANALOG,
}; };
struct sr_probe { struct sr_probe {
/* The index field will go: use g_slist_length(sdi->probes) instead. */
int index; int index;
int type; int type;
gboolean enabled; gboolean enabled;