ISO-TECH IDM103N: remove the useless -ser postfix

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index 24e7069d71a7c5910fbe0f6816df067b20818b21..38fb053ff1cc9ce40c9aefa113342350f4d4d25b 100644 (file)
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -62,7 +62,7 @@ SR_PRIV struct sr_dev_driver uni_t_ut60a_ser_driver_info;
 SR_PRIV struct sr_dev_driver uni_t_ut60e_ser_driver_info;
 SR_PRIV struct sr_dev_driver uni_t_ut61d_ser_driver_info;
 SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info;
-SR_PRIV struct sr_dev_driver iso_tech_idm103n_ser_driver_info;
+SR_PRIV struct sr_dev_driver iso_tech_idm103n_driver_info;
 
 SR_PRIV struct dmm_info dmms[] = {
        {
@@ -226,7 +226,7 @@ SR_PRIV struct dmm_info dmms[] = {
                "ISO-TECH", "IDM103N", "2400/7o1/rts=0/dtr=1",
                2400, ES519XX_11B_PACKET_SIZE, NULL,
                sr_es519xx_2400_11b_packet_valid, sr_es519xx_2400_11b_parse, NULL,
-               &iso_tech_idm103n_ser_driver_info, receive_data_ISO_TECH_IDM103N_SER,
+               &iso_tech_idm103n_driver_info, receive_data_ISO_TECH_IDM103N,
        },
 };
 
@@ -550,4 +550,4 @@ DRV(uni_t_ut60a_ser, UNI_T_UT60A_SER, "uni-t-ut60a-ser", "UNI-T UT60A (UT-D02 ca
 DRV(uni_t_ut60e_ser, UNI_T_UT60E_SER, "uni-t-ut60e-ser", "UNI-T UT60E (UT-D02 cable)")
 DRV(uni_t_ut61d_ser, UNI_T_UT61D_SER, "uni-t-ut61d-ser", "UNI-T UT61D (UT-D02 cable)")
 DRV(uni_t_ut61e_ser, UNI_T_UT61E_SER, "uni-t-ut61e-ser", "UNI-T UT61E (UT-D02 cable)")
-DRV(iso_tech_idm103n_ser, ISO_TECH_IDM103N_SER, "iso-tech-idm103n-ser", "ISO-TECH IDM103N")
+DRV(iso_tech_idm103n, ISO_TECH_IDM103N, "iso-tech-idm103n", "ISO-TECH IDM103N")

diff --git a/hardware/serial-dmm/protocol.c b/hardware/serial-dmm/protocol.c
index d47a7e7f46eb376b21bb9625c2350e08819c55d1..bbe572f5b5ecddacdcba7f3dc7da1ea045446d99 100644 (file)
--- a/hardware/serial-dmm/protocol.c
+++ b/hardware/serial-dmm/protocol.c
@@ -179,4 +179,4 @@ RECEIVE_DATA(UNI_T_UT60A_SER, fs9721)
 RECEIVE_DATA(UNI_T_UT60E_SER, fs9721)
 RECEIVE_DATA(UNI_T_UT61D_SER, fs9922)
 RECEIVE_DATA(UNI_T_UT61E_SER, es51922)
-RECEIVE_DATA(ISO_TECH_IDM103N_SER, es519xx)
+RECEIVE_DATA(ISO_TECH_IDM103N, es519xx)

diff --git a/hardware/serial-dmm/protocol.h b/hardware/serial-dmm/protocol.h
index 545855b0d56c0e2a14b43985350044b27c11ac1a..ca27f8421b353025571f205ac1412db424c30a47 100644 (file)
--- a/hardware/serial-dmm/protocol.h
+++ b/hardware/serial-dmm/protocol.h
@@ -52,7 +52,7 @@ enum {
        UNI_T_UT60E_SER,
        UNI_T_UT61D_SER,
        UNI_T_UT61E_SER,
-       ISO_TECH_IDM103N_SER,
+       ISO_TECH_IDM103N,
 };
 
 #define DMM_COUNT 22
@@ -118,7 +118,7 @@ SR_PRIV int receive_data_UNI_T_UT60A_SER(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_UNI_T_UT60E_SER(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_UNI_T_UT61D_SER(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_UNI_T_UT61E_SER(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_ISO_TECH_IDM103N_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 void dmm_details_tp4000zc(struct sr_datafeed_analog *analog, void *info);
 SR_PRIV void dmm_details_dt4000zc(struct sr_datafeed_analog *analog, void *info);

diff --git a/hwdriver.c b/hwdriver.c
index 3bc6bc9c361b3add05399674040066e07b27bdb1..50615f55b56f596f3b91b0a5af72f5f5c38a5086 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -206,7 +206,7 @@ extern SR_PRIV struct sr_dev_driver uni_t_ut60a_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver uni_t_ut60e_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver uni_t_ut61d_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver iso_tech_idm103n_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver iso_tech_idm103n_driver_info;
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
 extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info;
@@ -320,7 +320,7 @@ static struct sr_dev_driver *drivers_list[] = {
        &uni_t_ut60e_ser_driver_info,
        &uni_t_ut61d_ser_driver_info,
        &uni_t_ut61e_ser_driver_info,
-       &iso_tech_idm103n_ser_driver_info,
+       &iso_tech_idm103n_driver_info,
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
        &tecpel_dmm_8061_driver_info,