From 7b0e324199f55cccf509895e4d989601eaa72914 Mon Sep 17 00:00:00 2001 From: Vijay Kumar B Date: Mon, 21 Sep 2009 11:23:54 +0530 Subject: [PATCH] --- yaml --- r: 175159 b: refs/heads/master c: 16fbf4cba0880c31445d6414abbd7a1c51466b1f h: refs/heads/master i: 175157: 7acf01bae100d750973bf70faa4c5256a0bdfe5b 175155: e1b26bdd3ee437963582adfb9359c8a2500099c3 175151: 565e4272b3b4696eb109fdb56dbb898d7c0617b4 v: v3 --- [refs] | 2 +- trunk/drivers/staging/poch/poch.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index db8a84f9e19f..cc7c34ec65b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1bc58459aa23ec4e8f1e1aa2cacae215d04a949 +refs/heads/master: 16fbf4cba0880c31445d6414abbd7a1c51466b1f diff --git a/trunk/drivers/staging/poch/poch.c b/trunk/drivers/staging/poch/poch.c index 2eb8e3d43c4d..1308c7bada8a 100644 --- a/trunk/drivers/staging/poch/poch.c +++ b/trunk/drivers/staging/poch/poch.c @@ -245,6 +245,11 @@ struct poch_dev { struct device *dev; }; +static int synth_rx; +module_param(synth_rx, bool, 0600); +MODULE_PARM_DESC(synth_rx, + "Synthesize received values using a counter. Default: No"); + static dev_t poch_first_dev; static struct class *poch_cls; static DEFINE_IDR(poch_ids); @@ -827,9 +832,11 @@ static int poch_open(struct inode *inode, struct file *filp) fpga + FPGA_TX_CTL_REG); } else { /* Flush RX FIFO and output data to cardbus. */ - iowrite32(FPGA_RX_CTL_CONT_CAP - | FPGA_RX_CTL_FIFO_FLUSH, - fpga + FPGA_RX_CTL_REG); + u32 ctl_val = FPGA_RX_CTL_CONT_CAP | FPGA_RX_CTL_FIFO_FLUSH; + if (synth_rx) + ctl_val |= FPGA_RX_CTL_SYNTH_DATA; + + iowrite32(ctl_val, fpga + FPGA_RX_CTL_REG); } atomic_inc(&channel->inited);