X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-dmm%2Fapi.c;h=e9a4417255e3f3085a8ebc9fea7e81e8e15fd7b7;hb=b2ea391147a838ea03d475add4e345d1575fdbdf;hp=6176a460ed1f5a5b5486d0d1640a257e5230dadc;hpb=d9251a2c9f1ca4380c27240ccca90c9f9ed46d3f;p=libsigrok.git
diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index 6176a460..e9a44172 100644
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -29,8 +28,11 @@ static const uint32_t scanopts[] = {
SR_CONF_CONN,
};
-static const uint32_t devopts[] = {
+static const uint32_t drvopts[] = {
SR_CONF_MULTIMETER,
+};
+
+static const uint32_t devopts[] = {
SR_CONF_CONTINUOUS,
SR_CONF_LIMIT_SAMPLES | SR_CONF_SET | SR_CONF_GET,
SR_CONF_LIMIT_MSEC | SR_CONF_SET | SR_CONF_GET,
@@ -99,29 +101,16 @@ static int dev_open(struct sr_dev_inst *sdi)
struct sr_dev_driver *di;
struct drv_context *drvc;
struct sr_usb_dev_inst *usb;
- int ret;
di = sdi->driver;
drvc = di->context;
usb = sdi->conn;
- if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) == SR_OK)
- sdi->status = SR_ST_ACTIVE;
-
- return ret;
-}
-
-static int dev_close(struct sr_dev_inst *sdi)
-{
- /* TODO */
-
- sdi->status = SR_ST_INACTIVE;
-
- return SR_OK;
+ return sr_usb_open(drvc->sr_ctx->libusb_ctx, usb);
}
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct dev_context *devc;
@@ -132,26 +121,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
return sr_sw_limits_config_set(&devc->limits, key, data);
}
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
- (void)sdi;
- (void)cg;
-
- switch (key) {
- case SR_CONF_SCAN_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
- break;
- case SR_CONF_DEVICE_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
- break;
- default:
- return SR_ERR_NA;
- }
-
- return SR_OK;
+ return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
}
static int dev_acquisition_start(const struct sr_dev_inst *sdi)
@@ -164,7 +137,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
std_session_send_df_header(sdi);
- sr_session_source_add(sdi->session, -1, 0, 10 /* poll_timeout */,
+ sr_session_source_add(sdi->session, -1, 0, 10,
uni_t_dmm_receive_data, (void *)sdi);
return SR_OK;
@@ -172,7 +145,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
- sr_dbg("Stopping acquisition.");
std_session_send_df_end(sdi);
sr_session_source_remove(sdi->session, -1);
@@ -190,11 +162,12 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
.cleanup = std_cleanup, \
.scan = scan, \
.dev_list = std_dev_list, \
+ .dev_clear = std_dev_clear, \
.config_get = NULL, \
.config_set = config_set, \
.config_list = config_list, \
.dev_open = dev_open, \
- .dev_close = dev_close, \
+ .dev_close = std_dummy_dev_close /* TODO */, \
.dev_acquisition_start = dev_acquisition_start, \
.dev_acquisition_stop = dev_acquisition_stop, \
.context = NULL, \
@@ -204,6 +177,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
}).di
SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
+ /* {{{ fs9721 */
DMM(
"tecpel-dmm-8061", fs9721,
"Tecpel", "DMM-8061", 2400,
@@ -211,13 +185,6 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_00_temp_c
),
- DMM(
- "uni-t-ut372", ut372,
- "UNI-T", "UT372", 2400,
- UT372_PACKET_SIZE,
- sr_ut372_packet_valid, sr_ut372_parse,
- NULL
- ),
DMM(
"uni-t-ut60a", fs9721,
"UNI-T", "UT60A", 2400,
@@ -232,6 +199,35 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_00_temp_c
),
+ DMM(
+ "voltcraft-vc820", fs9721,
+ "Voltcraft", "VC-820", 2400,
+ FS9721_PACKET_SIZE,
+ sr_fs9721_packet_valid, sr_fs9721_parse,
+ NULL
+ ),
+ DMM(
+ "voltcraft-vc840", fs9721,
+ "Voltcraft", "VC-840", 2400,
+ FS9721_PACKET_SIZE,
+ sr_fs9721_packet_valid, sr_fs9721_parse,
+ sr_fs9721_00_temp_c
+ ),
+ DMM(
+ "tenma-72-7745", fs9721,
+ "Tenma", "72-7745", 2400,
+ FS9721_PACKET_SIZE,
+ sr_fs9721_packet_valid, sr_fs9721_parse,
+ sr_fs9721_00_temp_c
+ ),
+ /* }}} */
+ DMM(
+ "uni-t-ut372", ut372,
+ "UNI-T", "UT372", 2400,
+ UT372_PACKET_SIZE,
+ sr_ut372_packet_valid, sr_ut372_parse,
+ NULL
+ ),
DMM(
"uni-t-ut60g", es519xx,
/* The baudrate is actually 19230, see "Note 1" below. */
@@ -295,11 +291,9 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
sr_ut71x_packet_valid, sr_ut71x_parse, NULL
),
DMM(
- "voltcraft-vc820", fs9721,
- "Voltcraft", "VC-820", 2400,
- FS9721_PACKET_SIZE,
- sr_fs9721_packet_valid, sr_fs9721_parse,
- NULL
+ "uni-t-ut804", ut71x,
+ "UNI-T", "UT804", 2400, UT71X_PACKET_SIZE,
+ sr_ut71x_packet_valid, sr_ut71x_parse, NULL
),
DMM(
"voltcraft-vc830", fs9922,
@@ -313,13 +307,6 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
sr_fs9922_packet_valid, sr_fs9922_parse,
&sr_fs9922_z1_diode
),
- DMM(
- "voltcraft-vc840", fs9721,
- "Voltcraft", "VC-840", 2400,
- FS9721_PACKET_SIZE,
- sr_fs9721_packet_valid, sr_fs9721_parse,
- sr_fs9721_00_temp_c
- ),
DMM(
"voltcraft-vc870", vc870,
"Voltcraft", "VC-870", 9600, VC870_PACKET_SIZE,
@@ -358,13 +345,6 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
UT71X_PACKET_SIZE,
sr_ut71x_packet_valid, sr_ut71x_parse, NULL
),
- DMM(
- "tenma-72-7745", es519xx,
- "Tenma", "72-7745", 2400,
- FS9721_PACKET_SIZE,
- sr_fs9721_packet_valid, sr_fs9721_parse,
- sr_fs9721_00_temp_c
- ),
DMM(
"tenma-72-7750", es519xx,
/* The baudrate is actually 19230, see "Note 1" below. */