X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=include%2Flibsigrok%2Flibsigrok.h;h=cadb88e881f1913723511fb14688ae7a9a224ac2;hb=edd28877cc74f9f0c063910d3cc24729db67f3f4;hp=dd6307decf0df4813b54e54cd33fbff162817c64;hpb=17bfaca62aaacec71c6da4bd927af051727593b6;p=libsigrok.git diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h index dd6307de..cadb88e8 100644 --- a/include/libsigrok/libsigrok.h +++ b/include/libsigrok/libsigrok.h @@ -64,6 +64,7 @@ extern "C" { /** Status/error codes returned by libsigrok functions. */ enum sr_error_code { + SR_OK_CONTINUE = 1, /**< Keep going. */ SR_OK = 0, /**< No error. */ SR_ERR = -1, /**< Generic/unspecified error. */ SR_ERR_MALLOC = -2, /**< Malloc/calloc/realloc error. */ @@ -74,6 +75,7 @@ enum sr_error_code { SR_ERR_DEV_CLOSED = -7, /**< Device is closed, but must be open. */ SR_ERR_TIMEOUT = -8, /**< A timeout occurred. */ SR_ERR_CHANNEL_GROUP = -9, /**< A channel group must be specified. */ + SR_ERR_DATA =-10, /**< Data is invalid. */ /* * Note: When adding entries here, don't forget to also update the @@ -443,21 +445,6 @@ struct sr_option { GSList *values; }; -/** Input module metadata keys. */ -enum sr_input_meta_keys { - /** The input filename, if there is one. */ - SR_INPUT_META_FILENAME = 0x01, - /** The input file's size in bytes. */ - SR_INPUT_META_FILESIZE = 0x02, - /** The first 128 bytes of the file, provided as a GString. */ - SR_INPUT_META_HEADER = 0x04, - /** The file's MIME type. */ - SR_INPUT_META_MIMETYPE = 0x08, - - /** The module cannot identify a file without this metadata. */ - SR_INPUT_META_REQUIRED = 0x80, -}; - struct sr_input; struct sr_input_module; struct sr_output;