From: Bert Vermeulen <redacted>
Date: Sat, 23 Nov 2013 14:24:40 +0000 (+0100)
Subject: uni-t-dmm: Drop unnecessary DMM count.
X-Git-Tag: libsigrok-0.3.0~535
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=79b9a237bdf974c826d222086424bc1edb089976;p=libsigrok.git

uni-t-dmm: Drop unnecessary DMM count.
---

diff --git a/hardware/uni-t-dmm/protocol.c b/hardware/uni-t-dmm/protocol.c
index 0c6d9efe..8b7bb9b2 100644
--- a/hardware/uni-t-dmm/protocol.c
+++ b/hardware/uni-t-dmm/protocol.c
@@ -24,6 +24,8 @@
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
+extern struct dmm_info udmms[];
+
 /*
  * Driver for various UNI-T multimeters (and rebranded ones).
  *
diff --git a/hardware/uni-t-dmm/protocol.h b/hardware/uni-t-dmm/protocol.h
index 1d8a3534..ea8a1a4c 100644
--- a/hardware/uni-t-dmm/protocol.h
+++ b/hardware/uni-t-dmm/protocol.h
@@ -36,7 +36,6 @@
 #define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
 #define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
-/* Note: When adding entries here, don't forget to update DMM_COUNT. */
 enum {
 	TECPEL_DMM_8061,
 	UNI_T_UT60A,
@@ -49,8 +48,6 @@ enum {
 	TENMA_72_7745,
 };
 
-#define DMM_COUNT 9
-
 struct dmm_info {
 	char *vendor;
 	char *device;
@@ -64,8 +61,6 @@ struct dmm_info {
 	int (*receive_data)(int, int, void *);
 };
 
-extern SR_PRIV struct dmm_info udmms[DMM_COUNT];
-
 #define CHUNK_SIZE		8
 
 #define DMM_BUFSIZE		256