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

sr/cli/gtk: A few more s/instance/inst/.

This commit is contained in:
Uwe Hermann 2012-02-17 23:55:27 +01:00
parent bb7ef79377
commit 1d9a8a5fe1
10 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/alsa/alsa.c
View File

@ -175,7 +175,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id)
alsa = sdi->priv; alsa = sdi->priv;
switch (dev_info_id) { switch (dev_info_id) {
case SR_DI_INSTANCE: case SR_DI_INST:
info = sdi; info = sdi;
break; break;
case SR_DI_NUM_PROBES: case SR_DI_NUM_PROBES:

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

@ -758,7 +758,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id)
sigma = sdi->priv; sigma = sdi->priv;
switch (dev_info_id) { switch (dev_info_id) {
case SR_DI_INSTANCE: case SR_DI_INST:
info = sdi; info = sdi;
break; break;
case SR_DI_NUM_PROBES: case SR_DI_NUM_PROBES:

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

@ -712,7 +712,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id)
} }
switch (dev_info_id) { switch (dev_info_id) {
case SR_DI_INSTANCE: case SR_DI_INST:
info = sdi; info = sdi;
break; break;
case SR_DI_NUM_PROBES: case SR_DI_NUM_PROBES:

2
hardware/demo/demo.c
View File

@ -191,7 +191,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id)
} }
switch (dev_info_id) { switch (dev_info_id) {
case SR_DI_INSTANCE: case SR_DI_INST:
info = sdi; info = sdi;
break; break;
case SR_DI_NUM_PROBES: case SR_DI_NUM_PROBES:

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

@ -613,7 +613,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id)
mso = sdi->priv; mso = sdi->priv;
switch (dev_info_id) { switch (dev_info_id) {
case SR_DI_INSTANCE: case SR_DI_INST:
info = sdi; info = sdi;
break; break;
case SR_DI_NUM_PROBES: /* FIXME: How to report analog probe? */ case SR_DI_NUM_PROBES: /* FIXME: How to report analog probe? */

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

@ -567,7 +567,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id)
info = NULL; info = NULL;
switch (dev_info_id) { switch (dev_info_id) {
case SR_DI_INSTANCE: case SR_DI_INST:
info = sdi; info = sdi;
break; break;
case SR_DI_NUM_PROBES: case SR_DI_NUM_PROBES:

2
hardware/saleae-logic/saleae-logic.c
View File

@ -511,7 +511,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id)
fx2 = sdi->priv; fx2 = sdi->priv;
switch (dev_info_id) { switch (dev_info_id) {
case SR_DI_INSTANCE: case SR_DI_INST:
info = sdi; info = sdi;
break; break;
case SR_DI_NUM_PROBES: case SR_DI_NUM_PROBES:

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

@ -524,7 +524,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id)
} }
switch (dev_info_id) { switch (dev_info_id) {
case SR_DI_INSTANCE: case SR_DI_INST:
info = sdi; info = sdi;
break; break;
case SR_DI_NUM_PROBES: case SR_DI_NUM_PROBES:

2
hwplugin.c
View File

@ -177,7 +177,7 @@ SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
sdi->index = index; sdi->index = index;
sdi->status = status; sdi->status = status;
sdi->instance_type = -1; sdi->inst_type = -1;
sdi->vendor = vendor ? g_strdup(vendor) : NULL; sdi->vendor = vendor ? g_strdup(vendor) : NULL;
sdi->model = model ? g_strdup(model) : NULL; sdi->model = model ? g_strdup(model) : NULL;
sdi->version = version ? g_strdup(version) : NULL; sdi->version = version ? g_strdup(version) : NULL;

8
sigrok.h
View File

@ -279,7 +279,7 @@ struct sr_hwcap_option {
struct sr_dev_inst { struct sr_dev_inst {
int index; int index;
int status; int status;
int instance_type; int inst_type;
char *vendor; char *vendor;
char *model; char *model;
char *version; char *version;
@ -288,8 +288,8 @@ struct sr_dev_inst {
/* sr_dev_inst types */ /* sr_dev_inst types */
enum { enum {
SR_USB_INSTANCE, SR_USB_INST,
SR_SERIAL_INSTANCE, SR_SERIAL_INST,
}; };
/* Device instance status */ /* Device instance status */
@ -311,7 +311,7 @@ enum {
/* Device info IDs */ /* Device info IDs */
enum { enum {
/* struct sr_dev_inst for this specific device */ /* struct sr_dev_inst for this specific device */
SR_DI_INSTANCE, SR_DI_INST,
/* The number of probes connected to this device */ /* The number of probes connected to this device */
SR_DI_NUM_PROBES, SR_DI_NUM_PROBES,
/* The probe names on this device */ /* The probe names on this device */