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

sr: Made the dev_info_get return value const

This commit is contained in:
Joel Holdsworth 2012-05-07 13:35:56 +01:00
parent 915f7cc87a
commit b7f578bef5
10 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/alsa/alsa.c
View File

@ -168,7 +168,7 @@ static int hw_cleanup(void)
return SR_OK; return SR_OK;
} }
static void *hw_dev_info_get(int dev_index, int dev_info_id) static const void *hw_dev_info_get(int dev_index, int dev_info_id)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct context *ctx; struct context *ctx;

4
hardware/asix-sigma/asix-sigma.c
View File

@ -753,11 +753,11 @@ static int hw_cleanup(void)
return ret; return ret;
} }
static void *hw_dev_info_get(int dev_index, int dev_info_id) static const void *hw_dev_info_get(int dev_index, int dev_info_id)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct context *ctx; struct context *ctx;
void *info = NULL; const void *info = NULL;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
sr_err("sigma: %s: sdi was NULL", __func__); sr_err("sigma: %s: sdi was NULL", __func__);

4
hardware/chronovu-la8/chronovu-la8.c
View File

@ -681,11 +681,11 @@ static int hw_cleanup(void)
return ret; return ret;
} }
static void *hw_dev_info_get(int dev_index, int dev_info_id) static const void *hw_dev_info_get(int dev_index, int dev_info_id)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct context *ctx; struct context *ctx;
void *info; const void *info;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
sr_err("la8: %s: sdi was NULL", __func__); sr_err("la8: %s: sdi was NULL", __func__);

4
hardware/demo/demo.c
View File

@ -184,10 +184,10 @@ static int hw_cleanup(void)
return SR_OK; return SR_OK;
} }
static void *hw_dev_info_get(int dev_index, int dev_info_id) static const void *hw_dev_info_get(int dev_index, int dev_info_id)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
void *info = NULL; const void *info = NULL;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
sr_err("demo: %s: sdi was NULL", __func__); sr_err("demo: %s: sdi was NULL", __func__);

2
hardware/fx2lafw/fx2lafw.c
View File

@ -546,7 +546,7 @@ static int hw_cleanup(void)
return ret; return ret;
} }
static void *hw_dev_info_get(int dev_index, int dev_info_id) static const void *hw_dev_info_get(int dev_index, int dev_info_id)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct context *ctx; struct context *ctx;

4
hardware/link-mso19/link-mso19.c
View File

@ -607,11 +607,11 @@ static int hw_dev_close(int dev_index)
return SR_OK; return SR_OK;
} }
static void *hw_dev_info_get(int dev_index, int dev_info_id) static const void *hw_dev_info_get(int dev_index, int dev_info_id)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct context *ctx; struct context *ctx;
void *info = NULL; const void *info = NULL;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return NULL; return NULL;

4
hardware/openbench-logic-sniffer/ols.c
View File

@ -557,11 +557,11 @@ static int hw_cleanup(void)
return ret; return ret;
} }
static void *hw_dev_info_get(int dev_index, int dev_info_id) static const void *hw_dev_info_get(int dev_index, int dev_info_id)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct context *ctx; struct context *ctx;
void *info; const void *info;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return NULL; return NULL;

4
hardware/zeroplus-logic-cube/zeroplus.c
View File

@ -499,11 +499,11 @@ static int hw_cleanup(void)
return SR_OK; return SR_OK;
} }
static void *hw_dev_info_get(int dev_index, int dev_info_id) static const void *hw_dev_info_get(int dev_index, int dev_info_id)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct context *ctx; struct context *ctx;
void *info; const void *info;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
sr_err("zp: %s: sdi was NULL", __func__); sr_err("zp: %s: sdi was NULL", __func__);

2
sigrok.h.in
View File

@ -463,7 +463,7 @@ struct sr_dev_driver {
/* Device-specific */ /* Device-specific */
int (*dev_open) (int dev_index); int (*dev_open) (int dev_index);
int (*dev_close) (int dev_index); int (*dev_close) (int dev_index);
void *(*dev_info_get) (int dev_index, int dev_info_id); const void *(*dev_info_get) (int dev_index, int dev_info_id);
int (*dev_status_get) (int dev_index); int (*dev_status_get) (int dev_index);
const int *(*hwcap_get_all) (void); const int *(*hwcap_get_all) (void);
int (*dev_config_set) (int dev_index, int hwcap, void *value); int (*dev_config_set) (int dev_index, int hwcap, void *value);

3
strutil.c
View File

@ -176,7 +176,8 @@ SR_API char **sr_parse_triggerstring(struct sr_dev *dev,
GSList *l; GSList *l;
struct sr_probe *probe; struct sr_probe *probe;
int max_probes, probenum, i; int max_probes, probenum, i;
char **tokens, **triggerlist, *trigger, *tc, *trigger_types; char **tokens, **triggerlist, *trigger, *tc;
const char *trigger_types;
gboolean error; gboolean error;
max_probes = g_slist_length(dev->probes); max_probes = g_slist_length(dev->probes);