From: Uwe Hermann <redacted>
Date: Sun, 2 Nov 2014 15:40:40 +0000 (+0100)
Subject: Brymen BM25x: Drop unneeded _ser/_SER suffix.
X-Git-Tag: libsigrok-0.4.0~812
X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=6508992d04bf972ae98b8c7e97201c5164501687

Brymen BM25x: Drop unneeded _ser/_SER suffix.

There's only one cable for this DMM, thus there's no need for a
_ser/_SER suffix or for specifying the cable name.
---

diff --git a/src/drivers.c b/src/drivers.c
index 37a30ffb..9b970fcc 100644
--- a/src/drivers.c
+++ b/src/drivers.c
@@ -166,7 +166,7 @@ extern SR_PRIV struct sr_dev_driver uni_t_ut71e_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver iso_tech_idm103n_driver_info;
 extern SR_PRIV struct sr_dev_driver tenma_72_7745_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver tenma_72_7750_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver brymen_bm25x_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver brymen_bm25x_driver_info;
 #endif
 #ifdef HAVE_HW_SYSCLK_LWLA
 extern SR_PRIV struct sr_dev_driver sysclk_lwla_driver_info;
@@ -362,7 +362,7 @@ SR_PRIV struct sr_dev_driver *drivers_list[] = {
 	&iso_tech_idm103n_driver_info,
 	&tenma_72_7745_ser_driver_info,
 	&tenma_72_7750_ser_driver_info,
-	&brymen_bm25x_ser_driver_info,
+	&brymen_bm25x_driver_info,
 #endif
 #ifdef HAVE_HW_SYSCLK_LWLA
 	&sysclk_lwla_driver_info,
diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index bdcabef0..70f05f2d 100644
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -82,7 +82,7 @@ SR_PRIV struct sr_dev_driver uni_t_ut71e_ser_driver_info;
 SR_PRIV struct sr_dev_driver iso_tech_idm103n_driver_info;
 SR_PRIV struct sr_dev_driver tenma_72_7745_ser_driver_info;
 SR_PRIV struct sr_dev_driver tenma_72_7750_ser_driver_info;
-SR_PRIV struct sr_dev_driver brymen_bm25x_ser_driver_info;
+SR_PRIV struct sr_dev_driver brymen_bm25x_driver_info;
 
 SR_PRIV struct dmm_info dmms[] = {
 	{
@@ -379,11 +379,11 @@ SR_PRIV struct dmm_info dmms[] = {
 		&tenma_72_7750_ser_driver_info, receive_data_TENMA_72_7750_SER,
 	},
 	{
-		"Brymen", "BM25x (BC20X cable)", "9600/8n1/rts=1/dtr=1",
+		"Brymen", "BM25x", "9600/8n1/rts=1/dtr=1",
 		9600, BRYMEN_BM25X_PACKET_SIZE, 0, 0, NULL,
 		sr_brymen_bm25x_packet_valid, sr_brymen_bm25x_parse,
 		NULL,
-		&brymen_bm25x_ser_driver_info, receive_data_BRYMEN_BM25X_SER,
+		&brymen_bm25x_driver_info, receive_data_BRYMEN_BM25X,
 	},
 };
 
@@ -703,4 +703,4 @@ DRV(uni_t_ut71e_ser, UNI_T_UT71E_SER, "uni-t-ut71e-ser", "UNI-T UT71E (UT-D02 ca
 DRV(iso_tech_idm103n, ISO_TECH_IDM103N, "iso-tech-idm103n", "ISO-TECH IDM103N")
 DRV(tenma_72_7745_ser, TENMA_72_7745_SER, "tenma-72-7745-ser", "Tenma 72-7745 (UT-D02 cable)")
 DRV(tenma_72_7750_ser, TENMA_72_7750_SER, "tenma-72-7750-ser", "Tenma 72-7750 (UT-D02 cable)")
-DRV(brymen_bm25x_ser, BRYMEN_BM25X_SER, "brymen-bm25x-ser", "Brymen BM25x (BC20X cable)")
+DRV(brymen_bm25x, BRYMEN_BM25X, "brymen-bm25x", "Brymen BM25x")
diff --git a/src/hardware/serial-dmm/protocol.c b/src/hardware/serial-dmm/protocol.c
index 6b34e2e4..03509fd2 100644
--- a/src/hardware/serial-dmm/protocol.c
+++ b/src/hardware/serial-dmm/protocol.c
@@ -231,4 +231,4 @@ RECEIVE_DATA(UNI_T_UT71E_SER, ut71x)
 RECEIVE_DATA(ISO_TECH_IDM103N, es519xx)
 RECEIVE_DATA(TENMA_72_7745_SER, fs9721)
 RECEIVE_DATA(TENMA_72_7750_SER, es519xx)
-RECEIVE_DATA(BRYMEN_BM25X_SER, bm25x)
+RECEIVE_DATA(BRYMEN_BM25X, bm25x)
diff --git a/src/hardware/serial-dmm/protocol.h b/src/hardware/serial-dmm/protocol.h
index b4ab0563..8911dfcb 100644
--- a/src/hardware/serial-dmm/protocol.h
+++ b/src/hardware/serial-dmm/protocol.h
@@ -64,7 +64,7 @@ enum {
 	ISO_TECH_IDM103N,
 	TENMA_72_7745_SER,
 	TENMA_72_7750_SER,
-	BRYMEN_BM25X_SER,
+	BRYMEN_BM25X,
 };
 
 struct dmm_info {
@@ -172,6 +172,6 @@ SR_PRIV int receive_data_UNI_T_UT71E_SER(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_ISO_TECH_IDM103N(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_TENMA_72_7745_SER(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_TENMA_72_7750_SER(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_BRYMEN_BM25X_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_BRYMEN_BM25X(int fd, int revents, void *cb_data);
 
 #endif