X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;h=87b0c7764979bb0231cf6cd358f8307c3a7f7e0d;hb=b15ff1c92aabeea04649de25a3a01f851ab0a1ec;hp=5bba8d9bb52085930a835365dc6249ab5d6d8d53;hpb=105df67463b84683a35f3474eccc871e5aa4ed0e;p=libsigrok.git

diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index 5bba8d9b..87b0c776 100644
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -26,7 +26,6 @@
 static struct sr_dev_driver yokogawa_dlm_driver_info;
 
 static const char *MANUFACTURER_ID = "YOKOGAWA";
-static const char *MANUFACTURER_NAME = "Yokogawa";
 
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
@@ -87,7 +86,7 @@ static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi)
 		goto fail;
 
 	sdi = g_malloc0(sizeof(struct sr_dev_inst));
-	sdi->vendor = g_strdup(MANUFACTURER_NAME);
+	sdi->vendor = g_strdup("Yokogawa");
 	sdi->model = g_strdup(model_name);
 	sdi->version = g_strdup(hw_info->firmware_version);
 
@@ -489,9 +488,9 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	switch (key) {
 	case SR_CONF_DEVICE_OPTIONS:
 		if (cg_type == CG_ANALOG)
-			*data = std_gvar_array_u32(devopts_cg_analog, ARRAY_SIZE(devopts_cg_analog));
+			*data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_analog));
 		else if (cg_type == CG_DIGITAL)
-			*data = std_gvar_array_u32(devopts_cg_digital, ARRAY_SIZE(devopts_cg_digital));
+			*data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_digital));
 		else
 			*data = std_gvar_array_u32(NULL, 0);
 		break;