sr: Drop analog left-overs from sigrok.h.

For now, there's no analog/scope support in sigrok yet (will be added
later), so remove any such items from the public API (sigrok.h).

Having '#if defined(HAVE_LA_ALSA)' in sigrok.h is a bug anyway, the API
must not have anything device-dependent in general, and sigrok.h
specifically must not have any #ifdefs for specific hardware.

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index 527a7e5de49fa992521e61360e403475379f2b78..7a5189c03b0b94f557a15c6130e27bc0e8bd33c2 100644 (file)
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+/* Note: This driver doesn't compile, analog support in sigrok is WIP. */
+
 #include "config.h" /* Must come before sigrok.h */
 #include <stdlib.h>
 #include <unistd.h>
@@ -30,6 +32,17 @@
 #define SAMPLE_WIDTH 16
 #define AUDIO_DEV "plughw:0,0"
 
+struct sr_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 sr_analog_sample {
+       uint8_t num_probes; /* Max hardware probes is 256 */
+       struct sr_analog_probe probes[];
+};
+
 static int capabilities[] = {
        SR_HWCAP_SAMPLERATE,
        SR_HWCAP_LIMIT_SAMPLES,

diff --git a/sigrok.h.in b/sigrok.h.in
index 437a32b56ce9611324b1a4e010cd5a4521efa84e..8622eb4bf3e9b396f551c9ea3a4ca338dfc8b2a7 100644 (file)
--- a/sigrok.h.in
+++ b/sigrok.h.in
@@ -118,19 +118,6 @@ struct sr_datafeed_logic {
        void *data;
 };
 
-#if defined(HAVE_LA_ALSA)
-struct sr_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 sr_analog_sample {
-       uint8_t num_probes; /* Max hardware probes is 256 */
-       struct sr_analog_probe probes[];
-};
-#endif
-
 struct sr_input {
        struct sr_input_format *format;
        char *param;