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

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index f730f8c80c98659ff3aa888457bf9c0250149ca9..91ae7f6706ae3311bafbbc5a5979beea966bd4b1 100644 (file)
--- 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 a72a960b9c8f4bea7293b3fbbb0b059faed935a4..d6fd7864b22a0b0c1479ee20c274da8480c5dd87 100644 (file)
--- 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 44ec79d4fc0ab71abdd6dafab389d1afe8aeae1a..9c6235112a5aec51689bfc38bde4ca6fb8154a4f 100644 (file)
--- 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 0b0ccfa235841afbbebd3eb69944696ba52e5ffc..5c7cb98d86963550224a495244bc51a0bf0630d7 100644 (file)
--- 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 df08b1151a789c6a383097d863a021373bb75971..08ee1c237c308839f5d66162f10018b6bd6bbdca 100644 (file)
--- 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 971e032dc35ad654ee0ad0872bcdcfa80ed43fd0..fc2240adb3cf895cf4dd89331e69ca3b04fac195 100644 (file)
--- 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 6549473c3e2d70e8714f8b439be6581ccbdc49a5..afed06c68a01c24d6d3c6399eaabfce016ae9712 100644 (file)
--- 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 44065339956d267721b4048e3014c63f13e77474..d79eca6ec0ab44467225024e41054497c8e6c2ba 100644 (file)
--- 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 1248bd773c238c4787a2c8270c0926e40a663e22..b8e4bddd8daa472625aa215fec5bca5a3bc93823 100644 (file)
--- 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 a7a92bf212e42fc52c500a5cde30a1558630df75..29383cf7661b14dcafe2cceddbbe5c79c72aced1 100644 (file)
--- 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 */