X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok.h;h=5e6f2314c86874538feb79cd64c0c87016bc99dd;hb=1437e8934bd01167f2126616c7e8b44ca342cd27;hp=9551b8874a8ad01fb0095c57f334a8809ea21cfa;hpb=2a3f9541a4bece23b25e1b255c0fab31ba5a751b;p=libsigrok.git

diff --git a/sigrok.h b/sigrok.h
index 9551b887..5e6f2314 100644
--- a/sigrok.h
+++ b/sigrok.h
@@ -63,6 +63,10 @@
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 #endif
 
+#ifndef ARRAY_AND_SIZE
+#define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a)
+#endif
+
 /* Data types, used by hardware plugins for set_configuration() */
 enum {
 	T_UINT64,
@@ -89,17 +93,15 @@ enum {
 	DF_HEADER,
 	DF_END,
 	DF_TRIGGER,
-	DF_LOGIC8,
-	DF_LOGIC16,
-	DF_LOGIC24,
-	DF_LOGIC32,
-	DF_LOGIC48,
-	DF_LOGIC64,
+	DF_LOGIC,
+	DF_ANALOG,
+	DF_PD,
 };
 
 struct datafeed_packet {
 	uint16_t type;
 	uint64_t length;
+	uint16_t unitsize;
 	void *payload;
 };
 
@@ -143,6 +145,7 @@ struct output {
 struct output_format {
 	char *extension;
 	char *description;
+	int df_type;
 	int (*init) (struct output *o);
 	int (*data) (struct output *o, char *data_in, uint64_t length_in,
 		     char **data_out, uint64_t *length_out);
@@ -267,6 +270,7 @@ struct sigrok_device_instance {
 	char *vendor;
 	char *model;
 	char *version;
+	void *priv;
 	union {
 		struct usb_device_instance *usb;
 		struct serial_device_instance *serial;