From 1d9a8a5fe1458d4b1ecd250161a7962988359350 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Fri, 17 Feb 2012 23:55:27 +0100 Subject: [PATCH] sr/cli/gtk: A few more s/instance/inst/. --- hardware/alsa/alsa.c | 2 +- hardware/asix-sigma/asix-sigma.c | 2 +- hardware/chronovu-la8/chronovu-la8.c | 2 +- hardware/demo/demo.c | 2 +- hardware/link-mso19/link-mso19.c | 2 +- hardware/openbench-logic-sniffer/ols.c | 2 +- hardware/saleae-logic/saleae-logic.c | 2 +- hardware/zeroplus-logic-cube/zeroplus.c | 2 +- hwplugin.c | 2 +- sigrok.h | 8 ++++---- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c index f730f8c8..91ae7f67 100644 --- a/hardware/alsa/alsa.c +++ b/hardware/alsa/alsa.c @@ -175,7 +175,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id) alsa = sdi->priv; switch (dev_info_id) { - case SR_DI_INSTANCE: + case SR_DI_INST: info = sdi; break; case SR_DI_NUM_PROBES: diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c index a72a960b..d6fd7864 100644 --- a/hardware/asix-sigma/asix-sigma.c +++ b/hardware/asix-sigma/asix-sigma.c @@ -758,7 +758,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id) sigma = sdi->priv; switch (dev_info_id) { - case SR_DI_INSTANCE: + case SR_DI_INST: info = sdi; break; case SR_DI_NUM_PROBES: diff --git a/hardware/chronovu-la8/chronovu-la8.c b/hardware/chronovu-la8/chronovu-la8.c index 44ec79d4..9c623511 100644 --- a/hardware/chronovu-la8/chronovu-la8.c +++ b/hardware/chronovu-la8/chronovu-la8.c @@ -712,7 +712,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id) } switch (dev_info_id) { - case SR_DI_INSTANCE: + case SR_DI_INST: info = sdi; break; case SR_DI_NUM_PROBES: diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c index 0b0ccfa2..5c7cb98d 100644 --- a/hardware/demo/demo.c +++ b/hardware/demo/demo.c @@ -191,7 +191,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id) } switch (dev_info_id) { - case SR_DI_INSTANCE: + case SR_DI_INST: info = sdi; break; case SR_DI_NUM_PROBES: diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c index df08b115..08ee1c23 100644 --- a/hardware/link-mso19/link-mso19.c +++ b/hardware/link-mso19/link-mso19.c @@ -613,7 +613,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id) mso = sdi->priv; switch (dev_info_id) { - case SR_DI_INSTANCE: + case SR_DI_INST: info = sdi; break; case SR_DI_NUM_PROBES: /* FIXME: How to report analog probe? */ diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c index 971e032d..fc2240ad 100644 --- a/hardware/openbench-logic-sniffer/ols.c +++ b/hardware/openbench-logic-sniffer/ols.c @@ -567,7 +567,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id) info = NULL; switch (dev_info_id) { - case SR_DI_INSTANCE: + case SR_DI_INST: info = sdi; break; case SR_DI_NUM_PROBES: diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c index 6549473c..afed06c6 100644 --- a/hardware/saleae-logic/saleae-logic.c +++ b/hardware/saleae-logic/saleae-logic.c @@ -511,7 +511,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id) fx2 = sdi->priv; switch (dev_info_id) { - case SR_DI_INSTANCE: + case SR_DI_INST: info = sdi; break; case SR_DI_NUM_PROBES: diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c index 44065339..d79eca6e 100644 --- a/hardware/zeroplus-logic-cube/zeroplus.c +++ b/hardware/zeroplus-logic-cube/zeroplus.c @@ -524,7 +524,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id) } switch (dev_info_id) { - case SR_DI_INSTANCE: + case SR_DI_INST: info = sdi; break; case SR_DI_NUM_PROBES: diff --git a/hwplugin.c b/hwplugin.c index 1248bd77..b8e4bddd 100644 --- a/hwplugin.c +++ b/hwplugin.c @@ -177,7 +177,7 @@ SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status, sdi->index = index; sdi->status = status; - sdi->instance_type = -1; + sdi->inst_type = -1; sdi->vendor = vendor ? g_strdup(vendor) : NULL; sdi->model = model ? g_strdup(model) : NULL; sdi->version = version ? g_strdup(version) : NULL; diff --git a/sigrok.h b/sigrok.h index a7a92bf2..29383cf7 100644 --- a/sigrok.h +++ b/sigrok.h @@ -279,7 +279,7 @@ struct sr_hwcap_option { struct sr_dev_inst { int index; int status; - int instance_type; + int inst_type; char *vendor; char *model; char *version; @@ -288,8 +288,8 @@ struct sr_dev_inst { /* sr_dev_inst types */ enum { - SR_USB_INSTANCE, - SR_SERIAL_INSTANCE, + SR_USB_INST, + SR_SERIAL_INST, }; /* Device instance status */ @@ -311,7 +311,7 @@ enum { /* Device info IDs */ enum { /* struct sr_dev_inst for this specific device */ - SR_DI_INSTANCE, + SR_DI_INST, /* The number of probes connected to this device */ SR_DI_NUM_PROBES, /* The probe names on this device */