#define SR_OK 0 /* No error */
#define SR_ERR -1 /* Generic/unspecified error */
#define SR_ERR_MALLOC -2 /* Malloc/calloc/realloc error */
-#define SR_ERR_SAMPLERATE -3 /* Incorrect samplerate */
+#define SR_ERR_ARG -3 /* Function argument error */
+#define SR_ERR_SAMPLERATE -4 /* Incorrect samplerate */
-/* limited by uint64_t */
-#define MAX_NUM_PROBES 64
-#define MAX_PROBENAME_LEN 32
+#define SR_MAX_NUM_PROBES 64 /* Limited by uint64_t. */
+#define SR_MAX_PROBENAME_LEN 32
/* Handy little macros */
-#define KHZ(n) ((n) * 1000)
-#define MHZ(n) ((n) * 1000000)
-#define GHZ(n) ((n) * 1000000000)
+#define SR_HZ(n) (n)
+#define SR_KHZ(n) ((n) * 1000)
+#define SR_MHZ(n) ((n) * 1000000)
+#define SR_GHZ(n) ((n) * 1000000000)
-#define HZ_TO_NS(n) (1000000000 / (n))
+#define SR_HZ_TO_NS(n) (1000000000 / (n))
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-#endif
-
-#ifndef ARRAY_AND_SIZE
-#define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a)
-#endif
-
-typedef int (*receive_data_callback) (int fd, int revents, void *user_data);
+typedef int (*sr_receive_data_callback) (int fd, int revents, void *user_data);
/* Data types used by hardware plugins for set_configuration() */
enum {
SR_PROTO_RAW,
};
+#if 0
/* (Unused) protocol decoder stack entry */
-struct protocol {
+struct sr_protocol {
char *name;
int id;
int stackindex;
};
+#endif
/* sr_datafeed_packet.type values */
enum {
int num_logic_probes;
};
-struct analog_probe {
+#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 analog_sample {
+struct sr_analog_sample {
uint8_t num_probes; /* Max hardware probes is 256 */
- struct analog_probe probes[];
+ struct sr_analog_probe probes[];
};
+#endif
struct sr_input {
struct sr_input_format *format;
};
struct sr_input_format {
- char *extension;
+ char *id;
char *description;
int (*format_match) (const char *filename);
int (*init) (struct sr_input *in);
};
struct sr_output_format {
- char *extension;
+ char *id;
char *description;
int df_type;
int (*init) (struct sr_output *o);
- int (*data) (struct sr_output *o, char *data_in, uint64_t length_in,
- char **data_out, uint64_t *length_out);
+ int (*data) (struct sr_output *o, const char *data_in,
+ uint64_t length_in, char **data_out, uint64_t *length_out);
int (*event) (struct sr_output *o, int event_type, char **data_out,
uint64_t *length_out);
};
-struct analyzer {
+#if 0
+struct sr_analyzer {
char *name;
char *filename;
/*
* TODO: Input and output format?
*/
};
-
-/* Size of a chunk in units */
-#define DATASTORE_CHUNKSIZE 512000
+#endif
struct sr_datastore {
/* Size in bytes of the number of units stored in this datastore */
char *trigger;
};
+/* TODO: Get rid of this global variable. */
extern GSList *devices;
/* Hardware plugin capabilities */
char *name;
char *longname;
int api_version;
- int (*init) (char *deviceinfo);
+ int (*init) (const char *deviceinfo);
void (*cleanup) (void);
/* Device-specific */
GSList *devices;
/* List of struct analyzer* */
GSList *analyzers;
- /* list of receive_data_callback */
+ /* list of sr_receive_data_callback */
GSList *datafeed_callbacks;
GTimeVal starttime;
gboolean running;