X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-dmm%2Fprotocol.c;h=4114aec4d831954ccc5d4f705112088a740a764d;hb=91057d2fc24c0ca058aa08c8ea6ada4eadf05ffd;hp=15cdb0c234660548e714fc2e0b343fdf41845297;hpb=dff60e3ccc5da17a0156d3072a0558732c4be94e;p=libsigrok.git
diff --git a/src/hardware/uni-t-dmm/protocol.c b/src/hardware/uni-t-dmm/protocol.c
index 15cdb0c2..4114aec4 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
@@ -67,6 +66,7 @@ static void decode_packet(struct sr_dev_inst *sdi, const uint8_t *buf)
devc = sdi->priv;
dmm = (struct dmm_info *)sdi->driver;
+ /* 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);
@@ -102,7 +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);
@@ -111,9 +111,6 @@ 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. */
@@ -122,7 +119,6 @@ static int hid_chip_init(struct sr_dev_inst *sdi, uint16_t baudrate)
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 */
@@ -158,8 +154,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;
}
@@ -246,6 +240,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);
@@ -288,7 +284,7 @@ SR_PRIV int uni_t_dmm_receive_data(int fd, int revents, void *cb_data)
/* Abort acquisition if we acquired enough samples. */
if (sr_sw_limits_check(&devc->limits))
- sdi->driver->dev_acquisition_stop(sdi);
+ sr_dev_acquisition_stop(sdi);
return TRUE;
}