X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok.h;h=e839c4844c9d40a67af9ed4a99cad4219ded9680;hb=da0918aae0d43ab25cb72ddf8773831f0364ebdb;hp=2eda97ba590a129abec54042f32103e82f9b3620;hpb=9688b443f65c7779a07b0e3ef2b9f9721ff742cd;p=libsigrok.git

diff --git a/sigrok.h b/sigrok.h
index 2eda97ba..e839c484 100644
--- a/sigrok.h
+++ b/sigrok.h
@@ -53,17 +53,19 @@ extern "C" {
 #define SR_OK                 0 /* No error */
 #define SR_ERR               -1 /* Generic/unspecified error */
 #define SR_ERR_MALLOC        -2 /* Malloc/calloc/realloc error */
-#define SR_ERR_SAMPLERATE    -3 /* Incorrect samplerate */
+#define SR_ERR_ARG           -3 /* Function argument error */
+#define SR_ERR_SAMPLERATE    -4 /* Incorrect samplerate */
 
 #define SR_MAX_NUM_PROBES 	64 /* Limited by uint64_t. */
 #define SR_MAX_PROBENAME_LEN	32
 
 /* Handy little macros */
-#define KHZ(n) ((n) * 1000)
-#define MHZ(n) ((n) * 1000000)
-#define GHZ(n) ((n) * 1000000000)
+#define SR_HZ(n)  (n)
+#define SR_KHZ(n) ((n) * 1000)
+#define SR_MHZ(n) ((n) * 1000000)
+#define SR_GHZ(n) ((n) * 1000000000)
 
-#define HZ_TO_NS(n) (1000000000 / (n))
+#define SR_HZ_TO_NS(n) (1000000000 / (n))
 
 typedef int (*sr_receive_data_callback) (int fd, int revents, void *user_data);
 
@@ -78,12 +80,14 @@ enum {
 	SR_PROTO_RAW,
 };
 
+#if 0
 /* (Unused) protocol decoder stack entry */
 struct sr_protocol {
 	char *name;
 	int id;
 	int stackindex;
 };
+#endif
 
 /* sr_datafeed_packet.type values */
 enum {
@@ -111,6 +115,7 @@ struct sr_datafeed_header {
 	int num_logic_probes;
 };
 
+#if defined(HAVE_LA_ALSA)
 struct sr_analog_probe {
 	uint8_t att;
 	uint8_t res;	/* Needs to be a power of 2, FIXME */
@@ -121,6 +126,7 @@ struct sr_analog_sample {
 	uint8_t num_probes; /* Max hardware probes is 256 */
 	struct sr_analog_probe probes[];
 };
+#endif
 
 struct sr_input {
 	struct sr_input_format *format;
@@ -129,7 +135,7 @@ struct sr_input {
 };
 
 struct sr_input_format {
-	char *extension;
+	char *id;
 	char *description;
 	int (*format_match) (const char *filename);
 	int (*init) (struct sr_input *in);
@@ -144,7 +150,7 @@ struct sr_output {
 };
 
 struct sr_output_format {
-	char *extension;
+	char *id;
 	char *description;
 	int df_type;
 	int (*init) (struct sr_output *o);
@@ -154,6 +160,7 @@ struct sr_output_format {
 		      uint64_t *length_out);
 };
 
+#if 0
 struct sr_analyzer {
 	char *name;
 	char *filename;
@@ -162,9 +169,7 @@ struct sr_analyzer {
 	 * TODO: Input and output format?
 	 */
 };
-
-/* Size of a chunk in units */
-#define DATASTORE_CHUNKSIZE 512000
+#endif
 
 struct sr_datastore {
 	/* Size in bytes of the number of units stored in this datastore */
@@ -203,6 +208,7 @@ struct sr_probe {
 	char *trigger;
 };
 
+/* TODO: Get rid of this global variable. */
 extern GSList *devices;
 
 /* Hardware plugin capabilities */