BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

link-mso19: Properly initialize the protocol trigger block

This commit is contained in:
Renato Caldas 2012-01-17 13:41:38 +00:00
parent a84671913e
commit a29360733d
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hardware/link-mso19/link-mso19.c
View File

@ -2,6 +2,7 @@
* This file is part of the sigrok project. * This file is part of the sigrok project.
* *
* Copyright (C) 2011 Daniel Ribeiro <drwyrm@gmail.com> * Copyright (C) 2011 Daniel Ribeiro <drwyrm@gmail.com>
* Copyright (C) 2012 Renato Caldas <rmsc@fe.up.pt>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -323,18 +324,20 @@ static int mso_configure_trigger(struct sr_device_instance *sdi)
ops[3] = mso_trans(4, (dso_trigger >> 8) & 0xff); ops[3] = mso_trans(4, (dso_trigger >> 8) & 0xff);
ops[4] = mso_trans(11, ops[4] = mso_trans(11,
mso->dso_trigger_width / SR_HZ_TO_NS(mso->cur_rate)); mso->dso_trigger_width / SR_HZ_TO_NS(mso->cur_rate));
ops[5] = mso_trans(REG_CTL2, (mso->ctlbase2 | BITS_CTL2_BANK(2)));
/* FIXME SPI/I2C Triggers */ /* Select the SPI/I2C trigger config bank */
ops[6] = mso_trans(0, 0); ops[5] = mso_trans(REG_CTL2, (mso->ctlbase2 | BITS_CTL2_BANK(2)));
ops[7] = mso_trans(1, 0); /* Configure the SPI/I2C protocol trigger */
ops[8] = mso_trans(2, 0); ops[6] = mso_trans(REG_PT_WORD(0), mso->protocol_trigger.word[0]);
ops[9] = mso_trans(3, 0); ops[7] = mso_trans(REG_PT_WORD(1), mso->protocol_trigger.word[1]);
ops[10] = mso_trans(4, 0xff); ops[8] = mso_trans(REG_PT_WORD(2), mso->protocol_trigger.word[2]);
ops[11] = mso_trans(5, 0xff); ops[9] = mso_trans(REG_PT_WORD(3), mso->protocol_trigger.word[3]);
ops[12] = mso_trans(6, 0xff); ops[10] = mso_trans(REG_PT_MASK(0), mso->protocol_trigger.mask[0]);
ops[13] = mso_trans(7, 0xff); ops[11] = mso_trans(REG_PT_MASK(1), mso->protocol_trigger.mask[1]);
ops[14] = mso_trans(8, mso->trigger_spimode); ops[12] = mso_trans(REG_PT_MASK(2), mso->protocol_trigger.mask[2]);
ops[13] = mso_trans(REG_PT_MASK(3), mso->protocol_trigger.mask[3]);
ops[14] = mso_trans(REG_PT_SPIMODE, mso->protocol_trigger.spimode);
/* Select the default config bank */
ops[15] = mso_trans(REG_CTL2, mso->ctlbase2); ops[15] = mso_trans(REG_CTL2, mso->ctlbase2);
return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops)); return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
@ -460,8 +463,19 @@ static int hw_init(const char *deviceinfo)
goto err_free_mso; goto err_free_mso;
} }
sprintf(hwrev, "r%d", mso->hwrev); sprintf(hwrev, "r%d", mso->hwrev);
/* hardware initial state */ /* hardware initial state */
mso->ctlbase1 = 0; mso->ctlbase1 = 0;
{
/* Initialize the protocol trigger configuration */
int i;
for (i = 0; i < 4; i++)
{
mso->protocol_trigger.word[i] = 0;
mso->protocol_trigger.mask[i] = 0xff;
}
mso->protocol_trigger.spimode = 0;
}
sdi = sr_device_instance_new(devcnt, SR_ST_INITIALIZING, sdi = sr_device_instance_new(devcnt, SR_ST_INITIALIZING,
manufacturer, product, hwrev); manufacturer, product, hwrev);

2
hardware/link-mso19/link-mso19.h
View File

@ -71,13 +71,13 @@ struct mso {
uint8_t dso_probe_attn; uint8_t dso_probe_attn;
uint8_t trigger_chan; uint8_t trigger_chan;
uint8_t trigger_slope; uint8_t trigger_slope;
uint8_t trigger_spimode;
uint8_t trigger_outsrc; uint8_t trigger_outsrc;
uint8_t trigger_state; uint8_t trigger_state;
uint8_t la_trigger; uint8_t la_trigger;
uint8_t la_trigger_mask; uint8_t la_trigger_mask;
double dso_trigger_voltage; double dso_trigger_voltage;
uint16_t dso_trigger_width; uint16_t dso_trigger_width;
struct mso_prototrig protocol_trigger;
gpointer session_id; gpointer session_id;
uint16_t buffer_n; uint16_t buffer_n;
char buffer[4096]; char buffer[4096];