X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-dmm%2Fapi.c;h=0e431b54bcf97ccc6d2dd6c06667ebf6691e04ab;hb=dcd438ee3523098201c7937e75e55775da3b506f;hp=35ceaaed4a12c5bc64535037911edd99c2199dea;hpb=0af636bed97c174bea46e61e961eaa1b0b162e0f;p=libsigrok.git diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c index 35ceaaed..0e431b54 100644 --- a/src/hardware/uni-t-dmm/api.c +++ b/src/hardware/uni-t-dmm/api.c @@ -38,6 +38,7 @@ static const uint32_t devopts[] = { }; SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info; +SR_PRIV struct sr_dev_driver uni_t_ut372_driver_info; SR_PRIV struct sr_dev_driver uni_t_ut60a_driver_info; SR_PRIV struct sr_dev_driver uni_t_ut60e_driver_info; SR_PRIV struct sr_dev_driver uni_t_ut60g_driver_info; @@ -53,13 +54,14 @@ SR_PRIV struct sr_dev_driver uni_t_ut71e_driver_info; SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info; SR_PRIV struct sr_dev_driver voltcraft_vc830_driver_info; SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info; +SR_PRIV struct sr_dev_driver voltcraft_vc870_driver_info; SR_PRIV struct sr_dev_driver voltcraft_vc920_driver_info; SR_PRIV struct sr_dev_driver voltcraft_vc940_driver_info; SR_PRIV struct sr_dev_driver voltcraft_vc960_driver_info; SR_PRIV struct sr_dev_driver tenma_72_7745_driver_info; SR_PRIV struct sr_dev_driver tenma_72_7750_driver_info; -SR_PRIV struct dmm_info udmms[] = { +SR_PRIV const struct dmm_info udmms[] = { { "Tecpel", "DMM-8061", 2400, FS9721_PACKET_SIZE, @@ -67,6 +69,13 @@ SR_PRIV struct dmm_info udmms[] = { sr_fs9721_00_temp_c, &tecpel_dmm_8061_driver_info, receive_data_TECPEL_DMM_8061, }, + { + "UNI-T", "UT372", 2400, + UT372_PACKET_SIZE, + sr_ut372_packet_valid, sr_ut372_parse, + NULL, + &uni_t_ut372_driver_info, receive_data_UNI_T_UT372, + }, { "UNI-T", "UT60A", 2400, FS9721_PACKET_SIZE, @@ -169,6 +178,11 @@ SR_PRIV struct dmm_info udmms[] = { sr_fs9721_00_temp_c, &voltcraft_vc840_driver_info, receive_data_VOLTCRAFT_VC840, }, + { + "Voltcraft", "VC-870", 9600, VC870_PACKET_SIZE, + sr_vc870_packet_valid, sr_vc870_parse, NULL, + &voltcraft_vc870_driver_info, receive_data_VOLTCRAFT_VC870, + }, { "Voltcraft", "VC-920", 2400, UT71X_PACKET_SIZE, sr_ut71x_packet_valid, sr_ut71x_parse, NULL, @@ -227,7 +241,6 @@ static GSList *scan(GSList *options, int dmm) struct drv_context *drvc; struct sr_usb_dev_inst *usb; struct sr_config *src; - struct sr_channel *ch; const char *conn; drvc = udmms[dmm].di->priv; @@ -252,27 +265,17 @@ static GSList *scan(GSList *options, int dmm) for (l = usb_devices; l; l = l->next) { usb = l->data; - - if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { - sr_err("Device context malloc failed."); - return NULL; - } - + devc = g_malloc0(sizeof(struct dev_context)); devc->first_run = TRUE; - - sdi = sr_dev_inst_new(); + sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi->status = SR_ST_INACTIVE; sdi->vendor = g_strdup(udmms[dmm].vendor); sdi->model = g_strdup(udmms[dmm].device); sdi->priv = devc; sdi->driver = udmms[dmm].di; - if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1"))) - return NULL; - sdi->channels = g_slist_append(sdi->channels, ch); - + sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1"); sdi->inst_type = SR_INST_USB; sdi->conn = usb; - drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); } @@ -325,22 +328,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd switch (key) { case SR_CONF_LIMIT_MSEC: - if (g_variant_get_uint64(data) == 0) { - sr_err("Time limit cannot be 0."); - return SR_ERR; - } devc->limit_msec = g_variant_get_uint64(data); - sr_dbg("Setting time limit to %" PRIu64 "ms.", - devc->limit_msec); break; case SR_CONF_LIMIT_SAMPLES: - if (g_variant_get_uint64(data) == 0) { - sr_err("Sample limit cannot be 0."); - return SR_ERR; - } devc->limit_samples = g_variant_get_uint64(data); - sr_dbg("Setting sample limit to %" PRIu64 ".", - devc->limit_samples); break; default: return SR_ERR_NA; @@ -411,15 +402,20 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) /* Driver-specific API function wrappers */ #define HW_INIT(X) \ -static int init_##X(struct sr_context *sr_ctx) { return init(sr_ctx, X); } +static int init_##X(struct sr_dev_driver *di, struct sr_context *sr_ctx) { \ + (void)di; return init(sr_ctx, X); } #define HW_CLEANUP(X) \ -static int cleanup_##X(void) { return cleanup(X); } +static int cleanup_##X(const struct sr_dev_driver *di) { \ + (void)di; return cleanup(X); } #define HW_SCAN(X) \ -static GSList *scan_##X(GSList *options) { return scan(options, X); } +static GSList *scan_##X(struct sr_dev_driver *di, GSList *options) { \ + (void)di; return scan(options, X); } #define HW_DEV_LIST(X) \ -static GSList *dev_list_##X(void) { return dev_list(X); } +static GSList *dev_list_##X(const struct sr_dev_driver *di) { \ + (void)di; return dev_list(X); } #define HW_DEV_CLEAR(X) \ -static int dev_clear_##X(void) { return dev_clear(X); } +static int dev_clear_##X(const struct sr_dev_driver *di) { \ + (void)di; return dev_clear(X); } #define HW_DEV_ACQUISITION_START(X) \ static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \ void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); } @@ -455,6 +451,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ }; DRV(tecpel_dmm_8061, TECPEL_DMM_8061, "tecpel-dmm-8061", "Tecpel DMM-8061") +DRV(uni_t_ut372, UNI_T_UT372, "uni-t-ut372", "UNI-T UT372") DRV(uni_t_ut60a, UNI_T_UT60A, "uni-t-ut60a", "UNI-T UT60A") DRV(uni_t_ut60e, UNI_T_UT60E, "uni-t-ut60e", "UNI-T UT60E") DRV(uni_t_ut60g, UNI_T_UT60G, "uni-t-ut60g", "UNI-T UT60G") @@ -470,6 +467,7 @@ DRV(uni_t_ut71e, UNI_T_UT71E, "uni-t-ut71e", "UNI-T UT71E") DRV(voltcraft_vc820, VOLTCRAFT_VC820, "voltcraft-vc820", "Voltcraft VC-820") DRV(voltcraft_vc830, VOLTCRAFT_VC830, "voltcraft-vc830", "Voltcraft VC-830") DRV(voltcraft_vc840, VOLTCRAFT_VC840, "voltcraft-vc840", "Voltcraft VC-840") +DRV(voltcraft_vc870, VOLTCRAFT_VC870, "voltcraft-vc870", "Voltcraft VC-870") DRV(voltcraft_vc920, VOLTCRAFT_VC920, "voltcraft-vc920", "Voltcraft VC-920") DRV(voltcraft_vc940, VOLTCRAFT_VC940, "voltcraft-vc940", "Voltcraft VC-940") DRV(voltcraft_vc960, VOLTCRAFT_VC960, "voltcraft-vc960", "Voltcraft VC-960")