Skip to content

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

Add flags argument in get_hw_ts_from_fmc_dio_device. 

Delete WR_DIO_F_WAIT flag when flushing FIFOs
parent fc47a42b
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
sw/irq-demo/dep/fmc-dio-device-private.h
View file @ 91bc15aa
......@@ -45,7 +45,7 @@ static int setup_fmc_dio_device_hw_irq(fmc_dio_device dev,
long count);
static int get_hw_ts_from_fmc_dio_device(fmc_dio_device dev, int ch,
struct usr_timestamp **ts, unsigned int *nts);
struct usr_timestamp **ts, unsigned int *nts, int flags);
static int get_kernel_leaps_info(fmc_dio_device dev);
static void log_msg(fmc_dio_device dev, const char *msg);
......
sw/irq-demo/dep/fmc-dio-device.c
View file @ 91bc15aa
......@@ -222,7 +222,7 @@ int get_tai_ts_from_fmc_dio_device(fmc_dio_device dev, int ch,
if(check_fmc_dio_device(dev))
return -EINVAL;
return get_hw_ts_from_fmc_dio_device(dev, ch, ts, nts);
return get_hw_ts_from_fmc_dio_device(dev, ch, ts, nts, WR_DIO_F_WAIT);
}
int get_utc_ts_from_fmc_dio_device(fmc_dio_device dev, int ch,
......@@ -257,15 +257,15 @@ int get_utc_ts_from_fmc_dio_device(fmc_dio_device dev, int ch,
}
static int get_hw_ts_from_fmc_dio_device(fmc_dio_device dev, int ch,
struct usr_timestamp **ts, unsigned int *nts)
struct usr_timestamp **ts, unsigned int *nts, int flags)
{
struct wr_dio_cmd *c = &dev->cmd;
int ret;
c->command = WR_DIO_CMD_STAMP;
c->flags = WR_DIO_F_WAIT;
c->flags = flags;
c->channel = ch;
ret = ioctl(dev->fd, PRIV_MEZZANINE_CMD, (unsigned long) c);
if(ret < 0) {
return ret;
......@@ -303,7 +303,7 @@ void flush_fmc_dio_device_channel(fmc_dio_device dev, int ch)
LOG(dev, "Flushing FMC DIO device, channel %d... ", ch);
sleep(FMC_DIO_FLUSH_SLEEP);
ret = get_hw_ts_from_fmc_dio_device(dev, ch, &ts, &nts);
ret = get_hw_ts_from_fmc_dio_device(dev, ch, &ts, &nts, 0);
if(ret == 0) {
free(ts);
}
......
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