Skip to content

F
FMC DIO 5ch TTL a
Commit 17cdfaf7 authored by Jorge Machado's avatar Jorge Machado
Browse files
Options

Software WR-starting-kit changes associated with GW review

parent 1f1c7a22
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
sw/kernel/fmc-dio-internal.c
View file @ 17cdfaf7
...@@ -85,7 +85,7 @@ static void __fmc_dio_int_new_pulse(struct fmc_dio *dev, int ch, ...@@ -85,7 +85,7 @@ static void __fmc_dio_int_new_pulse(struct fmc_dio *dev, int ch,
map = get_regmap(dev->version); map = get_regmap(dev->version);
map += ch; map += ch;
fmc_dio_int_ts_sub(ts, 8); /* 1 cycle, to account for output latencies */ fmc_dio_int_ts_sub(ts, 16); /* 2 cycles, to account for output latencies */
writel(ts->tv_nsec / 8, base + map->cycle); writel(ts->tv_nsec / 8, base + map->cycle);
writel(GET_HI32(ts->tv_sec), base + map->trig_h); writel(GET_HI32(ts->tv_sec), base + map->trig_h);
writel(ts->tv_sec, base + map->trig_l); writel(ts->tv_sec, base + map->trig_l);
...@@ -541,8 +541,9 @@ irqreturn_t fmc_dio_int_interrupt(struct fmc_dio *dev) ...@@ -541,8 +541,9 @@ irqreturn_t fmc_dio_int_interrupt(struct fmc_dio *dev)
SET_HI32(ts->tv_sec, readl(base + map->fifo_tai_h)); SET_HI32(ts->tv_sec, readl(base + map->fifo_tai_h));
ts->tv_sec |= readl(base + map->fifo_tai_l); ts->tv_sec |= readl(base + map->fifo_tai_l);
ts->tv_nsec = 8 * readl(base + map->fifo_cycle); ts->tv_nsec = 8 * readl(base + map->fifo_cycle);
/* subtract 5 cycles lost in input sync circuits */
fmc_dio_int_ts_sub(ts, 40); /* subtract 4 cycles lost in input sync circuits */
fmc_dio_int_ts_sub(ts, 32);
} }
writel(chm, base + dio.eic_isr_reg); /* ack */ writel(chm, base + dio.eic_isr_reg); /* ack */
......
sw/tools/wr-dio-cmd.c
View file @ 17cdfaf7
...@@ -329,7 +329,6 @@ static int scan_irq(int argc, char **argv) ...@@ -329,7 +329,6 @@ static int scan_irq(int argc, char **argv)
} else { } else {
char *s2 = argv[1]; char *s2 = argv[1];
fprintf(stderr,"IRQ Relative time\n");
if (s2[0] == '+') { if (s2[0] == '+') {
cmd->flags |= WR_DIO_F_REL; cmd->flags |= WR_DIO_F_REL;
s2++; s2++;
...@@ -351,7 +350,6 @@ static int scan_irq(int argc, char **argv) ...@@ -351,7 +350,6 @@ static int scan_irq(int argc, char **argv)
prgname, argv[0], argv[1]); prgname, argv[0], argv[1]);
return -1; return -1;
} }
fprintf(stderr, "%lu \n", cmd->t[1].tv_nsec);
if(cmd->t[1].tv_nsec < 1000000) if(cmd->t[1].tv_nsec < 1000000)
{ {
fprintf(stderr, "%s: %s: Frequency is greater than 1 kHz \n", fprintf(stderr, "%s: %s: Frequency is greater than 1 kHz \n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment