Consistently use the "Sysclk" spelling everywhere.

We use this spelling (not "SysClk") in most of the rest of the code-base,
as well as in the wiki.

diff --git a/NEWS b/NEWS
index e66de177438a08dbd5659ed69cb8ca73954b92b5..a961148e7b4a75af724fd3441fec6b48925203e8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -205,7 +205,7 @@ Note: This release DOES change the libsigrok API. That means it is NOT
      - LeCroy LogicStudio
      - mcupro Logic16 clone
      - Pipistrello OLS
      - LeCroy LogicStudio
      - mcupro Logic16 clone
      - Pipistrello OLS

-     - SysClk LWLA1016
+     - Sysclk LWLA1016

    - Oscilloscopes:
      - Rigol/Agilent DS1000Z series
      - Yokogawa DLM2000 series
    - Oscilloscopes:
      - Rigol/Agilent DS1000Z series
      - Yokogawa DLM2000 series

diff --git a/contrib/60-libsigrok.rules b/contrib/60-libsigrok.rules
index ad51480bececc75fe96d879662ef1e25cc8d2af9..b10f0e5b60e0833ec90b209bc0fbbb31f903737d 100644 (file)
--- a/contrib/60-libsigrok.rules
+++ b/contrib/60-libsigrok.rules
@@ -251,10 +251,10 @@ ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="608e", ENV{ID_SIGROK}="1"
 # sigrok usb-c-grok
 ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="608f", ENV{ID_SIGROK}="1"
 
 # sigrok usb-c-grok
 ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="608f", ENV{ID_SIGROK}="1"
 

-# SysClk LWLA1016
+# Sysclk LWLA1016

 ATTRS{idVendor}=="2961", ATTRS{idProduct}=="6688", ENV{ID_SIGROK}="1"
 
 ATTRS{idVendor}=="2961", ATTRS{idProduct}=="6688", ENV{ID_SIGROK}="1"
 

-# SysClk LWLA1034
+# Sysclk LWLA1034

 ATTRS{idVendor}=="2961", ATTRS{idProduct}=="6689", ENV{ID_SIGROK}="1"
 
 # Sysclk SLA5032 ("32CH 500M" mode)
 ATTRS{idVendor}=="2961", ATTRS{idProduct}=="6689", ENV{ID_SIGROK}="1"
 
 # Sysclk SLA5032 ("32CH 500M" mode)

diff --git a/src/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c
index 231df4dbf270b2181c6f8ea3f7f59e98aa6116f1..cac7cfc1462b51269d3a019711736c3f297e4e38 100644 (file)
--- a/src/hardware/sysclk-lwla/api.c
+++ b/src/hardware/sysclk-lwla/api.c
@@ -67,7 +67,7 @@ static struct sr_dev_inst *dev_inst_new(const struct model_info *model)
 
        sdi = g_malloc0(sizeof(struct sr_dev_inst));
        sdi->status = SR_ST_INACTIVE;
 
        sdi = g_malloc0(sizeof(struct sr_dev_inst));
        sdi->status = SR_ST_INACTIVE;

-       sdi->vendor = g_strdup("SysClk");
+       sdi->vendor = g_strdup("Sysclk");

        sdi->model = g_strdup(model->name);
        sdi->priv = devc;
 
        sdi->model = g_strdup(model->name);
        sdi->priv = devc;
 


@@ -79,7 +79,7 @@ static struct sr_dev_inst *dev_inst_new(const struct model_info *model)
        return sdi;
 }
 
        return sdi;
 }
 

-/* Create a new device instance for a libusb device if it is a SysClk LWLA
+/* Create a new device instance for a libusb device if it is a Sysclk LWLA

  * device and also matches the connection specification.
  */
 static struct sr_dev_inst *dev_inst_new_matching(GSList *conn_matches,
  * device and also matches the connection specification.
  */
 static struct sr_dev_inst *dev_inst_new_matching(GSList *conn_matches,


@@ -121,7 +121,7 @@ static struct sr_dev_inst *dev_inst_new_matching(GSList *conn_matches,
        } else {
                if (conn_matches)
                        sr_warn("USB device %d.%d (%04x:%04x) is not a"
        } else {
                if (conn_matches)
                        sr_warn("USB device %d.%d (%04x:%04x) is not a"

-                               " SysClk LWLA.", bus, address, vid, pid);
+                               " Sysclk LWLA.", bus, address, vid, pid);

                return NULL;
        }
        sdi = dev_inst_new(model);
                return NULL;
        }
        sdi = dev_inst_new(model);


@@ -640,7 +640,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
 static struct sr_dev_driver sysclk_lwla_driver_info = {
        .name = "sysclk-lwla",
 
 static struct sr_dev_driver sysclk_lwla_driver_info = {
        .name = "sysclk-lwla",

-       .longname = "SysClk LWLA series",
+       .longname = "Sysclk LWLA series",

        .api_version = 1,
        .init = std_init,
        .cleanup = std_cleanup,
        .api_version = 1,
        .init = std_init,
        .cleanup = std_cleanup,