X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok.h;h=898785612e60dd3a696fbd195c66d564a478cda1;hb=06dd80d424a511736e0c61492bd618a5c3e65cff;hp=a9183a39074415919b38da68614ed76e557b70b5;hpb=4c046c6bcc392666405154853faf7dc2522aa1d9;p=libsigrok.git diff --git a/sigrok.h b/sigrok.h index a9183a39..89878561 100644 --- a/sigrok.h +++ b/sigrok.h @@ -25,7 +25,13 @@ #include #include #include +#ifdef HAVE_LIBUSB_1_0 #include +#endif + +#ifdef __cplusplus +extern "C" { +#endif /* * Status/error codes returned by libsigrok functions. @@ -44,123 +50,126 @@ * or reused for different #defines later. You can only add new #defines and * return codes, but never remove or redefine existing ones. */ -#define SIGROK_OK 0 /* No error */ -#define SIGROK_ERR -1 /* Generic/unspecified error */ -#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 +#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_ARG -3 /* Function argument error */ +#define SR_ERR_SAMPLERATE -4 /* Incorrect samplerate */ +#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) -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) -#endif +#define SR_HZ_TO_NS(n) (1000000000 / (n)) -/* Data types, used by hardware plugins for set_configuration() */ +/* libsigrok loglevels. */ +#define SR_LOG_NONE 0 +#define SR_LOG_ERR 1 +#define SR_LOG_WARN 2 +#define SR_LOG_INFO 3 +#define SR_LOG_DBG 4 +#define SR_LOG_SPEW 5 + +typedef int (*sr_receive_data_callback) (int fd, int revents, void *user_data); + +/* Data types used by hardware plugins for set_configuration() */ enum { - T_UINT64, - T_CHAR, + SR_T_UINT64, + SR_T_CHAR, + SR_T_NULL, }; enum { - PROTO_RAW, + SR_PROTO_RAW, }; +#if 0 /* (Unused) protocol decoder stack entry */ -struct protocol { +struct sr_protocol { char *name; int id; int stackindex; }; +#endif -/* - * Datafeed - */ - -/* datafeed_packet.type values */ +/* sr_datafeed_packet.type values */ enum { - DF_HEADER, - DF_END, - DF_TRIGGER, - DF_LOGIC, - DF_PD, - DF_PA, + SR_DF_HEADER, + SR_DF_END, + SR_DF_TRIGGER, + SR_DF_LOGIC, + SR_DF_ANALOG, + SR_DF_PD, }; -struct datafeed_packet { +struct sr_datafeed_packet { uint16_t type; uint64_t length; uint16_t unitsize; void *payload; }; -struct datafeed_header { +struct sr_datafeed_header { int feed_version; struct timeval starttime; uint64_t samplerate; int protocol_id; - int num_probes; + int num_analog_probes; + int num_logic_probes; }; -/* - * Input - */ -struct input { - struct input_format *format; - void *param; - void *internal; +#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 input_format { - char *extension; - char *description; - int (*format_match) (const char *filename); - int (*in_loadfile) (const char *filename); +struct sr_analog_sample { + uint8_t num_probes; /* Max hardware probes is 256 */ + struct sr_analog_probe probes[]; }; +#endif -struct input_format **input_list(void); +struct sr_input { + struct sr_input_format *format; + char *param; + struct sr_device *vdevice; +}; +struct sr_input_format { + char *id; + char *description; + int (*format_match) (const char *filename); + int (*init) (struct sr_input *in); + int (*loadfile) (struct sr_input *in, const char *filename); +}; -/* - * Output - */ -struct output { - struct output_format *format; - struct device *device; +struct sr_output { + struct sr_output_format *format; + struct sr_device *device; char *param; void *internal; }; -struct output_format { - char *extension; +struct sr_output_format { + char *id; char *description; - int (*init) (struct output *o); - int (*data) (struct output *o, char *data_in, uint64_t length_in, - char **data_out, uint64_t *length_out); - int (*event) (struct output *o, int event_type, char **data_out, + int df_type; + int (*init) (struct sr_output *o); + 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 output_format **output_list(void); - - -int filter_probes(int in_unitsize, int out_unitsize, int *probelist, - char *data_in, uint64_t length_in, char **data_out, - uint64_t *length_out); - -char *sigrok_samplerate_string(uint64_t samplerate); -char *sigrok_period_string(uint64_t frequency); - -/*--- analyzer.c ------------------------------------------------------------*/ - -struct analyzer { +#if 0 +struct sr_analyzer { char *name; char *filename; /* @@ -168,135 +177,162 @@ struct analyzer { * TODO: Input and output format? */ }; +#endif -/*--- backend.c -------------------------------------------------------------*/ - -int sigrok_init(void); -void sigrok_cleanup(void); - -/*--- datastore.c -----------------------------------------------------------*/ - -/* Size of a chunk in units */ -#define DATASTORE_CHUNKSIZE 512000 - -struct datastore { +struct sr_datastore { /* Size in bytes of the number of units stored in this datastore */ int ds_unitsize; unsigned int num_units; /* TODO: uint64_t */ GSList *chunklist; }; -int datastore_new(int unitsize, struct datastore **ds); -int datastore_destroy(struct datastore *ds); -void datastore_put(struct datastore *ds, void *data, unsigned int length, - int in_unitsize, int *probelist); - -/*--- debug.c ---------------------------------------------------------------*/ - -void hexdump(unsigned char *address, int length); - -/*--- device.c --------------------------------------------------------------*/ - /* * This represents a generic device connected to the system. * For device-specific information, ask the plugin. The plugin_index refers * to the device index within that plugin; it may be handling more than one * device. All relevant plugin calls take a device_index parameter for this. */ -struct device { +struct sr_device { /* Which plugin handles this device */ - struct device_plugin *plugin; + struct sr_device_plugin *plugin; /* A plugin may handle multiple devices of the same type */ int plugin_index; - /* List of struct probe* */ + /* List of struct sr_probe* */ GSList *probes; /* Data acquired by this device, if any */ - struct datastore *datastore; + struct sr_datastore *datastore; }; -struct probe { +enum { + SR_PROBE_TYPE_LOGIC, + SR_PROBE_TYPE_ANALOG, +}; + +struct sr_probe { int index; + int type; gboolean enabled; char *name; char *trigger; }; +/* TODO: Get rid of this global variable. */ extern GSList *devices; -void device_scan(void); -void device_close_all(void); -GSList *device_list(void); -struct device *device_new(struct device_plugin *plugin, int plugin_index, int num_probes); -void device_clear(struct device *device); -void device_destroy(struct device *dev); +/* Hardware plugin capabilities */ +enum { + SR_HWCAP_DUMMY, /* Used to terminate lists */ + + /*--- Device classes ------------------------------------------------*/ -void device_probe_clear(struct device *device, int probenum); -void device_probe_add(struct device *device, char *name); -struct probe *probe_find(struct device *device, int probenum); -void device_probe_name(struct device *device, int probenum, char *name); + /** The device can act as logic analyzer. */ + SR_HWCAP_LOGIC_ANALYZER, -void device_trigger_clear(struct device *device); -void device_trigger_set(struct device *device, int probenum, char *trigger); + /* TODO: SR_HWCAP_SCOPE, SW_HWCAP_PATTERN_GENERATOR, etc.? */ -/*--- hwplugin.c ------------------------------------------------------------*/ + /*--- Device options ------------------------------------------------*/ -/* Hardware plugin capabilities */ -enum { - HWCAP_DUMMY, /* Used to terminate lists */ - HWCAP_LOGIC_ANALYZER, - HWCAP_SAMPLERATE, /* Change samplerate */ - HWCAP_PROBECONFIG, /* Configure probe mask */ - 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 */ + /** The device supports setting/changing its samplerate. */ + SR_HWCAP_SAMPLERATE, + + /* TODO: Better description? Rename to PROBE_AND_TRIGGER_CONFIG? */ + /** The device supports setting a probe mask. */ + SR_HWCAP_PROBECONFIG, + + /** The device supports setting a pre/post-trigger capture ratio. */ + SR_HWCAP_CAPTURE_RATIO, + + /* TODO? */ + /** The device supports setting a pattern (pattern generator mode). */ + SR_HWCAP_PATTERN_MODE, + + /*--- Special stuff -------------------------------------------------*/ + + /* TODO: Better description. */ + /** The device supports specifying a capturefile to inject. */ + SR_HWCAP_CAPTUREFILE, + + /* TODO: Better description. */ + /** The device supports specifying the capturefile unit size. */ + SR_HWCAP_CAPTURE_UNITSIZE, + + /* TODO: Better description. */ + /** The device supports setting the number of probes. */ + SR_HWCAP_CAPTURE_NUM_PROBES, + + /*--- Acquisition modes ---------------------------------------------*/ + + /** + * The device supports setting a sample time limit, i.e. how long the + * sample acquisition should run (in ms). + */ + SR_HWCAP_LIMIT_MSEC, + + /** + * The device supports setting a sample number limit, i.e. how many + * samples should be acquired. + */ + SR_HWCAP_LIMIT_SAMPLES, + + /** + * The device supports continuous sampling, i.e. neither a time limit + * nor a sample number limit has to be supplied, it will just acquire + * samples continuously, until explicitly stopped by a certain command. + */ + SR_HWCAP_CONTINUOUS, + + /* TODO: SR_HWCAP_JUST_SAMPLE or similar. */ }; -struct hwcap_option { +struct sr_hwcap_option { int capability; int type; char *description; char *shortname; }; -struct sigrok_device_instance { +struct sr_device_instance { int index; int status; int instance_type; char *vendor; char *model; char *version; + void *priv; union { - struct usb_device_instance *usb; - struct serial_device_instance *serial; + struct sr_usb_device_instance *usb; + struct sr_serial_device_instance *serial; }; }; -/* sigrok_device_instance types */ +/* sr_device_instance types */ enum { - USB_INSTANCE, - SERIAL_INSTANCE, + SR_USB_INSTANCE, + SR_SERIAL_INSTANCE, }; -struct usb_device_instance { +#ifdef HAVE_LIBUSB_1_0 +struct sr_usb_device_instance { uint8_t bus; uint8_t address; struct libusb_device_handle *devhdl; }; +#endif -struct serial_device_instance { +struct sr_serial_device_instance { char *port; int fd; }; /* Device instance status */ enum { - ST_NOT_FOUND, + SR_ST_NOT_FOUND, /* Found, but still booting */ - ST_INITIALIZING, + SR_ST_INITIALIZING, /* Live, but not in use */ - ST_INACTIVE, + SR_ST_INACTIVE, /* Actively in use in a session */ - ST_ACTIVE, + SR_ST_ACTIVE, }; /* @@ -306,16 +342,18 @@ enum { /* Device info IDs */ enum { - /* struct sigrok_device_instance for this specific device */ - DI_INSTANCE, + /* struct sr_device_instance for this specific device */ + SR_DI_INSTANCE, /* The number of probes connected to this device */ - DI_NUM_PROBES, - /* Samplerates supported by this device, (struct samplerates) */ - DI_SAMPLERATES, + SR_DI_NUM_PROBES, + /* Samplerates supported by this device, (struct sr_samplerates) */ + SR_DI_SAMPLERATES, /* Types of trigger supported, out of "01crf" (char *) */ - DI_TRIGGER_TYPES, + SR_DI_TRIGGER_TYPES, /* The currently set samplerate in Hz (uint64_t) */ - DI_CUR_SAMPLERATE, + SR_DI_CUR_SAMPLERATE, + /* Supported pattern generator modes */ + SR_DI_PATTERNMODES, }; /* @@ -323,23 +361,24 @@ enum { * granularity, or is limited to a set of defined samplerates. Use either * step or list, but not both. */ -struct samplerates { +struct sr_samplerates { uint64_t low; uint64_t high; uint64_t step; uint64_t *list; }; -struct device_plugin { +struct sr_device_plugin { /* Plugin-specific */ char *name; + char *longname; int api_version; - int (*init) (char *deviceinfo); + int (*init) (const char *deviceinfo); void (*cleanup) (void); /* Device-specific */ - int (*open) (int device_index); - void (*close) (int device_index); + int (*opendev) (int device_index); + int (*closedev) (int device_index); void *(*get_device_info) (int device_index, int device_info_id); int (*get_status) (int device_index); int *(*get_capabilities) (void); @@ -348,104 +387,21 @@ struct device_plugin { void (*stop_acquisition) (int device_index, gpointer session_device_id); }; -struct gsource_fd { - GSource source; - GPollFD gpfd; - /* Not really using this */ - GSource *timeout_source; -}; - -typedef int (*receive_data_callback) (int fd, int revents, void *user_data); - -int load_hwplugins(void); -GSList *list_hwplugins(void); - -/* Generic device instances */ -struct sigrok_device_instance *sigrok_device_instance_new(int index, - 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); - -/* USB-specific instances */ -struct usb_device_instance *usb_device_instance_new(uint8_t bus, - uint8_t address, struct libusb_device_handle *hdl); -void usb_device_instance_free(struct usb_device_instance *usb); - -/* Serial-specific instances */ -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); -struct hwcap_option *find_hwcap_option(int hwcap); -void source_remove(int fd); -void source_add(int fd, int events, int timeout, receive_data_callback rcv_cb, - void *user_data); - -/*--- session.c -------------------------------------------------------------*/ - -typedef void (*source_callback_remove) (int fd); -typedef void (*source_callback_add) (int fd, int events, int timeout, - receive_data_callback callback, void *user_data); -typedef void (*datafeed_callback) (struct device *device, - struct datafeed_packet *packet); - -struct session { - /* List of struct device* */ +struct sr_session { + /* List of struct sr_device* */ GSList *devices; /* List of struct analyzer* */ GSList *analyzers; - /* Datafeed callbacks */ + /* list of sr_receive_data_callback */ GSList *datafeed_callbacks; GTimeVal starttime; + gboolean running; }; -/* Session setup */ -struct session *session_load(const char *filename); -struct session *session_new(void); -void session_destroy(void); -void session_device_clear(void); -int session_device_add(struct device *device); - -/* Protocol analyzers setup */ -void session_pa_clear(void); -void session_pa_add(struct analyzer *pa); - -/* Datafeed setup */ -void session_datafeed_callback_clear(void); -void session_datafeed_callback_add(datafeed_callback callback); - -/* Session control */ -int session_start(void); -void session_stop(void); -void session_bus(struct device *device, struct datafeed_packet *packet); -void make_metadata(char *filename); -int session_save(char *filename); - -/*--- hwcommon.c ------------------------------------------------------------*/ - -int ezusb_reset(struct libusb_device_handle *hdl, int set_clear); -int ezusb_install_firmware(libusb_device_handle *hdl, char *filename); -int ezusb_upload_firmware(libusb_device *dev, int configuration, - const char *filename); - -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); +#include "sigrok-proto.h" + +#ifdef __cplusplus +} +#endif #endif