From: Bert Vermeulen <redacted>
Date: Thu, 22 May 2014 21:22:37 +0000 (+0200)
Subject: fx2lafw: Rename trigger constant.
X-Git-Tag: libsigrok-0.4.0~1312
X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=f66d45806fb6f9757343db72664ab2b058c75985

fx2lafw: Rename trigger constant.
---

diff --git a/hardware/fx2lafw/api.c b/hardware/fx2lafw/api.c
index 6b7f9fa0..c2dc2e0c 100644
--- a/hardware/fx2lafw/api.c
+++ b/hardware/fx2lafw/api.c
@@ -476,7 +476,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		*data = g_variant_builder_end(&gvb);
 		break;
 	case SR_CONF_TRIGGER_TYPE:
-		*data = g_variant_new_string(TRIGGER_TYPE);
+		*data = g_variant_new_string(SOFT_TRIGGER_TYPES);
 		break;
 	default:
 		return SR_ERR_NA;
diff --git a/hardware/fx2lafw/protocol.h b/hardware/fx2lafw/protocol.h
index dfb6ef8a..82fb1e6a 100644
--- a/hardware/fx2lafw/protocol.h
+++ b/hardware/fx2lafw/protocol.h
@@ -34,7 +34,7 @@
 #define USB_INTERFACE		0
 #define USB_CONFIGURATION	1
 #define NUM_TRIGGER_STAGES	4
-#define TRIGGER_TYPE 		"01"
+#define SOFT_TRIGGER_TYPES	"01"
 
 #define MAX_RENUM_DELAY_MS	3000
 #define NUM_SIMUL_TRANSFERS	32