From df6b0f99af1c2f4be963a7fb388e21a718cce6f3 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Fri, 11 Oct 2013 01:36:52 +0200 Subject: [PATCH] ISO-TECH IDM103N: remove the useless -ser postfix --- hardware/serial-dmm/api.c | 6 +++--- hardware/serial-dmm/protocol.c | 2 +- hardware/serial-dmm/protocol.h | 4 ++-- hwdriver.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c index 24e7069d..38fb053f 100644 --- 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 d47a7e7f..bbe572f5 100644 --- 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 545855b0..ca27f842 100644 --- 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 3bc6bc9c..50615f55 100644 --- 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,