X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fprotocol.c;h=0dff00d625baf20920460c0ba21733434e6e8f24;hb=4b25cbffa17c9b8c9c30f98ffe6918a15b664b2a;hp=6955baaeec23bf2e11f894d7247d21880c3d3231;hpb=d2f7c417fdd96a13d8fd86350d2fc13db16f626c;p=libsigrok.git

diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c
index 6955baae..0dff00d6 100644
--- a/src/hardware/yokogawa-dlm/protocol.c
+++ b/src/hardware/yokogawa-dlm/protocol.c
@@ -18,18 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**
- * @file
- *
- * <em>Yokogawa DL/DLM series</em> oscilloscope driver
- * @internal
- */
-
 #include <config.h>
 #include "scpi.h"
 #include "protocol.h"
 
-static const char *dlm_coupling_options[] = {
+static const char *coupling_options[] = {
 	"AC",
 	"DC",
 	"DC50",
@@ -37,7 +30,7 @@ static const char *dlm_coupling_options[] = {
 	NULL,
 };
 
-static const char *dlm_2ch_trigger_sources[] = {
+static const char *trigger_sources_2ch[] = {
 	"1",
 	"2",
 	"LINE",
@@ -46,7 +39,7 @@ static const char *dlm_2ch_trigger_sources[] = {
 };
 
 /* TODO: Is BITx handled correctly or is Dx required? */
-static const char *dlm_4ch_trigger_sources[] = {
+static const char *trigger_sources_4ch[] = {
 	"1",
 	"2",
 	"3",
@@ -200,8 +193,8 @@ static const struct scope_config scope_models[] = {
 		.analog_names = &scope_analog_channel_names,
 		.digital_names = &scope_digital_channel_names_8,
 
-		.coupling_options = &dlm_coupling_options,
-		.trigger_sources = &dlm_2ch_trigger_sources,
+		.coupling_options = &coupling_options,
+		.trigger_sources = &trigger_sources_2ch,
 
 		.num_xdivs = 10,
 		.num_ydivs = 8,
@@ -216,8 +209,8 @@ static const struct scope_config scope_models[] = {
 		.analog_names = &scope_analog_channel_names,
 		.digital_names = &scope_digital_channel_names_8,
 
-		.coupling_options = &dlm_coupling_options,
-		.trigger_sources = &dlm_4ch_trigger_sources,
+		.coupling_options = &coupling_options,
+		.trigger_sources = &trigger_sources_4ch,
 
 		.num_xdivs = 10,
 		.num_ydivs = 8,
@@ -234,8 +227,8 @@ static const struct scope_config scope_models[] = {
 		.analog_names = &scope_analog_channel_names,
 		.digital_names = NULL,
 
-		.coupling_options = &dlm_coupling_options,
-		.trigger_sources = &dlm_4ch_trigger_sources,
+		.coupling_options = &coupling_options,
+		.trigger_sources = &trigger_sources_4ch,
 
 		.num_xdivs = 10,
 		.num_ydivs = 8,
@@ -250,8 +243,8 @@ static const struct scope_config scope_models[] = {
 		.analog_names = &scope_analog_channel_names,
 		.digital_names = &scope_digital_channel_names_32,
 
-		.coupling_options = &dlm_coupling_options,
-		.trigger_sources = &dlm_4ch_trigger_sources,
+		.coupling_options = &coupling_options,
+		.trigger_sources = &trigger_sources_4ch,
 
 		.num_xdivs = 10,
 		.num_ydivs = 8,
@@ -266,8 +259,8 @@ static const struct scope_config scope_models[] = {
 		.analog_names = &scope_analog_channel_names,
 		.digital_names = &scope_digital_channel_names_32,
 
-		.coupling_options = &dlm_coupling_options,
-		.trigger_sources = &dlm_4ch_trigger_sources,
+		.coupling_options = &coupling_options,
+		.trigger_sources = &trigger_sources_4ch,
 
 		.num_xdivs = 10,
 		.num_ydivs = 8,