diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-11-20 15:10:54 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-26 15:36:41 -0800 |
| commit | 14356535fbf9d4be3c94f6afa6e46768f0e07197 (patch) | |
| tree | 03e24d1bd230bc6d1d4db30400de459cecb70690 /drivers/staging/comedi | |
| parent | 83d94bcc8e524c5dfe9443007600dfdecd81a5d9 (diff) | |
| download | op-kernel-dev-14356535fbf9d4be3c94f6afa6e46768f0e07197.zip op-kernel-dev-14356535fbf9d4be3c94f6afa6e46768f0e07197.tar.gz | |
staging: comedi: adv_pci1724: define the sync output control/status reg
Define the bits for the synchronous output control/status register and
remove the enum.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/adv_pci1724.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/adv_pci1724.c b/drivers/staging/comedi/drivers/adv_pci1724.c index 91e57c8..f4c42eb 100644 --- a/drivers/staging/comedi/drivers/adv_pci1724.c +++ b/drivers/staging/comedi/drivers/adv_pci1724.c @@ -68,16 +68,13 @@ supported PCI devices are configured as comedi devices automatically. #define PCI1724_DAC_CTRL_MODE_NORMAL (3 << 14) #define PCI1724_DAC_CTRL_MODE_MASK (3 << 14) #define PCI1724_DAC_CTRL_DATA(x) (((x) & 0x3fff) << 0) -#define PCI1724_SYNC_OUTPUT_REG 0x04 +#define PCI1724_SYNC_CTRL_REG 0x04 +#define PCI1724_SYNC_CTRL_DACSTAT (1 << 1) +#define PCI1724_SYNC_CTRL_SYN (1 << 0) #define PCI1724_EEPROM_CTRL_REG 0x08 #define PCI1724_SYNC_OUTPUT_TRIG_REG 0x0c #define PCI1724_BOARD_ID_REG 0x10 -enum sync_output_contents { - SYNC_MODE = 0x1, - DAC_BUSY = 0x2, /* dac state machine is not ready */ -}; - enum sync_output_trigger_contents { SYNC_TRIGGER_BITS = 0x0 /* any value works */ }; @@ -102,8 +99,8 @@ static int adv_pci1724_dac_idle(struct comedi_device *dev, { unsigned int status; - status = inl(dev->iobase + PCI1724_SYNC_OUTPUT_REG); - if ((status & DAC_BUSY) == 0) + status = inl(dev->iobase + PCI1724_SYNC_CTRL_REG); + if ((status & PCI1724_SYNC_CTRL_DACSTAT) == 0) return 0; return -EBUSY; } @@ -122,7 +119,7 @@ static int adv_pci1724_insn_write(struct comedi_device *dev, ctrl = PCI1724_DAC_CTRL_GX(chan) | PCI1724_DAC_CTRL_CX(chan) | mode; /* turn off synchronous mode */ - outl(0, dev->iobase + PCI1724_SYNC_OUTPUT_REG); + outl(0, dev->iobase + PCI1724_SYNC_CTRL_REG); for (i = 0; i < insn->n; ++i) { unsigned int val = data[i]; |
