* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <config.h>
#include <string.h>
#include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
#include "protocol.h"
-extern struct dmm_info udmms[];
-
/*
* Driver for various UNI-T multimeters (and rebranded ones).
*
* f1 d1 00 00 00 00 00 00 (1 data byte, 0xd1)
*/
-static void decode_packet(struct sr_dev_inst *sdi, int dmm, const uint8_t *buf,
- void *info)
+static void decode_packet(struct sr_dev_inst *sdi, const uint8_t *buf)
{
struct dev_context *devc;
+ struct dmm_info *dmm;
struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog;
float floatval;
+ void *info;
int ret;
devc = sdi->priv;
+ dmm = (struct dmm_info *)sdi->driver;
memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+ info = g_malloc(dmm->info_size);
/* Parse the protocol packet. */
- ret = udmms[dmm].packet_parse(buf, &floatval, &analog, info);
+ ret = dmm->packet_parse(buf, &floatval, &analog, info);
if (ret != SR_OK) {
sr_dbg("Invalid DMM packet, ignoring.");
+ g_free(info);
return;
}
/* If this DMM needs additional handling, call the resp. function. */
- if (udmms[dmm].dmm_details)
- udmms[dmm].dmm_details(&analog, info);
+ if (dmm->dmm_details)
+ dmm->dmm_details(&analog, info);
+
+ g_free(info);
/* Send a sample packet with one analog value. */
analog.channels = sdi->channels;
buf[7], buf[8], buf[9], buf[10], buf[11], buf[12], buf[13]);
}
-static int get_and_handle_data(struct sr_dev_inst *sdi, int dmm, void *info)
+static int get_and_handle_data(struct sr_dev_inst *sdi)
{
struct dev_context *devc;
+ struct dmm_info *dmm;
uint8_t buf[CHUNK_SIZE], *pbuf;
int i, ret, len, num_databytes_in_chunk;
struct sr_usb_dev_inst *usb;
devc = sdi->priv;
+ dmm = (struct dmm_info *)sdi->driver;
usb = sdi->conn;
pbuf = devc->protocol_buf;
/* On the first run, we need to init the HID chip. */
if (devc->first_run) {
- if ((ret = hid_chip_init(sdi, udmms[dmm].baudrate)) != SR_OK) {
+ if ((ret = hid_chip_init(sdi, dmm->baudrate)) != SR_OK) {
sr_err("HID chip init failed: %d.", ret);
return SR_ERR;
}
* Append the 1-7 data bytes of this chunk to pbuf.
*
* Special case:
- * DMMs with Cyrustek ES51922 chip need serial settings of
- * 19230/7o1. The WCH CH9325 UART to USB/HID chip used in (some
+ * DMMs with Cyrustek ES51922 chip and UT71x DMMs need serial settings
+ * of 7o1. The WCH CH9325 UART to USB/HID chip used in (some
* versions of) the UNI-T UT-D04 cable however, will also send
* the parity bit to the host in the 8-byte data chunks. This bit
* is encoded in bit 7 of each of the 1-7 data bytes and must thus
- * be removed in order for the actual ES51922 protocol parser to
- * work properly.
+ * be removed in order for the actual protocol parser to work properly.
*/
num_databytes_in_chunk = buf[0] & 0x0f;
for (i = 0; i < num_databytes_in_chunk; i++, devc->buflen++) {
pbuf[devc->buflen] = buf[1 + i];
- if (udmms[dmm].packet_parse == sr_es519xx_19200_14b_parse)
+ if ((dmm->packet_parse == sr_es519xx_19200_14b_parse) ||
+ (dmm->packet_parse == sr_ut71x_parse)) {
+ /* Mask off the parity bit. */
pbuf[devc->buflen] &= ~(1 << 7);
+ }
}
/* Now look for packets in that data. */
- while ((devc->buflen - devc->bufoffset) >= udmms[dmm].packet_size) {
- if (udmms[dmm].packet_valid(pbuf + devc->bufoffset)) {
+ while ((devc->buflen - devc->bufoffset) >= dmm->packet_size) {
+ if (dmm->packet_valid(pbuf + devc->bufoffset)) {
log_dmm_packet(pbuf + devc->bufoffset);
- decode_packet(sdi, dmm, pbuf + devc->bufoffset, info);
- devc->bufoffset += udmms[dmm].packet_size;
+ decode_packet(sdi, pbuf + devc->bufoffset);
+ devc->bufoffset += dmm->packet_size;
} else {
devc->bufoffset++;
}
return SR_OK;
}
-static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
+SR_PRIV int uni_t_dmm_receive_data(int fd, int revents, void *cb_data)
{
int ret;
struct sr_dev_inst *sdi;
sdi = cb_data;
devc = sdi->priv;
- if ((ret = get_and_handle_data(sdi, dmm, info)) != SR_OK)
+ if ((ret = get_and_handle_data(sdi)) != SR_OK)
return FALSE;
/* Abort acquisition if we acquired enough samples. */
return TRUE;
}
-
-#define RECEIVE_DATA(ID_UPPER, DMM_DRIVER) \
-SR_PRIV int receive_data_##ID_UPPER(int fd, int revents, void *cb_data) { \
- struct DMM_DRIVER##_info info; \
- return receive_data(fd, revents, ID_UPPER, &info, cb_data); }
-
-/* Driver-specific receive_data() wrappers */
-RECEIVE_DATA(TECPEL_DMM_8061, fs9721)
-RECEIVE_DATA(UNI_T_UT60A, fs9721)
-RECEIVE_DATA(UNI_T_UT60E, fs9721)
-RECEIVE_DATA(UNI_T_UT60G, es519xx)
-RECEIVE_DATA(UNI_T_UT61B, fs9922)
-RECEIVE_DATA(UNI_T_UT61C, fs9922)
-RECEIVE_DATA(UNI_T_UT61D, fs9922)
-RECEIVE_DATA(UNI_T_UT61E, es519xx)
-RECEIVE_DATA(VOLTCRAFT_VC820, fs9721)
-RECEIVE_DATA(VOLTCRAFT_VC830, fs9922)
-RECEIVE_DATA(VOLTCRAFT_VC840, fs9721)
-RECEIVE_DATA(TENMA_72_7745, es519xx)
-RECEIVE_DATA(TENMA_72_7750, es519xx)
projects / libsigrok.git / blobdiff