X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-dmm%2Fprotocol.c;h=bd231160fee51633708e60bcbf64159fc296c98d;hb=d7a4dad881bf78ce17519d3d7728f74d0ec11415;hp=a6a8c7156cd702580489af5d55dc65652a5254b1;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git
diff --git a/src/hardware/uni-t-dmm/protocol.c b/src/hardware/uni-t-dmm/protocol.c
index a6a8c715..bd231160 100644
--- a/src/hardware/uni-t-dmm/protocol.c
+++ b/src/hardware/uni-t-dmm/protocol.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
@@ -58,13 +57,17 @@ static void decode_packet(struct sr_dev_inst *sdi, const uint8_t *buf)
struct dmm_info *dmm;
struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
float floatval;
void *info;
int ret;
devc = sdi->priv;
dmm = (struct dmm_info *)sdi->driver;
- memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+ /* Note: digits/spec_digits will be overridden by the DMM parsers. */
+ sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
info = g_malloc(dmm->info_size);
/* Parse the protocol packet. */
@@ -82,15 +85,14 @@ static void decode_packet(struct sr_dev_inst *sdi, const uint8_t *buf)
g_free(info);
/* Send a sample packet with one analog value. */
- analog.channels = sdi->channels;
+ analog.meaning->channels = sdi->channels;
analog.num_samples = 1;
analog.data = &floatval;
packet.type = SR_DF_ANALOG;
packet.payload = &analog;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
- /* Increase sample count. */
- devc->num_samples++;
+ sr_sw_limits_update_samples_read(&devc->limits, 1);
}
static int hid_chip_init(struct sr_dev_inst *sdi, uint16_t baudrate)
@@ -100,8 +102,7 @@ static int hid_chip_init(struct sr_dev_inst *sdi, uint16_t baudrate)
struct sr_usb_dev_inst *usb;
usb = sdi->conn;
-
- /* Detach kernel drivers which grabbed this device (if any). */
+
if (libusb_kernel_driver_active(usb->devhdl, 0) == 1) {
ret = libusb_detach_kernel_driver(usb->devhdl, 0);
if (ret < 0) {
@@ -109,18 +110,13 @@ static int hid_chip_init(struct sr_dev_inst *sdi, uint16_t baudrate)
libusb_error_name(ret));
return SR_ERR;
}
- sr_dbg("Successfully detached kernel driver.");
- } else {
- sr_dbg("No need to detach a kernel driver.");
}
- /* Claim interface 0. */
if ((ret = libusb_claim_interface(usb->devhdl, 0)) < 0) {
sr_err("Failed to claim interface 0: %s.",
libusb_error_name(ret));
return SR_ERR;
}
- sr_dbg("Successfully claimed interface 0.");
/* Set data for the HID feature report (e.g. baudrate). */
buf[0] = baudrate & 0xff; /* Baudrate, LSB */
@@ -156,8 +152,6 @@ static int hid_chip_init(struct sr_dev_inst *sdi, uint16_t baudrate)
return SR_ERR;
}
- sr_dbg("Successfully sent initial HID feature report.");
-
return SR_OK;
}
@@ -170,10 +164,11 @@ static void log_8byte_chunk(const uint8_t *buf)
static void log_dmm_packet(const uint8_t *buf)
{
- sr_dbg("DMM packet: %02x %02x %02x %02x %02x %02x %02x"
- " %02x %02x %02x %02x %02x %02x %02x",
- buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6],
- buf[7], buf[8], buf[9], buf[10], buf[11], buf[12], buf[13]);
+ GString *text;
+
+ text = sr_hexdump_new(buf, 14);
+ sr_dbg("DMM packet: %s", text->str);
+ sr_hexdump_free(text);
}
static int get_and_handle_data(struct sr_dev_inst *sdi)
@@ -244,6 +239,8 @@ static int get_and_handle_data(struct sr_dev_inst *sdi)
for (i = 0; i < num_databytes_in_chunk; i++, devc->buflen++) {
pbuf[devc->buflen] = buf[1 + i];
if ((dmm->packet_parse == sr_es519xx_19200_14b_parse) ||
+ (dmm->packet_parse == sr_es519xx_19200_11b_parse) ||
+ (dmm->packet_parse == sr_es519xx_2400_11b_parse) ||
(dmm->packet_parse == sr_ut71x_parse)) {
/* Mask off the parity bit. */
pbuf[devc->buflen] &= ~(1 << 7);
@@ -262,8 +259,8 @@ static int get_and_handle_data(struct sr_dev_inst *sdi)
}
/* Move remaining bytes to beginning of buffer. */
- for (i = 0; i < devc->buflen - devc->bufoffset; i++)
- pbuf[i] = pbuf[devc->bufoffset + i];
+ if (devc->bufoffset < devc->buflen)
+ memmove(pbuf, pbuf + devc->bufoffset, devc->buflen - devc->bufoffset);
devc->buflen -= devc->bufoffset;
return SR_OK;
@@ -274,7 +271,6 @@ SR_PRIV int uni_t_dmm_receive_data(int fd, int revents, void *cb_data)
int ret;
struct sr_dev_inst *sdi;
struct dev_context *devc;
- int64_t time_ms;
(void)fd;
(void)revents;
@@ -286,19 +282,8 @@ SR_PRIV int uni_t_dmm_receive_data(int fd, int revents, void *cb_data)
return FALSE;
/* Abort acquisition if we acquired enough samples. */
- if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
- sr_info("Requested number of samples reached.");
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- }
-
- if (devc->limit_msec) {
- time_ms = (g_get_monotonic_time() - devc->starttime) / 1000;
- if (time_ms > (int64_t)devc->limit_msec) {
- sr_info("Requested time limit reached.");
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- return TRUE;
- }
- }
+ if (sr_sw_limits_check(&devc->limits))
+ sr_dev_acquisition_stop(sdi);
return TRUE;
}