Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 325183
b: refs/heads/master
c: 8888666
h: refs/heads/master
i:
  325181: 6e7d37d
  325179: 966ccc6
  325175: fd29619
  325167: 5ae66a5
  325151: ee40a1f
  325119: 4aef51d
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 11, 2012
1 parent 8ed3685 commit 7d653ab
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 127 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: 554e02c92468dc4958a528a953e590fd3ccd8f84
refs/heads/master: 888866625c089f949d810639d62d85ab3d276c05
129 changes: 3 additions & 126 deletions trunk/drivers/staging/comedi/drivers/icp_multi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ There are 4 x 12-bit Analogue Outputs. Ranges : 5V, 10V, +/-5V, +/-10V

#define PCI_DEVICE_ID_ICP_MULTI 0x8000

#define ICP_MULTI_EXTDEBUG

/* Hardware types of the cards */
#define TYPE_ICP_MULTI 0

Expand Down Expand Up @@ -194,10 +192,6 @@ static void setup_channel_list(struct comedi_device *dev,
unsigned int i, range, chanprog;
unsigned int diff;

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG
"icp multi EDBG: setup_channel_list(...,%d)\n", n_chan);
#endif
devpriv->act_chanlist_len = n_chan;
devpriv->act_chanlist_pos = 0;

Expand Down Expand Up @@ -235,14 +229,7 @@ static void setup_channel_list(struct comedi_device *dev,
/* Output channel, range, mode to ICP Multi */
writew(devpriv->AdcCmdStatus,
devpriv->io_addr + ICP_MULTI_ADC_CSR);

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG
"GS: %2d. [%4x]=%4x %4x\n", i, chanprog, range,
devpriv->act_chanlist[i]);
#endif
}

}

/*
Expand All @@ -269,9 +256,6 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev,
{
int n, timeout;

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG "icp multi EDBG: BGN: icp_multi_insn_read_ai(...)\n");
#endif
/* Disable A/D conversion ready interrupt */
devpriv->IntEnable &= ~ADC_READY;
writew(devpriv->IntEnable, devpriv->io_addr + ICP_MULTI_INT_EN);
Expand All @@ -283,47 +267,22 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev,
/* Set up appropriate channel, mode and range data, for specified ch */
setup_channel_list(dev, s, &insn->chanspec, 1);

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG "icp_multi A ST=%4x IO=%p\n",
readw(devpriv->io_addr + ICP_MULTI_ADC_CSR),
devpriv->io_addr + ICP_MULTI_ADC_CSR);
#endif

for (n = 0; n < insn->n; n++) {
/* Set start ADC bit */
devpriv->AdcCmdStatus |= ADC_ST;
writew(devpriv->AdcCmdStatus,
devpriv->io_addr + ICP_MULTI_ADC_CSR);
devpriv->AdcCmdStatus &= ~ADC_ST;

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG "icp multi B n=%d ST=%4x\n", n,
readw(devpriv->io_addr + ICP_MULTI_ADC_CSR));
#endif

udelay(1);

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG "icp multi C n=%d ST=%4x\n", n,
readw(devpriv->io_addr + ICP_MULTI_ADC_CSR));
#endif

/* Wait for conversion to complete, or get fed up waiting */
timeout = 100;
while (timeout--) {
if (!(readw(devpriv->io_addr +
ICP_MULTI_ADC_CSR) & ADC_BSY))
goto conv_finish;

#ifdef ICP_MULTI_EXTDEBUG
if (!(timeout % 10))
printk(KERN_DEBUG
"icp multi D n=%d tm=%d ST=%4x\n", n,
timeout,
readw(devpriv->io_addr +
ICP_MULTI_ADC_CSR));
#endif

udelay(1);
}

Expand All @@ -342,11 +301,6 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev,
/* Clear data received */
data[n] = 0;

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG
"icp multi EDBG: END: icp_multi_insn_read_ai(...) n=%d\n",
n);
#endif
return -ETIME;

conv_finish:
Expand All @@ -362,10 +316,6 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev,
devpriv->IntStatus |= ADC_READY;
writew(devpriv->IntStatus, devpriv->io_addr + ICP_MULTI_INT_STAT);

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG
"icp multi EDBG: END: icp_multi_insn_read_ai(...) n=%d\n", n);
#endif
return n;
}

Expand Down Expand Up @@ -393,10 +343,6 @@ static int icp_multi_insn_write_ao(struct comedi_device *dev,
{
int n, chan, range, timeout;

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG
"icp multi EDBG: BGN: icp_multi_insn_write_ao(...)\n");
#endif
/* Disable D/A conversion ready interrupt */
devpriv->IntEnable &= ~DAC_READY;
writew(devpriv->IntEnable, devpriv->io_addr + ICP_MULTI_INT_EN);
Expand Down Expand Up @@ -429,15 +375,6 @@ static int icp_multi_insn_write_ao(struct comedi_device *dev,
ICP_MULTI_DAC_CSR) & DAC_BSY))
goto dac_ready;

#ifdef ICP_MULTI_EXTDEBUG
if (!(timeout % 10))
printk(KERN_DEBUG
"icp multi A n=%d tm=%d ST=%4x\n", n,
timeout,
readw(devpriv->io_addr +
ICP_MULTI_DAC_CSR));
#endif

udelay(1);
}

