BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make SR_CONF_{SCAN,DEVICE}_OPTIONS into internal constants. 

These are no longer needed in the public API as we have new wrapper functions.
They are still used internally by drivers.
This commit is contained in:
Martin Ling 2015-11-02 01:03:07 +00:00 committed by Uwe Hermann
parent 36bb818d6f
commit cffdc3e63b
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/libsigrok/libsigrok.h
View File

@ -982,12 +982,6 @@ enum sr_configkey {
/*--- Special stuff -------------------------------------------------*/ /*--- Special stuff -------------------------------------------------*/
/** Scan options supported by the driver. */
SR_CONF_SCAN_OPTIONS = 40000,
/** Device options for a particular device. */
SR_CONF_DEVICE_OPTIONS,
/** Session filename. */ /** Session filename. */
SR_CONF_SESSIONFILE, SR_CONF_SESSIONFILE,

4
src/hwdriver.c
View File

@ -173,10 +173,6 @@ static struct sr_key_info sr_key_info_config[] = {
"Over-temperature protection active", NULL}, "Over-temperature protection active", NULL},
/* Special stuff */ /* Special stuff */
{SR_CONF_SCAN_OPTIONS, SR_T_STRING, "scan_options",
"Scan options", NULL},
{SR_CONF_DEVICE_OPTIONS, SR_T_STRING, "device_options",
"Device options", NULL},
{SR_CONF_SESSIONFILE, SR_T_STRING, "sessionfile", {SR_CONF_SESSIONFILE, SR_T_STRING, "sessionfile",
"Session file", NULL}, "Session file", NULL},
{SR_CONF_CAPTUREFILE, SR_T_STRING, "capturefile", {SR_CONF_CAPTUREFILE, SR_T_STRING, "capturefile",

6
src/libsigrok-internal.h
View File

@ -675,6 +675,12 @@ SR_PRIV int sr_log(int loglevel, const char *format, ...) G_GNUC_PRINTF(2, 3);
/*--- device.c --------------------------------------------------------------*/ /*--- device.c --------------------------------------------------------------*/
/** Scan options supported by a driver. */
#define SR_CONF_SCAN_OPTIONS 0x7FFF0000
/** Device options for a particular device. */
#define SR_CONF_DEVICE_OPTIONS 0x7FFF0001
/** Values for the changes argument of sr_dev_driver.config_channel_set. */ /** Values for the changes argument of sr_dev_driver.config_channel_set. */
enum { enum {
/** The enabled state of the channel has been changed. */ /** The enabled state of the channel has been changed. */