demo: Mask out logic data for disabled channels in datafeed packets

[libsigrok.git] / src / hardware / link-mso19 / protocol.c

diff --git a/src/hardware/link-mso19/protocol.c b/src/hardware/link-mso19/protocol.c
index ae4d16153187a88a473dec1f855226dd7ce56d34..29aacbdab0642b33b32df487f343df5b4cf9aa53 100644 (file)
--- a/src/hardware/link-mso19/protocol.c
+++ b/src/hardware/link-mso19/protocol.c
@@ -100,7 +100,7 @@ SR_PRIV int mso_configure_trigger(const struct sr_dev_inst *sdi)
                trigger_config |= 0x20; //DSO level trigger & width < trigger_width
                break;
        case 2:
-               trigger_config |= 0x40; //DSO level trigger & width >= trigger_width 
+               trigger_config |= 0x40; //DSO level trigger & width >= trigger_width
                break;
        case 3:
                trigger_config |= 0x60; //LA combination trigger
@@ -289,7 +289,7 @@ SR_PRIV void stop_acquisition(const struct sr_dev_inst *sdi)
        devc = sdi->priv;
        serial_source_remove(sdi->session, devc->serial);
 
-       std_session_send_df_end(sdi, LOG_PREFIX);
+       std_session_send_df_end(sdi);
 }
 
 SR_PRIV int mso_clkrate_out(struct sr_serial_dev_inst *serial, uint16_t val)
@@ -349,25 +349,10 @@ SR_PRIV int mso_receive_data(int fd, int revents, void *cb_data)
 {
        struct sr_datafeed_packet packet;
        struct sr_datafeed_logic logic;
-       struct sr_dev_inst *sdi;
-       GSList *l;
+       struct sr_dev_inst *sdi = cb_data;
+       struct dev_context *devc = sdi->priv;
        int i;
 
-       struct drv_context *drvc = di->context;
-
-       /* Find this device's devc struct by its fd. */
-       struct dev_context *devc = NULL;
-       for (l = drvc->instances; l; l = l->next) {
-               sdi = l->data;
-               devc = sdi->priv;
-               if (devc->serial->fd == fd)
-                       break;
-               devc = NULL;
-       }
-       if (!devc)
-               /* Shouldn't happen. */
-               return TRUE;
-
        (void)revents;
 
        uint8_t in[1024];