X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok.h;h=81709b3e6989536a78bd99780d4d56a53b2e7ee8;hb=809c5f2011198a064a2e5e4028f19e63eb532ec1;hp=9a5d0cbeade3bacab1e368481565652ca9f2af76;hpb=2872d21ebc4e9554f685551e4915f193357f13d9;p=libsigrok.git

diff --git a/sigrok.h b/sigrok.h
index 9a5d0cbe..81709b3e 100644
--- a/sigrok.h
+++ b/sigrok.h
@@ -74,7 +74,7 @@ extern "C" {
 #define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a)
 #endif
 
-typedef int (*receive_data_callback) (int fd, int revents, void *user_data);
+typedef int (*sr_receive_data_callback) (int fd, int revents, void *user_data);
 
 /* Data types used by hardware plugins for set_configuration() */
 enum {
@@ -88,7 +88,7 @@ enum {
 };
 
 /* (Unused) protocol decoder stack entry */
-struct protocol {
+struct sr_protocol {
 	char *name;
 	int id;
 	int stackindex;
@@ -120,15 +120,15 @@ struct sr_datafeed_header {
 	int num_logic_probes;
 };
 
-struct analog_probe {
+struct sr_analog_probe {
 	uint8_t att;
 	uint8_t res;	/* Needs to be a power of 2, FIXME */
 	uint16_t val;	/* Max hardware ADC width is 16bits */
 };
 
-struct analog_sample {
+struct sr_analog_sample {
 	uint8_t num_probes; /* Max hardware probes is 256 */
-	struct analog_probe probes[];
+	struct sr_analog_probe probes[];
 };
 
 struct sr_input {
@@ -163,7 +163,7 @@ struct sr_output_format {
 		      uint64_t *length_out);
 };
 
-struct analyzer {
+struct sr_analyzer {
 	char *name;
 	char *filename;
 	/*
@@ -175,7 +175,7 @@ struct analyzer {
 /* Size of a chunk in units */
 #define DATASTORE_CHUNKSIZE 512000
 
-struct datastore {
+struct sr_datastore {
 	/* Size in bytes of the number of units stored in this datastore */
 	int ds_unitsize;
 	unsigned int num_units; /* TODO: uint64_t */
@@ -196,7 +196,7 @@ struct sr_device {
 	/* List of struct sr_probe* */
 	GSList *probes;
 	/* Data acquired by this device, if any */
-	struct datastore *datastore;
+	struct sr_datastore *datastore;
 };
 
 enum {
@@ -237,7 +237,7 @@ enum {
 	SR_HWCAP_CONTINUOUS,
 };
 
-struct hwcap_option {
+struct sr_hwcap_option {
 	int capability;
 	int type;
 	char *description;
@@ -299,7 +299,7 @@ enum {
 	SR_DI_INSTANCE,
 	/* The number of probes connected to this device */
 	SR_DI_NUM_PROBES,
-	/* Samplerates supported by this device, (struct samplerates) */
+	/* Samplerates supported by this device, (struct sr_samplerates) */
 	SR_DI_SAMPLERATES,
 	/* Types of trigger supported, out of "01crf" (char *) */
 	SR_DI_TRIGGER_TYPES,
@@ -314,7 +314,7 @@ enum {
  * granularity, or is limited to a set of defined samplerates. Use either
  * step or list, but not both.
  */
-struct samplerates {
+struct sr_samplerates {
 	uint64_t low;
 	uint64_t high;
 	uint64_t step;
@@ -345,7 +345,7 @@ struct sr_session {
 	GSList *devices;
 	/* List of struct analyzer* */
 	GSList *analyzers;
-	/* list of receive_data_callback */
+	/* list of sr_receive_data_callback */
 	GSList *datafeed_callbacks;
 	GTimeVal starttime;
 	gboolean running;