Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 354063
b: refs/heads/master
c: 1d967a0
h: refs/heads/master
i:
  354061: eae37f1
  354059: 33db63b
  354055: 1c47c35
  354047: da6a08e
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jan 18, 2013
1 parent 7bba120 commit f86fbce
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 39 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aad474484174022ced3fd5b0df5d43f78fa39be6
refs/heads/master: 1d967a0356765cbef8351418613da83bb3d0d85a
48 changes: 17 additions & 31 deletions trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ static int apci2200_di_insn_bits(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
struct addi_private *devpriv = dev->private;

data[1] = inw(devpriv->iobase + APCI2200_DIGITAL_IP);
data[1] = inw(dev->iobase + APCI2200_DIGITAL_IP);

return insn->n;
}
Expand All @@ -77,16 +75,15 @@ static int apci2200_do_insn_bits(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
struct addi_private *devpriv = dev->private;
unsigned int mask = data[0];
unsigned int bits = data[1];

s->state = inw(devpriv->iobase + APCI2200_DIGITAL_OP);
s->state = inw(dev->iobase + APCI2200_DIGITAL_OP);
if (mask) {
s->state &= ~mask;
s->state |= (bits & mask);

outw(s->state, devpriv->iobase + APCI2200_DIGITAL_OP);
outw(s->state, dev->iobase + APCI2200_DIGITAL_OP);
}

data[1] = s->state;
Expand Down Expand Up @@ -120,21 +117,16 @@ static int i_APCI2200_ConfigWatchdog(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
struct addi_private *devpriv = dev->private;

if (data[0] == 0) {
/* Disable the watchdog */
outw(0x0,
devpriv->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_ENABLEDISABLE);
outw(0x0, dev->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_ENABLEDISABLE);
/* Loading the Reload value */
outw(data[1],
devpriv->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_RELOAD_VALUE);
outw(data[1], dev->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_RELOAD_VALUE);
data[1] = data[1] >> 16;
outw(data[1],
devpriv->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_RELOAD_VALUE + 2);
outw(data[1], dev->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_RELOAD_VALUE + 2);
} /* if(data[0]==0) */
else {
printk("\nThe input parameters are wrong\n");
Expand Down Expand Up @@ -170,21 +162,18 @@ static int i_APCI2200_StartStopWriteWatchdog(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
struct addi_private *devpriv = dev->private;

switch (data[0]) {
case 0: /* stop the watchdog */
outw(0x0, devpriv->iobase + APCI2200_WATCHDOG + APCI2200_WATCHDOG_ENABLEDISABLE); /* disable the watchdog */
outw(0x0, dev->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_ENABLEDISABLE);
break;
case 1: /* start the watchdog */
outw(0x0001,
devpriv->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_ENABLEDISABLE);
outw(0x0001, dev->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_ENABLEDISABLE);
break;
case 2: /* Software trigger */
outw(0x0201,
devpriv->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_ENABLEDISABLE);
outw(0x0201, dev->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_ENABLEDISABLE);
break;
default:
printk("\nSpecified functionality does not exist\n");
Expand Down Expand Up @@ -219,10 +208,7 @@ static int i_APCI2200_ReadWatchdog(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
struct addi_private *devpriv = dev->private;

data[0] =
inw(devpriv->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_STATUS) & 0x1;
data[0] = inw(dev->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_STATUS) & 0x1;
return insn->n;
}
11 changes: 4 additions & 7 deletions trunk/drivers/staging/comedi/drivers/addi_apci_2200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,12 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d)

static int apci2200_reset(struct comedi_device *dev)
{
struct addi_private *devpriv = dev->private;

outw(0x0, devpriv->iobase + APCI2200_DIGITAL_OP);
outw(0x0, devpriv->iobase + APCI2200_WATCHDOG +
outw(0x0, dev->iobase + APCI2200_DIGITAL_OP);
outw(0x0, dev->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_ENABLEDISABLE);
outw(0x0, devpriv->iobase + APCI2200_WATCHDOG +
outw(0x0, dev->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_RELOAD_VALUE);
outw(0x0, devpriv->iobase + APCI2200_WATCHDOG +
outw(0x0, dev->iobase + APCI2200_WATCHDOG +
APCI2200_WATCHDOG_RELOAD_VALUE + 2);

return 0;
Expand Down Expand Up @@ -87,7 +85,6 @@ static int apci2200_auto_attach(struct comedi_device *dev,
return ret;

dev->iobase = pci_resource_start(pcidev, 1);
devpriv->iobase = dev->iobase;
devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0);
devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2);
devpriv->i_IobaseReserved = pci_resource_start(pcidev, 3);
Expand Down

0 comments on commit f86fbce

Please sign in to comment.