Consistent use of "IKALOGIC" spelling.

The company name is written all-caps pretty consistently on the
vendor website and docs, so use that spelling everywhere.

diff --git a/configure.ac b/configure.ac
index 1d5c0b3186027b67756187073e4df2b54d0fe65e..3847d17f38963208e076d66ff1416d8df3c3cb98 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -140,12 +140,12 @@ AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso],
        [HW_HANTEK_DSO=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(ikalogic-scanalogic2, AC_HELP_STRING([--enable-ikalogic-scanalogic2],
        [HW_HANTEK_DSO=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(ikalogic-scanalogic2, AC_HELP_STRING([--enable-ikalogic-scanalogic2],

-       [enable IKALOGIC Scanalogic2 support [default=yes]]),
+       [enable IKALOGIC Scanalogic-2 support [default=yes]]),

        [HW_IKALOGIC_SCANALOGIC2="$enableval"],
        [HW_IKALOGIC_SCANALOGIC2=yes])
 
 AC_ARG_ENABLE(ikalogic-scanaplus, AC_HELP_STRING([--enable-ikalogic-scanaplus],
        [HW_IKALOGIC_SCANALOGIC2="$enableval"],
        [HW_IKALOGIC_SCANALOGIC2=yes])
 
 AC_ARG_ENABLE(ikalogic-scanaplus, AC_HELP_STRING([--enable-ikalogic-scanaplus],

-       [enable Ikalogic ScanaPLUS support [default=yes]]),
+       [enable IKALOGIC ScanaPLUS support [default=yes]]),

        [HW_IKALOGIC_SCANAPLUS="$enableval"],
        [HW_IKALOGIC_SCANAPLUS=yes])
 
        [HW_IKALOGIC_SCANAPLUS="$enableval"],
        [HW_IKALOGIC_SCANAPLUS=yes])
 


@@ -359,12 +359,12 @@ fi
 
 AM_CONDITIONAL(HW_IKALOGIC_SCANALOGIC2, test x$HW_IKALOGIC_SCANALOGIC2 = xyes)
 if test "x$HW_IKALOGIC_SCANALOGIC2" = "xyes"; then
 
 AM_CONDITIONAL(HW_IKALOGIC_SCANALOGIC2, test x$HW_IKALOGIC_SCANALOGIC2 = xyes)
 if test "x$HW_IKALOGIC_SCANALOGIC2" = "xyes"; then

-       AC_DEFINE(HAVE_HW_IKALOGIC_SCANALOGIC2, 1, [IKALOGIC Scanalogic2 support])
+       AC_DEFINE(HAVE_HW_IKALOGIC_SCANALOGIC2, 1, [IKALOGIC Scanalogic-2 support])

 fi
 
 AM_CONDITIONAL(HW_IKALOGIC_SCANAPLUS, test x$HW_IKALOGIC_SCANAPLUS = xyes)
 if test "x$HW_IKALOGIC_SCANAPLUS" = "xyes"; then
 fi
 
 AM_CONDITIONAL(HW_IKALOGIC_SCANAPLUS, test x$HW_IKALOGIC_SCANAPLUS = xyes)
 if test "x$HW_IKALOGIC_SCANAPLUS" = "xyes"; then

-       AC_DEFINE(HAVE_HW_IKALOGIC_SCANAPLUS, 1, [Ikalogic ScanaPLUS support])
+       AC_DEFINE(HAVE_HW_IKALOGIC_SCANAPLUS, 1, [IKALOGIC ScanaPLUS support])

 fi
 
 AM_CONDITIONAL(HW_KECHENG_KC_330B, test x$HW_KECHENG_KC_330B = xyes)
 fi
 
 AM_CONDITIONAL(HW_KECHENG_KC_330B, test x$HW_KECHENG_KC_330B = xyes)

diff --git a/contrib/z60_libsigrok.rules b/contrib/z60_libsigrok.rules
index 7f8f7fbaaa8b03d64c206fe5df75738990919bb9..35f4197301d47b32630e746928ba2e2b90fe1e2e 100644 (file)
--- a/contrib/z60_libsigrok.rules
+++ b/contrib/z60_libsigrok.rules
@@ -92,7 +92,7 @@ ATTRS{idVendor}=="04b5", ATTRS{idProduct}=="5200", MODE="664", GROUP="plugdev"
 ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="520a", MODE="664", GROUP="plugdev"
 ATTRS{idVendor}=="04b5", ATTRS{idProduct}=="520a", MODE="664", GROUP="plugdev"
 
 ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="520a", MODE="664", GROUP="plugdev"
 ATTRS{idVendor}=="04b5", ATTRS{idProduct}=="520a", MODE="664", GROUP="plugdev"
 

-# Ikalogic SCANALOGIC-2
+# IKALOGIC Scanalogic-2

 ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4123", MODE="664", GROUP="plugdev"
 
 # Kecheng KC-330B
 ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4123", MODE="664", GROUP="plugdev"
 
 # Kecheng KC-330B

diff --git a/hardware/ikalogic-scanaplus/api.c b/hardware/ikalogic-scanaplus/api.c
index 7f1109a8fda1f9bdc1ecdbae658380b860825134..4d411b631281305f27f461ef0d3443cd60bfcd63 100644 (file)
--- a/hardware/ikalogic-scanaplus/api.c
+++ b/hardware/ikalogic-scanaplus/api.c
@@ -22,7 +22,7 @@
 
 #define USB_VENDOR_ID                  0x0403
 #define USB_DEVICE_ID                  0x6014
 
 #define USB_VENDOR_ID                  0x0403
 #define USB_DEVICE_ID                  0x6014

-#define USB_VENDOR_NAME                        "Ikalogic"
+#define USB_VENDOR_NAME                        "IKALOGIC"

 #define USB_MODEL_NAME                 "ScanaPLUS"
 #define USB_IPRODUCT                   "SCANAPLUS"
 
 #define USB_MODEL_NAME                 "ScanaPLUS"
 #define USB_IPRODUCT                   "SCANAPLUS"
 


@@ -42,7 +42,7 @@ static const char *probe_names[] = {
        NULL,
 };
 
        NULL,
 };
 

-/* Note: The Ikalogic ScanaPLUS always samples at 100MHz. */
+/* Note: The IKALOGIC ScanaPLUS always samples at 100MHz. */

 static uint64_t samplerates[1] = { SR_MHZ(100) };
 
 SR_PRIV struct sr_dev_driver ikalogic_scanaplus_driver_info;
 static uint64_t samplerates[1] = { SR_MHZ(100) };
 
 SR_PRIV struct sr_dev_driver ikalogic_scanaplus_driver_info;


@@ -413,7 +413,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 
 SR_PRIV struct sr_dev_driver ikalogic_scanaplus_driver_info = {
        .name = "ikalogic-scanaplus",
 
 SR_PRIV struct sr_dev_driver ikalogic_scanaplus_driver_info = {
        .name = "ikalogic-scanaplus",

-       .longname = "Ikalogic ScanaPLUS",
+       .longname = "IKALOGIC ScanaPLUS",

        .api_version = 1,
        .init = init,
        .cleanup = cleanup,
        .api_version = 1,
        .init = init,
        .cleanup = cleanup,