X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sigrok.h;h=e3b6ac78c56dbd5de0e27d626671ad9e3ce28fa6;hb=c3579621d569f4b1ef3c21c7e2ed3bdc855c617b;hp=496f1c6c997891a7dc05f2bae67edae997aff92d;hpb=74b9b43836a55debd1e5c27637021ef505f6e7aa;p=libsigrok.git

diff --git a/sigrok.h b/sigrok.h
index 496f1c6c..e3b6ac78 100644
--- a/sigrok.h
+++ b/sigrok.h
@@ -27,6 +27,9 @@
 #include <glib.h>
 #include <libusb.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*
  * Status/error codes returned by libsigrok functions.
@@ -54,7 +57,6 @@
 #define MAX_NUM_PROBES 64
 #define MAX_PROBENAME_LEN 32
 
-
 /* Handy little macros */
 #define KHZ(n) ((n) * 1000)
 #define MHZ(n) ((n) * 1000000)
@@ -70,10 +72,8 @@
 #define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a)
 #endif
 
-
 typedef int (*receive_data_callback) (int fd, int revents, void *user_data);
 
-
 /* Data types used by hardware plugins for set_configuration() */
 enum {
 	T_UINT64,
@@ -91,8 +91,6 @@ struct protocol {
 	int stackindex;
 };
 
-
-
 /* datafeed_packet.type values */
 enum {
 	DF_HEADER,
@@ -119,23 +117,31 @@ struct datafeed_header {
 	int num_logic_probes;
 };
 
+struct 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 {
+	uint8_t num_probes; /* Max hardware probes is 256 */
+	struct analog_probe probes[];
+};
 
 struct input {
 	struct input_format *format;
-	void *param;
-	void *internal;
+	char *param;
+	struct device *vdevice;
 };
 
 struct input_format {
 	char *extension;
 	char *description;
 	int (*format_match) (const char *filename);
-	int (*in_loadfile) (const char *filename);
+	int (*init) (struct input *in);
+	int (*loadfile) (struct input *in, const char *filename);
 };
 
-
-
 struct output {
 	struct output_format *format;
 	struct device *device;
@@ -154,7 +160,6 @@ struct output_format {
 		      uint64_t *length_out);
 };
 
-
 struct analyzer {
 	char *name;
 	char *filename;
@@ -164,7 +169,6 @@ struct analyzer {
 	 */
 };
 
-
 /* Size of a chunk in units */
 #define DATASTORE_CHUNKSIZE 512000
 
@@ -175,7 +179,6 @@ struct datastore {
 	GSList *chunklist;
 };
 
-
 /*
  * This represents a generic device connected to the system.
  * For device-specific information, ask the plugin. The plugin_index refers
@@ -208,14 +211,19 @@ struct probe {
 
 extern GSList *devices;
 
-
 /* Hardware plugin capabilities */
 enum {
 	HWCAP_DUMMY,             /* Used to terminate lists */
+	/* device classes */
 	HWCAP_LOGIC_ANALYZER,
+
+	/* device options */
 	HWCAP_SAMPLERATE,        /* Change samplerate */
 	HWCAP_PROBECONFIG,       /* Configure probe mask */
 	HWCAP_CAPTURE_RATIO,     /* Set pre/post-trigger capture ratio */
+	HWCAP_PATTERN_MODE,      /* Pattern generator mode */
+
+	/* acquisition modes */
 	HWCAP_LIMIT_MSEC,        /* Set a time limit for sample acquisition */
 	HWCAP_LIMIT_SAMPLES,     /* Set a limit on number of samples */
 	HWCAP_CONTINUOUS,
@@ -228,7 +236,6 @@ struct hwcap_option {
 	char *shortname;
 };
 
-
 struct sigrok_device_instance {
 	int index;
 	int status;
@@ -288,6 +295,8 @@ enum {
 	DI_TRIGGER_TYPES,
 	/* The currently set samplerate in Hz (uint64_t) */
 	DI_CUR_SAMPLERATE,
+	/* Supported pattern generator modes */
+	DI_PATTERNMODES,
 };
 
 /*
@@ -338,4 +347,9 @@ struct session {
 };
 
 #include "sigrok-proto.h"
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif