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

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.
This commit is contained in:
Uwe Hermann 2019-04-22 13:26:47 +02:00
parent 4ddd34b107
commit 7d0f52f7e5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -205,7 +205,7 @@ Note: This release DOES change the libsigrok API. That means it is NOT
- LeCroy LogicStudio - LeCroy LogicStudio
- mcupro Logic16 clone - mcupro Logic16 clone
- Pipistrello OLS - Pipistrello OLS
- SysClk LWLA1016 - Sysclk LWLA1016
- Oscilloscopes: - Oscilloscopes:
- Rigol/Agilent DS1000Z series - Rigol/Agilent DS1000Z series
- Yokogawa DLM2000 series - Yokogawa DLM2000 series

4
contrib/60-libsigrok.rules
View File

@ -251,10 +251,10 @@ ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="608e", ENV{ID_SIGROK}="1"
# sigrok usb-c-grok # sigrok usb-c-grok
ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="608f", ENV{ID_SIGROK}="1" 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" ATTRS{idVendor}=="2961", ATTRS{idProduct}=="6689", ENV{ID_SIGROK}="1"
# Sysclk SLA5032 ("32CH 500M" mode) # Sysclk SLA5032 ("32CH 500M" mode)

8
src/hardware/sysclk-lwla/api.c
View File

@ -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 = g_malloc0(sizeof(struct sr_dev_inst));
sdi->status = SR_ST_INACTIVE; sdi->status = SR_ST_INACTIVE;
sdi->vendor = g_strdup("SysClk"); sdi->vendor = g_strdup("Sysclk");
sdi->model = g_strdup(model->name); sdi->model = g_strdup(model->name);
sdi->priv = devc; 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. * device and also matches the connection specification.
*/ */
static struct sr_dev_inst *dev_inst_new_matching(GSList *conn_matches, 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 { } else {
if (conn_matches) if (conn_matches)
sr_warn("USB device %d.%d (%04x:%04x) is not a" 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; return NULL;
} }
sdi = dev_inst_new(model); 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 = { static struct sr_dev_driver sysclk_lwla_driver_info = {
.name = "sysclk-lwla", .name = "sysclk-lwla",
.longname = "SysClk LWLA series", .longname = "Sysclk LWLA series",
.api_version = 1, .api_version = 1,
.init = std_init, .init = std_init,
.cleanup = std_cleanup, .cleanup = std_cleanup,