X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fapi.c;h=b0c097cde51eabce1c673ee0508d467adb71f6aa;hb=f6beaac55ca58c406d6621038abe57c16a47e87f;hp=f59702cc3648ba4b108c01651775dada164a9e70;hpb=e73ffd4238c6d1be58d3fcdcf7f100200f033856;p=libsigrok.git diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c index f59702cc..b0c097cd 100644 --- a/hardware/serial-dmm/api.c +++ b/hardware/serial-dmm/api.c @@ -53,8 +53,11 @@ SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info; SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info; SR_PRIV struct sr_dev_driver radioshack_22_805_driver_info; SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info; +SR_PRIV struct sr_dev_driver tecpel_dmm_8060_ser_driver_info; +SR_PRIV struct sr_dev_driver tecpel_dmm_8061_ser_driver_info; SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info; SR_PRIV struct sr_dev_driver voltcraft_vc840_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 dmm_info dmms[] = { @@ -62,14 +65,14 @@ SR_PRIV struct dmm_info dmms[] = { "Digitek", "DT4000ZC", "2400/8n1", 2400, FS9721_PACKET_SIZE, NULL, sr_fs9721_packet_valid, sr_fs9721_parse, - dmm_details_dt4000zc, + sr_fs9721_10_temp_c, &digitek_dt4000zc_driver_info, receive_data_DIGITEK_DT4000ZC, }, { "TekPower", "TP4000ZC", "2400/8n1", 2400, FS9721_PACKET_SIZE, NULL, sr_fs9721_packet_valid, sr_fs9721_parse, - dmm_details_tp4000zc, + sr_fs9721_10_temp_c, &tekpower_tp4000zc_driver_info, receive_data_TEKPOWER_TP4000ZC, }, { @@ -97,7 +100,7 @@ SR_PRIV struct dmm_info dmms[] = { "V&A", "VA18B", "2400/8n1", 2400, FS9721_PACKET_SIZE, NULL, sr_fs9721_packet_valid, sr_fs9721_parse, - dmm_details_va18b, + sr_fs9721_01_temp_c, &va_va18b_driver_info, receive_data_VA_VA18B, }, { @@ -118,7 +121,7 @@ SR_PRIV struct dmm_info dmms[] = { "PCE", "PCE-DM32", "2400/8n1", 2400, FS9721_PACKET_SIZE, NULL, sr_fs9721_packet_valid, sr_fs9721_parse, - dmm_details_pce_dm32, + sr_fs9721_01_10_temp_f_c, &pce_pce_dm32_driver_info, receive_data_PCE_PCE_DM32, }, { @@ -142,6 +145,22 @@ SR_PRIV struct dmm_info dmms[] = { NULL, &radioshack_22_812_driver_info, receive_data_RADIOSHACK_22_812, }, + { + "Tecpel", "DMM-8060 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", + 2400, FS9721_PACKET_SIZE, NULL, + sr_fs9721_packet_valid, sr_fs9721_parse, + NULL, + &tecpel_dmm_8060_ser_driver_info, + receive_data_TECPEL_DMM_8060_SER, + }, + { + "Tecpel", "DMM-8061 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", + 2400, FS9721_PACKET_SIZE, NULL, + sr_fs9721_packet_valid, sr_fs9721_parse, + sr_fs9721_00_temp_c, + &tecpel_dmm_8061_ser_driver_info, + receive_data_TECPEL_DMM_8061_SER, + }, { "Voltcraft", "VC-820 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", 2400, FS9721_PACKET_SIZE, NULL, @@ -154,10 +173,16 @@ SR_PRIV struct dmm_info dmms[] = { "Voltcraft", "VC-840 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", 2400, FS9721_PACKET_SIZE, NULL, sr_fs9721_packet_valid, sr_fs9721_parse, - NULL, + sr_fs9721_00_temp_c, &voltcraft_vc840_ser_driver_info, receive_data_VOLTCRAFT_VC840_SER, }, + { + "UNI-T", "UT61D (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", + 2400, FS9922_PACKET_SIZE, NULL, + sr_fs9922_packet_valid, sr_fs9922_parse, NULL, + &uni_t_ut61d_ser_driver_info, receive_data_UNI_T_UT61D_SER, + }, { /* Note: ES51922 baudrate is actually 19230! */ "UNI-T", "UT61E (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", @@ -167,45 +192,19 @@ SR_PRIV struct dmm_info dmms[] = { }, }; -/* Properly close and free all devices. */ static int clear_instances(int dmm) { - struct sr_dev_inst *sdi; - struct drv_context *drvc; - struct dev_context *devc; - struct sr_serial_dev_inst *serial; - GSList *l; - struct sr_dev_driver *di; - - di = dmms[dmm].di; - - if (!(drvc = di->priv)) - return SR_OK; - - drvc = di->priv; - for (l = drvc->instances; l; l = l->next) { - if (!(sdi = l->data)) - continue; - if (!(devc = sdi->priv)) - continue; - serial = sdi->conn; - sr_serial_dev_inst_free(serial); - sr_dev_inst_free(sdi); - } - g_slist_free(drvc->instances); - drvc->instances = NULL; - - return SR_OK; + return std_dev_clear(dmms[dmm].di, NULL); } -static int hw_init(struct sr_context *sr_ctx, int dmm) +static int init(struct sr_context *sr_ctx, int dmm) { sr_dbg("Selected '%s' subdriver.", dmms[dmm].di->name); - return std_hw_init(sr_ctx, dmms[dmm].di, DRIVER_LOG_DOMAIN); + return std_init(sr_ctx, dmms[dmm].di, LOG_PREFIX); } -static GSList *scan(const char *conn, const char *serialcomm, int dmm) +static GSList *sdmm_scan(const char *conn, const char *serialcomm, int dmm) { struct sr_dev_inst *sdi; struct drv_context *drvc; @@ -290,7 +289,7 @@ scan_cleanup: return devices; } -static GSList *hw_scan(GSList *options, int dmm) +static GSList *scan(GSList *options, int dmm) { struct sr_config *src; GSList *l, *devices; @@ -313,21 +312,21 @@ static GSList *hw_scan(GSList *options, int dmm) if (serialcomm) { /* Use the provided comm specs. */ - devices = scan(conn, serialcomm, dmm); + devices = sdmm_scan(conn, serialcomm, dmm); } else { /* Try the default. */ - devices = scan(conn, dmms[dmm].conn, dmm); + devices = sdmm_scan(conn, dmms[dmm].conn, dmm); } return devices; } -static GSList *hw_dev_list(int dmm) +static GSList *dev_list(int dmm) { return ((struct drv_context *)(dmms[dmm].di->priv))->instances; } -static int hw_dev_open(struct sr_dev_inst *sdi) +static int dev_open(struct sr_dev_inst *sdi) { struct sr_serial_dev_inst *serial; @@ -340,7 +339,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi) return SR_OK; } -static int hw_dev_close(struct sr_dev_inst *sdi) +static int dev_close(struct sr_dev_inst *sdi) { struct sr_serial_dev_inst *serial; @@ -353,11 +352,9 @@ static int hw_dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int hw_cleanup(int dmm) +static int cleanup(int dmm) { - clear_instances(dmm); - - return SR_OK; + return clear_instances(dmm); } static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) @@ -411,7 +408,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) return SR_OK; } -static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, +static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data, int dmm) { struct dev_context *devc; @@ -436,7 +433,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, devc->starttime = g_get_monotonic_time(); /* Send header packet to the session bus. */ - std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); + std_session_send_df_header(cb_data, LOG_PREFIX); /* Poll every 50ms, or whenever some data comes in. */ serial = sdi->conn; @@ -446,26 +443,26 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, return SR_OK; } -static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { - return std_hw_dev_acquisition_stop_serial(sdi, cb_data, hw_dev_close, - sdi->conn, DRIVER_LOG_DOMAIN); + return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close, + sdi->conn, LOG_PREFIX); } /* Driver-specific API function wrappers */ #define HW_INIT(X) \ -static int hw_init_##X(struct sr_context *sr_ctx) { return hw_init(sr_ctx, X); } +static int init_##X(struct sr_context *sr_ctx) { return init(sr_ctx, X); } #define HW_CLEANUP(X) \ -static int hw_cleanup_##X(void) { return hw_cleanup(X); } +static int cleanup_##X(void) { return cleanup(X); } #define HW_SCAN(X) \ -static GSList *hw_scan_##X(GSList *options) { return hw_scan(options, X); } +static GSList *scan_##X(GSList *options) { return scan(options, X); } #define HW_DEV_LIST(X) \ -static GSList *hw_dev_list_##X(void) { return hw_dev_list(X); } +static GSList *dev_list_##X(void) { return dev_list(X); } #define CLEAR_INSTANCES(X) \ static int clear_instances_##X(void) { return clear_instances(X); } #define HW_DEV_ACQUISITION_START(X) \ -static int hw_dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \ -void *cb_data) { return hw_dev_acquisition_start(sdi, cb_data, X); } +static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \ +void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); } /* Driver structs and API function wrappers */ #define DRV(ID, ID_UPPER, NAME, LONGNAME) \ @@ -479,18 +476,18 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ .name = NAME, \ .longname = LONGNAME, \ .api_version = 1, \ - .init = hw_init_##ID_UPPER, \ - .cleanup = hw_cleanup_##ID_UPPER, \ - .scan = hw_scan_##ID_UPPER, \ - .dev_list = hw_dev_list_##ID_UPPER, \ + .init = init_##ID_UPPER, \ + .cleanup = cleanup_##ID_UPPER, \ + .scan = scan_##ID_UPPER, \ + .dev_list = dev_list_##ID_UPPER, \ .dev_clear = clear_instances_##ID_UPPER, \ .config_get = NULL, \ .config_set = config_set, \ .config_list = config_list, \ - .dev_open = hw_dev_open, \ - .dev_close = hw_dev_close, \ - .dev_acquisition_start = hw_dev_acquisition_start_##ID_UPPER, \ - .dev_acquisition_stop = hw_dev_acquisition_stop, \ + .dev_open = dev_open, \ + .dev_close = dev_close, \ + .dev_acquisition_start = dev_acquisition_start_##ID_UPPER, \ + .dev_acquisition_stop = dev_acquisition_stop, \ .priv = NULL, \ }; @@ -506,6 +503,9 @@ DRV(pce_pce_dm32, PCE_PCE_DM32, "pce-pce-dm32", "PCE PCE-DM32") DRV(radioshack_22_168, RADIOSHACK_22_168, "radioshack-22-168", "RadioShack 22-168") DRV(radioshack_22_805, RADIOSHACK_22_805, "radioshack-22-805", "RadioShack 22-805") DRV(radioshack_22_812, RADIOSHACK_22_812, "radioshack-22-812", "RadioShack 22-812") +DRV(tecpel_dmm_8060_ser, TECPEL_DMM_8060_SER, "tecpel-dmm-8060-ser", "Tecpel DMM-8060 (UT-D02 cable)") +DRV(tecpel_dmm_8061_ser, TECPEL_DMM_8061_SER, "tecpel-dmm-8061-ser", "Tecpel DMM-8061 (UT-D02 cable)") DRV(voltcraft_vc820_ser, VOLTCRAFT_VC820_SER, "voltcraft-vc820-ser", "Voltcraft VC-820 (UT-D02 cable)") DRV(voltcraft_vc840_ser, VOLTCRAFT_VC840_SER, "voltcraft-vc840-ser", "Voltcraft VC-840 (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)")