X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok.h;h=1ba03b6313b6ff4cb67cd8570fa601eea8e11b01;hb=62eeeb171bd9a05d167990373e33bc1f956cbfee;hp=4373fcb497266c6663e64e059923fef8373daae7;hpb=882e2075bb51496e5eb9548b98204b90a4b60a82;p=libsigrok.git

diff --git a/sigrok.h b/sigrok.h
index 4373fcb4..1ba03b63 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,12 +57,13 @@
 #define MAX_NUM_PROBES 64
 #define MAX_PROBENAME_LEN 32
 
-
 /* Handy little macros */
 #define KHZ(n) ((n) * 1000)
 #define MHZ(n) ((n) * 1000000)
 #define GHZ(n) ((n) * 1000000000)
 
+#define HZ_TO_NS(n) (1000000000 / (n))
+
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 #endif
@@ -68,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,
@@ -89,8 +91,6 @@ struct protocol {
 	int stackindex;
 };
 
-
-
 /* datafeed_packet.type values */
 enum {
 	DF_HEADER,
@@ -113,26 +113,35 @@ struct datafeed_header {
 	struct timeval starttime;
 	uint64_t samplerate;
 	int protocol_id;
-	int num_probes;
+	int num_analog_probes;
+	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;
@@ -151,7 +160,6 @@ struct output_format {
 		      uint64_t *length_out);
 };
 
-
 struct analyzer {
 	char *name;
 	char *filename;
@@ -161,7 +169,6 @@ struct analyzer {
 	 */
 };
 
-
 /* Size of a chunk in units */
 #define DATASTORE_CHUNKSIZE 512000
 
@@ -172,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
@@ -184,12 +190,18 @@ struct device {
 	struct device_plugin *plugin;
 	/* A plugin may handle multiple devices of the same type */
 	int plugin_index;
+	uint8_t probe_type;
 	/* List of struct probe* */
 	GSList *probes;
 	/* Data acquired by this device, if any */
 	struct datastore *datastore;
 };
 
+enum {
+	PROBE_TYPE_LOGIC,
+	PROBE_TYPE_ANALOG,
+};
+
 struct probe {
 	int index;
 	gboolean enabled;
@@ -199,16 +211,22 @@ struct probe {
 
 extern GSList *devices;
 
-
 /* Hardware plugin capabilities */
 enum {
-	HWCAP_DUMMY,		/* Used to terminate lists */
+	HWCAP_DUMMY,             /* Used to terminate lists */
+	/* device classes */
 	HWCAP_LOGIC_ANALYZER,
-	HWCAP_SAMPLERATE,	/* Change samplerate */
-	HWCAP_PROBECONFIG,	/* Configure probe mask */
-	HWCAP_CAPTURE_RATIO,	/* Set pre/post-trigger capture ratio */
-	HWCAP_LIMIT_MSEC,	/* Set a time limit for sample acquisition */
-	HWCAP_LIMIT_SAMPLES,	/* Set a limit on number of samples */
+
+	/* 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,
 };
 
 struct hwcap_option {
@@ -218,7 +236,6 @@ struct hwcap_option {
 	char *shortname;
 };
 
-
 struct sigrok_device_instance {
 	int index;
 	int status;
@@ -278,6 +295,10 @@ enum {
 	DI_TRIGGER_TYPES,
 	/* The currently set samplerate in Hz (uint64_t) */
 	DI_CUR_SAMPLERATE,
+	/* Supported pattern generator modes */
+	DI_PATTERNMODES,
+	/* Probes type, DF_ANALOG needs this to be PROBE_TYPE_ANALOG */
+	DI_PROBE_TYPE,
 };
 
 /*
@@ -328,4 +349,9 @@ struct session {
 };
 
 #include "sigrok-proto.h"
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif