Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325423
b: refs/heads/master
c: 1403e79
h: refs/heads/master
i:
  325421: 6f619ad
  325419: 3957f8a
  325415: 5ba4786
  325407: 4808c63
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 19, 2012
1 parent 311dbd8 commit 7dbc663
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1387d4b7f05db3d3cf156861f7c942b1031df51b
refs/heads/master: 1403e797573bc9929d2a5f055dd7dba9184c47c9
19 changes: 0 additions & 19 deletions trunk/drivers/staging/comedi/drivers/daqboard2000.c
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,6 @@ static void setup_sampling(struct comedi_device *dev, int chan, int gain)
/* These should be read from EEPROM */
word2 |= 0x0800;
word3 |= 0xc000;
/* printk("%d %4.4x %4.4x %4.4x %4.4x\n", chan, word0, word1, word2, word3);*/
writeAcqScanListEntry(dev, word0);
writeAcqScanListEntry(dev, word1);
writeAcqScanListEntry(dev, word2);
Expand Down Expand Up @@ -607,7 +606,6 @@ static int daqboard2000_upload_firmware(struct comedi_device *dev)

static void daqboard2000_adcStopDmaTransfer(struct comedi_device *dev)
{
/* printk("Implement: daqboard2000_adcStopDmaTransfer\n");*/
}

static void daqboard2000_adcDisarm(struct comedi_device *dev)
Expand Down Expand Up @@ -648,7 +646,6 @@ static void daqboard2000_activateReferenceDacs(struct comedi_device *dev)
break;
udelay(2);
}
/* printk("DAQBOARD2000_PosRefDacSelect %d\n", timeout);*/

/* Set the - reference dac value in the FPGA */
writew(0x80 | DAQBOARD2000_NegRefDacSelect, devpriv->daq + refDacs);
Expand All @@ -658,22 +655,18 @@ static void daqboard2000_activateReferenceDacs(struct comedi_device *dev)
break;
udelay(2);
}
/* printk("DAQBOARD2000_NegRefDacSelect %d\n", timeout);*/
}

static void daqboard2000_initializeCtrs(struct comedi_device *dev)
{
/* printk("Implement: daqboard2000_initializeCtrs\n");*/
}

static void daqboard2000_initializeTmrs(struct comedi_device *dev)
{
/* printk("Implement: daqboard2000_initializeTmrs\n");*/
}

static void daqboard2000_dacDisarm(struct comedi_device *dev)
{
/* printk("Implement: daqboard2000_dacDisarm\n");*/
}

static void daqboard2000_initializeAdc(struct comedi_device *dev)
Expand Down Expand Up @@ -768,24 +761,12 @@ static int daqboard2000_attach_pci(struct comedi_device *dev,

readl(devpriv->plx + 0x6c);

/*
u8 interrupt;
Windows code does restore interrupts, but since we don't use them...
pci_read_config_byte(pcidev, PCI_INTERRUPT_LINE, &interrupt);
printk("Interrupt before is: %x\n", interrupt);
*/

result = daqboard2000_upload_firmware(dev);
if (result < 0)
return result;

daqboard2000_initializeAdc(dev);
daqboard2000_initializeDac(dev);
/*
Windows code does restore interrupts, but since we don't use them...
pci_read_config_byte(pcidev, PCI_INTERRUPT_LINE, &interrupt);
printk("Interrupt after is: %x\n", interrupt);
*/

s = &dev->subdevices[0];
/* ai subdevice */
Expand Down

0 comments on commit 7dbc663

Please sign in to comment.