sr/cli/gtk: Remove analog left-overs from API.

[libsigrok.git] / sigrok.h.in

diff --git a/sigrok.h.in b/sigrok.h.in
index dd7d457d194c65a6a14be7af40be81cdb03b7f37..0a18f8d1231b09c3465e1bef8c70a11506af0912 100644 (file)
--- a/sigrok.h.in
+++ b/sigrok.h.in
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,9 +25,6 @@
 #include <stdint.h>
 #include <inttypes.h>
 #include <glib.h>
-#ifdef HAVE_LIBUSB_1_0
-#include <libusb.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -76,6 +73,25 @@ extern "C" {
 #define SR_LOG_DBG      4
 #define SR_LOG_SPEW     5
 
+/*
+ * Use SR_API to mark public API symbols, and SR_PRIV for private symbols.
+ *
+ * Variables and functions marked 'static' are private already and don't
+ * need SR_PRIV. However, functions which are not static (because they need
+ * to be used in other libsigrok-internal files) but are also not meant to
+ * be part of the public libsigrok API, must use SR_PRIV.
+ *
+ * This uses the 'visibility' feature of gcc (requires gcc >= 4.0).
+ *
+ * Details: http://gcc.gnu.org/wiki/Visibility
+ */
+
+/* Marks public libsigrok API symbols. */
+#define SR_API __attribute__((visibility("default")))
+
+/* Marks private, non-public libsigrok symbols (not part of the API). */
+#define SR_PRIV __attribute__((visibility("hidden")))
+
 typedef int (*sr_receive_data_callback) (int fd, int revents, void *user_data);
 
 /* Data types used by hardware plugins for set_configuration() */
@@ -91,16 +107,11 @@ enum {
        SR_DF_END,
        SR_DF_TRIGGER,
        SR_DF_LOGIC,
-       SR_DF_ANALOG,
        SR_DF_PD,
 };
 
 struct sr_datafeed_packet {
        uint16_t type;
-       /* timeoffset since start, in picoseconds */
-       uint64_t timeoffset;
-       /* duration of data in this packet, in picoseconds */
-       uint64_t duration;
        void *payload;
 };
 
@@ -108,7 +119,6 @@ struct sr_datafeed_header {
        int feed_version;
        struct timeval starttime;
        uint64_t samplerate;
-       int num_analog_probes;
        int num_logic_probes;
 };
 
@@ -176,7 +186,6 @@ struct sr_device {
 
 enum {
        SR_PROBE_TYPE_LOGIC,
-       SR_PROBE_TYPE_ANALOG,
 };
 
 struct sr_probe {
@@ -189,7 +198,7 @@ struct sr_probe {
 
 /* Hardware plugin capabilities */
 enum {
-       SR_HWCAP_DUMMY,             /* Used to terminate lists */
+       SR_HWCAP_DUMMY = 0, /* Used to terminate lists. Must be 0! */
 
        /*--- Device classes ------------------------------------------------*/
 
@@ -275,10 +284,6 @@ struct sr_device_instance {
        char *model;
        char *version;
        void *priv;
-       union {
-               struct sr_usb_device_instance *usb;
-               struct sr_serial_device_instance *serial;
-       };
 };
 
 /* sr_device_instance types */
@@ -287,19 +292,6 @@ enum {
        SR_SERIAL_INSTANCE,
 };
 
-#ifdef HAVE_LIBUSB_1_0
-struct sr_usb_device_instance {
-       uint8_t bus;
-       uint8_t address;
-       struct libusb_device_handle *devhdl;
-};
-#endif
-
-struct sr_serial_device_instance {
-       char *port;
-       int fd;
-};
-
 /* Device instance status */
 enum {
        SR_ST_NOT_FOUND,