brymen-dmm: Use sr_dev_inst to store connection handle.

[libsigrok.git] / hardware / brymen-dmm / protocol.c

diff --git a/hardware/brymen-dmm/protocol.c b/hardware/brymen-dmm/protocol.c
index 425697ee7bea3a8728aa07384a90512e822c2f38..4456568a110df68184eac7c37030c242c56d44ca 100644 (file)
--- a/hardware/brymen-dmm/protocol.c
+++ b/hardware/brymen-dmm/protocol.c
@@ -53,12 +53,14 @@ static void handle_new_data(struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
        int len, status, offset = 0;
+       struct sr_serial_dev_inst *serial;
 
        devc = sdi->priv;
+       serial = sdi->conn;
 
        /* Try to get as much data as the buffer can hold. */
        len = DMM_BUFSIZE - devc->buflen;
-       len = serial_read(devc->serial, devc->buf + devc->buflen, len);
+       len = serial_read(serial, devc->buf + devc->buflen, len);
        if (len < 1) {
                sr_err("Serial port read error: %d.", len);
                return;
@@ -112,6 +114,7 @@ SR_PRIV int brymen_dmm_receive_data(int fd, int revents, void *cb_data)
 {
        struct sr_dev_inst *sdi;
        struct dev_context *devc;
+       struct sr_serial_dev_inst *serial;
        int ret;
        int64_t time;
 
@@ -123,12 +126,14 @@ SR_PRIV int brymen_dmm_receive_data(int fd, int revents, void *cb_data)
        if (!(devc = sdi->priv))
                return TRUE;
 
+       serial = sdi->conn;
+
        if (revents == G_IO_IN) {
                /* Serial data arrived. */
                handle_new_data(sdi);
        } else {
                /* Timeout, send another packet request. */
-               if ((ret = brymen_packet_request(devc->serial)) < 0) {
+               if ((ret = brymen_packet_request(serial)) < 0) {
                        sr_err("Failed to request packet: %d.", ret);
                        return FALSE;
                }