* 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>
#include "protocol.h"
SR_PRIV const struct cv_profile cv_profiles[] = {
{ CHRONOVU_LA8, "LA8", "ChronoVu LA8", 8, SR_MHZ(100), 2, 0.8388608 },
{ CHRONOVU_LA16, "LA16", "ChronoVu LA16", 16, SR_MHZ(200), 4, 0.042 },
- { 0, NULL, NULL, 0, 0, 0, 0.0 },
+ ALL_ZERO
};
/* LA8: channels are numbered 0-7. LA16: channels are numbered 0-15. */
sr_dbg("Purging buffers, resetting+closing FTDI device.");
/* Log errors, but ignore them (i.e., don't abort). */
- if ((ret = ftdi_usb_purge_buffers(devc->ftdic)) < 0)
+ if ((ret = PURGE_FTDI_BOTH(devc->ftdic)) < 0)
sr_err("Failed to purge FTDI buffers (%d): %s.",
ret, ftdi_get_error_string(devc->ftdic));
if ((ret = ftdi_usb_reset(devc->ftdic)) < 0)
|| match->match == SR_TRIGGER_RISING)
devc->trigger_pattern |= channel_bit;
+ /* LA8 and LA16 support state triggering. */
+ if (match->match == SR_TRIGGER_ONE
+ || match->match == SR_TRIGGER_ZERO)
+ devc->trigger_mask |= channel_bit;
+
/* LA16 (but not LA8) supports edge triggering. */
if ((devc->prof->model == CHRONOVU_LA16)) {
if (match->match == SR_TRIGGER_RISING
} while ((devc->done > now) && (bytes_read == 0));
}
- /* Check if block read was successful or a timeout occured. */
+ /* Check if block read was successful or a timeout occurred. */
if (bytes_read != BS) {
sr_err("Trigger timed out. Bytes read: %d.", bytes_read);
(void) reset_device(devc); /* Ignore errors. */
return SR_OK;
}
-SR_PRIV void cv_send_block_to_session_bus(struct dev_context *devc, int block)
+SR_PRIV void cv_send_block_to_session_bus(const struct sr_dev_inst *sdi, int block)
{
int i, idx;
uint8_t sample, expected_sample, tmp8;
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
int trigger_point; /* Relative trigger point (in this block). */
+ struct dev_context *devc;
/* Note: Caller ensures devc/devc->ftdic != NULL and block > 0. */
+ devc = sdi->priv;
+
/* TODO: Implement/test proper trigger support for the LA16. */
/* Check if we can find the trigger condition in this block. */
logic.length = BS;
logic.unitsize = devc->prof->num_channels / 8;
logic.data = devc->final_buf + (block * BS);
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
return;
}
logic.length = trigger_point;
logic.unitsize = devc->prof->num_channels / 8;
logic.data = devc->final_buf + (block * BS);
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
}
/* Send the SR_DF_TRIGGER packet to the session bus. */
sr_spew("Sending SR_DF_TRIGGER packet, sample = %d.",
(block * BS) + trigger_point);
- packet.type = SR_DF_TRIGGER;
- packet.payload = NULL;
- sr_session_send(devc->cb_data, &packet);
+ std_session_send_df_trigger(sdi);
/* If at least one sample is located after the trigger... */
if (trigger_point < (BS - 1)) {
logic.length = BS - trigger_point;
logic.unitsize = devc->prof->num_channels / 8;
logic.data = devc->final_buf + (block * BS) + trigger_point;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
}
}