Support for analog probes

[libsigrok.git] / sigrok.h

diff --git a/sigrok.h b/sigrok.h
index 78f1567ca775e7a8621a80e305934000fc6e283f..5606a1e5f118e94132fb8009804e8bbe398f7844 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -49,6 +49,11 @@
 #define SIGROK_ERR_MALLOC              -2 /* Malloc/calloc/realloc error */
 #define SIGROK_ERR_SAMPLERATE          -3 /* Incorrect samplerate */
 
+/* limited by uint64_t */
+#define MAX_NUM_PROBES 64
+#define MAX_PROBENAME_LEN 32
+
+
 /* Handy little macros */
 #define KHZ(n) ((n) * 1000)
 #define MHZ(n) ((n) * 1000000)
@@ -58,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,
@@ -84,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;
-       uint16_t length;
+       uint64_t length;
+       uint16_t unitsize;
        void *payload;
 };
 
@@ -103,7 +110,8 @@ struct datafeed_header {
        struct timeval starttime;
        uint64_t samplerate;
        int protocol_id;
-       int num_probes;
+       int num_analog_probes;
+       int num_logic_probes;
 };
 
 /*
@@ -118,8 +126,8 @@ struct input {
 struct input_format {
        char *extension;
        char *description;
-       int (*format_match) (char *filename);
-       int (*in_loadfile) (char *filename);
+       int (*format_match) (const char *filename);
+       int (*in_loadfile) (const char *filename);
 };
 
 struct input_format **input_list(void);
@@ -138,6 +146,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);
@@ -153,6 +162,7 @@ int filter_probes(int in_unitsize, int out_unitsize, int *probelist,
                  uint64_t *length_out);
 
 char *sigrok_samplerate_string(uint64_t samplerate);
+char *sigrok_period_string(uint64_t frequency);
 
 /*--- analyzer.c ------------------------------------------------------------*/
 
@@ -210,8 +220,14 @@ struct device {
        struct datastore *datastore;
 };
 
+enum {
+       PROBE_TYPE_LOGIC,
+       PROBE_TYPE_ANALOG,
+};
+
 struct probe {
        int index;
+       int type;
        gboolean enabled;
        char *name;
        char *trigger;
@@ -242,7 +258,7 @@ enum {
        HWCAP_LOGIC_ANALYZER,
        HWCAP_SAMPLERATE,       /* Change samplerate */
        HWCAP_PROBECONFIG,      /* Configure probe mask */
-       HWCAP_CAPTURE_RATIO,    /* Set pre-trigger / post-trigger ratio */
+       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 */
 };
@@ -261,6 +277,7 @@ struct sigrok_device_instance {
        char *vendor;
        char *model;
        char *version;
+       void *priv;
        union {
                struct usb_device_instance *usb;
                struct serial_device_instance *serial;
@@ -358,7 +375,7 @@ GSList *list_hwplugins(void);
 
 /* Generic device instances */
 struct sigrok_device_instance *sigrok_device_instance_new(int index,
-       int status, char *vendor, char *model, char *version);
+       int status, const char *vendor, const char *model, const char *version);
 struct sigrok_device_instance *get_sigrok_device_instance(
                        GSList *device_instances, int device_index);
 void sigrok_device_instance_free(struct sigrok_device_instance *sdi);
@@ -369,7 +386,8 @@ struct usb_device_instance *usb_device_instance_new(uint8_t bus,
 void usb_device_instance_free(struct usb_device_instance *usb);
 
 /* Serial-specific instances */
-struct serial_device_instance *serial_device_instance_new(char *port, int fd);
+struct serial_device_instance *serial_device_instance_new(
+                                       const char *port, int fd);
 void serial_device_instance_free(struct serial_device_instance *serial);
 
 int find_hwcap(int *capabilities, int hwcap);
@@ -428,9 +446,19 @@ int ezusb_upload_firmware(libusb_device *dev, int configuration,
 GSList *list_serial_ports(void);
 int serial_open(const char *pathname, int flags);
 int serial_close(int fd);
+int serial_flush(int fd);
 void *serial_backup_params(int fd);
 void serial_restore_params(int fd, void *backup);
 int serial_set_params(int fd, int speed, int bits, int parity, int stopbits,
                      int flowcontrol);
 
+/* libsigrok/hardware/common/misc.c */
+/* TODO: Should not be public. */
+int opendev2(int device_index, struct sigrok_device_instance **sdi,
+            libusb_device *dev, struct libusb_device_descriptor *des,
+            int *skip, uint16_t vid, uint16_t pid, int interface);
+int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev,
+            struct libusb_device_descriptor *des,
+            uint16_t vid, uint16_t pid, int interface);
+
 #endif