Skip to content

Commit

Permalink
Staging: comedi: Remove daqboard2000_hw typedef
Browse files Browse the repository at this point in the history
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 216ed75 commit 79c7b39
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/staging/comedi/drivers/daqboard2000.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ static const struct comedi_lrange range_daqboard2000_ao = { 1, {
}
};

typedef struct daqboard2000_hw {
struct daqboard2000_hw {
volatile u16 acqControl; // 0x00
volatile u16 acqScanListFIFO; // 0x02
volatile u32 acqPacerClockDivLow; // 0x04
Expand Down Expand Up @@ -215,7 +215,7 @@ typedef struct daqboard2000_hw {
volatile u16 trigDacs; // 0xbc
volatile u16 fill14; // 0xbe
volatile s16 dioP2ExpansionIO16Bit[32]; // 0xc0
} daqboard2000_hw;
};

/* Scan Sequencer programming */
#define DAQBOARD2000_SeqStartScanList 0x0011
Expand Down Expand Up @@ -340,7 +340,7 @@ typedef struct {

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;
Expand Down Expand Up @@ -397,7 +397,7 @@ static int daqboard2000_ai_insn_read(struct comedi_device * dev, struct comedi_s
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 =
Expand Down Expand Up @@ -468,7 +468,7 @@ static int daqboard2000_ao_insn_write(struct comedi_device * dev, struct comedi_
{
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++) {
Expand Down Expand Up @@ -620,7 +620,7 @@ static void daqboard2000_adcStopDmaTransfer(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);
Expand All @@ -642,7 +642,7 @@ static void daqboard2000_adcDisarm(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
Expand Down

0 comments on commit 79c7b39

Please sign in to comment.