Add sr_dev_acquisition_stop(), factor out SR_ERR_DEV_CLOSED check.

[libsigrok.git] / src / hardware / uni-t-dmm / protocol.c

diff --git a/src/hardware/uni-t-dmm/protocol.c b/src/hardware/uni-t-dmm/protocol.c
index f0b3997695a9591f8bf3913f1833124e50f0ecf9..6dc8980e7f07aa935003d6adb21ec052be1cdc45 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -57,14 +56,18 @@ 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_old analog;
+       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_old));
+       /* 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,10 +85,10 @@ 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_OLD;
+       packet.type = SR_DF_ANALOG;
        packet.payload = &analog;
        sr_session_send(sdi, &packet);
 
@@ -99,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);
@@ -243,6 +246,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);
@@ -285,7 +290,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;
 }