Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-typedef struct daqboard2000_hw {
+struct daqboard2000_hw {
volatile u16 acqControl; // 0x00
volatile u16 acqScanListFIFO; // 0x02
volatile u32 acqPacerClockDivLow; // 0x04
volatile u16 acqControl; // 0x00
volatile u16 acqScanListFIFO; // 0x02
volatile u32 acqPacerClockDivLow; // 0x04
volatile u16 trigDacs; // 0xbc
volatile u16 fill14; // 0xbe
volatile s16 dioP2ExpansionIO16Bit[32]; // 0xc0
volatile u16 trigDacs; // 0xbc
volatile u16 fill14; // 0xbe
volatile s16 dioP2ExpansionIO16Bit[32]; // 0xc0
/* Scan Sequencer programming */
#define DAQBOARD2000_SeqStartScanList 0x0011
/* Scan Sequencer programming */
#define DAQBOARD2000_SeqStartScanList 0x0011
static void writeAcqScanListEntry(struct comedi_device * dev, u16 entry)
{
static void writeAcqScanListEntry(struct comedi_device * dev, u16 entry)
{
- daqboard2000_hw *fpga = devpriv->daq;
+ struct daqboard2000_hw *fpga = devpriv->daq;
// comedi_udelay(4);
fpga->acqScanListFIFO = entry & 0x00ff;
// comedi_udelay(4);
fpga->acqScanListFIFO = entry & 0x00ff;
struct comedi_insn * insn, unsigned int * data)
{
int i;
struct comedi_insn * insn, unsigned int * data)
{
int i;
- daqboard2000_hw *fpga = devpriv->daq;
+ struct daqboard2000_hw *fpga = devpriv->daq;
int gain, chan, timeout;
fpga->acqControl =
int gain, chan, timeout;
fpga->acqControl =
{
int i;
int chan = CR_CHAN(insn->chanspec);
{
int i;
int chan = CR_CHAN(insn->chanspec);
- daqboard2000_hw *fpga = devpriv->daq;
+ struct daqboard2000_hw *fpga = devpriv->daq;
int timeout;
for (i = 0; i < insn->n; i++) {
int timeout;
for (i = 0; i < insn->n; i++) {
static void daqboard2000_adcDisarm(struct comedi_device * dev)
{
static void daqboard2000_adcDisarm(struct comedi_device * dev)
{
- daqboard2000_hw *fpga = devpriv->daq;
+ struct daqboard2000_hw *fpga = devpriv->daq;
/* Disable hardware triggers */
comedi_udelay(2);
/* Disable hardware triggers */
comedi_udelay(2);
static void daqboard2000_activateReferenceDacs(struct comedi_device * dev)
{
static void daqboard2000_activateReferenceDacs(struct comedi_device * dev)
{
- daqboard2000_hw *fpga = devpriv->daq;
+ struct daqboard2000_hw *fpga = devpriv->daq;
int timeout;
// Set the + reference dac value in the FPGA
int timeout;
// Set the + reference dac value in the FPGA