X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=gpif-acquisition.c;h=7d3dcb6d59d8c1c69048ce7b3efbca98d80e5d21;hb=65b34f7ea6d5f250a09c878d929e5c5312093e54;hp=dbf740366f1a31d7003984ba2adaae653eb2983a;hpb=b93872aadb4d9aa576b9ce8d56dd2d0d8f953230;p=sigrok-firmware-fx2lafw.git
diff --git a/gpif-acquisition.c b/gpif-acquisition.c
index dbf74036..7d3dcb6d 100644
--- a/gpif-acquisition.c
+++ b/gpif-acquisition.c
@@ -15,8 +15,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 .
*/
#include
@@ -46,10 +45,7 @@ static void gpif_setup_registers(void)
/* TODO. Value probably irrelevant, as we don't use RDY* signals? */
GPIFREADYCFG = 0;
- /*
- * Set TRICTL = 0, thus CTL0-CTL5 are CMOS outputs.
- * TODO: Probably irrelevant, as we don't use CTL0-CTL5?
- */
+ /* Set TRICTL = 0, thus CTL0-CTL5 are CMOS outputs. */
GPIFCTLCFG = 0;
/* When GPIF is idle, tri-state the data bus. */
@@ -196,11 +192,10 @@ bool gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
while (!(GPIFTRIG & 0x80));
/* Configure the EP2 FIFO. */
- if (cmd->flags & CMD_START_FLAGS_SAMPLE_16BIT) {
+ if (cmd->flags & CMD_START_FLAGS_SAMPLE_16BIT)
EP2FIFOCFG = bmAUTOIN | bmWORDWIDE;
- } else {
+ else
EP2FIFOCFG = bmAUTOIN;
- }
SYNCDELAY();
/* Set IFCONFIG to the correct clock source. */
@@ -212,7 +207,7 @@ bool gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
bmGSTATE | bmIFGPIF;
}
- /* Populate delay states */
+ /* Populate delay states. */
if ((cmd->sample_delay_h == 0 && cmd->sample_delay_l == 0) ||
cmd->sample_delay_h >= 6)
return false;
@@ -220,8 +215,7 @@ bool gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
if (cmd->flags & CMD_START_FLAGS_CLK_CTL2) {
uint8_t delay_1, delay_2 = cmd->sample_delay_l;
- /* We need a pulse where the CTL1 and CTL2 pins
- * alternate states */
+ /* We need a pulse where the CTL1/2 pins alternate states. */
if (cmd->sample_delay_h) {
for (i = 0; i < cmd->sample_delay_h; i++)
gpif_make_delay_state(pSTATE++, 0, 0x06);
@@ -231,8 +225,7 @@ bool gpif_acquisition_start(const struct cmd_start_acquisition *cmd)
gpif_make_delay_state(pSTATE++, delay_1, 0x06);
}
- /* cmd->sample_delay_l is always non-zero for the
- * supported rates */
+ /* sample_delay_l is always != 0 for the supported rates. */
gpif_make_delay_state(pSTATE++, delay_2, 0x00);
} else {
for (i = 0; i < cmd->sample_delay_h; i++)