Expand All @@ -456,11 +393,6 @@ static int icp_multi_insn_write_ao(struct comedi_device *dev,
/* Clear data received */
devpriv->ao_data[chan] = 0;

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG
"icp multi EDBG: END: icp_multi_insn_write_ao(...) n=%d\n",
n);
#endif
return -ETIME;

dac_ready:
Expand All @@ -477,10 +409,6 @@ static int icp_multi_insn_write_ao(struct comedi_device *dev,
devpriv->ao_data[chan] = data[n];
}

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG
"icp multi EDBG: END: icp_multi_insn_write_ao(...) n=%d\n", n);
#endif
return n;
}

Expand Down Expand Up @@ -567,10 +495,6 @@ static int icp_multi_insn_bits_do(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG "icp multi EDBG: BGN: icp_multi_insn_bits_do(...)\n");
#endif

if (data[0]) {
s->state &= ~data[0];
s->state |= (data[0] & data[1]);
Expand All @@ -582,9 +506,6 @@ static int icp_multi_insn_bits_do(struct comedi_device *dev,

data[1] = readw(devpriv->io_addr + ICP_MULTI_DI);

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG "icp multi EDBG: END: icp_multi_insn_bits_do(...)\n");
#endif
return insn->n;
}

Expand Down Expand Up @@ -659,24 +580,12 @@ static irqreturn_t interrupt_service_icp_multi(int irq, void *d)
struct comedi_device *dev = d;
int int_no;

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG
"icp multi EDBG: BGN: interrupt_service_icp_multi(%d,...)\n",
irq);
#endif

/* Is this interrupt from our board? */
int_no = readw(devpriv->io_addr + ICP_MULTI_INT_STAT) & Status_IRQ;
if (!int_no)
/* No, exit */
return IRQ_NONE;

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG
"icp multi EDBG: interrupt_service_icp_multi() ST: %4x\n",
readw(devpriv->io_addr + ICP_MULTI_INT_STAT));
#endif

/* Determine which interrupt is active & handle it */
switch (int_no) {
case ADC_READY:
Expand All @@ -700,10 +609,6 @@ static irqreturn_t interrupt_service_icp_multi(int irq, void *d)

}

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG
"icp multi EDBG: END: interrupt_service_icp_multi(...)\n");
#endif
return IRQ_HANDLED;
}

Expand Down Expand Up @@ -734,10 +639,6 @@ static int check_channel_list(struct comedi_device *dev,
{
unsigned int i;

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG
"icp multi EDBG: check_channel_list(...,%d)\n", n_chan);
#endif
/* Check that we at least have one channel to check */
if (n_chan < 1) {
comedi_error(dev, "range/channel list is empty!");
Expand Down Expand Up @@ -783,10 +684,6 @@ static int icp_multi_reset(struct comedi_device *dev)
{
unsigned int i;

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG
"icp_multi EDBG: BGN: icp_multi_reset(...)\n");
#endif
/* Clear INT enables and requests */
writew(0, devpriv->io_addr + ICP_MULTI_INT_EN);
writew(0x00ff, devpriv->io_addr + ICP_MULTI_INT_STAT);
Expand Down Expand Up @@ -815,10 +712,6 @@ static int icp_multi_reset(struct comedi_device *dev)
/* Digital outputs to 0 */
writew(0, devpriv->io_addr + ICP_MULTI_DO);

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG
"icp multi EDBG: END: icp_multi_reset(...)\n");
#endif
return 0;
}

Expand All @@ -841,15 +734,8 @@ static int icp_multi_attach(struct comedi_device *dev,
return ret;

/* Initialise list of PCI cards in system, if not already done so */
if (pci_list_builded++ == 0) {
pci_card_list_init(PCI_VENDOR_ID_ICP,
#ifdef ICP_MULTI_EXTDEBUG
1
#else
0
#endif
);
}
if (pci_list_builded++ == 0)
pci_card_list_init(PCI_VENDOR_ID_ICP, 0);

printk(KERN_WARNING
"Anne's comedi%d: icp_multi: board=%s", dev->minor,
Expand Down Expand Up @@ -883,11 +769,6 @@ static int icp_multi_attach(struct comedi_device *dev,
printk(KERN_WARNING "ioremap failed.\n");
return -ENOMEM;
}
#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG
"0x%08llx mapped to %p, ", (unsigned long long)iobase,
devpriv->io_addr);
#endif

dev->board_name = this_board->name;

Expand Down Expand Up @@ -952,7 +833,7 @@ static int icp_multi_attach(struct comedi_device *dev,
s->n_chan = this_board->n_aochan;
s->maxdata = this_board->ao_maxdata;
s->len_chanlist = this_board->n_aochan;
s->range_table = this_board->rangelist_ao;
s->range_table = &range_analog;
s->insn_write = icp_multi_insn_write_ao;
s->insn_read = icp_multi_insn_read_ao;
subdev++;
Expand Down Expand Up @@ -1000,10 +881,6 @@ static int icp_multi_attach(struct comedi_device *dev,

devpriv->valid = 1;

#ifdef ICP_MULTI_EXTDEBUG
printk(KERN_DEBUG "icp multi EDBG: END: icp_multi_attach(...)\n");
#endif

return 0;
}

Expand Down

0 comments on commit 7d653ab

Please sign in to comment.