Commit d6d9bd32 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

Staging: comedi: remove C99 comments in adv_pci1723.c

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0f04c356
...@@ -54,7 +54,7 @@ configures all channels in the same group. ...@@ -54,7 +54,7 @@ configures all channels in the same group.
#define ADVANTECH_VENDOR 0x13fe /* Advantech PCI vendor ID */ #define ADVANTECH_VENDOR 0x13fe /* Advantech PCI vendor ID */
// hardware types of the cards /* hardware types of the cards */
#define TYPE_PCI1723 0 #define TYPE_PCI1723 0
#define IORANGE_1723 0x2A #define IORANGE_1723 0x2A
...@@ -92,7 +92,7 @@ configures all channels in the same group. ...@@ -92,7 +92,7 @@ configures all channels in the same group.
#define PCI1723_SELECT_CALIBRATION 0x28 /* Select the calibration Ref_V */ #define PCI1723_SELECT_CALIBRATION 0x28 /* Select the calibration Ref_V */
//static unsigned short pci_list_builded=0; /*=1 list of card is know */ /* static unsigned short pci_list_builded=0; =1 list of card is know */
static const struct comedi_lrange range_pci1723 = { 1, { static const struct comedi_lrange range_pci1723 = { 1, {
BIP_RANGE(10) BIP_RANGE(10)
...@@ -104,14 +104,14 @@ static const struct comedi_lrange range_pci1723 = { 1, { ...@@ -104,14 +104,14 @@ static const struct comedi_lrange range_pci1723 = { 1, {
*/ */
struct pci1723_board { struct pci1723_board {
const char *name; const char *name;
int vendor_id; // PCI vendor a device ID of card int vendor_id; /* PCI vendor a device ID of card */
int device_id; int device_id;
int iorange; int iorange;
char cardtype; char cardtype;
int n_aochan; // num of D/A chans int n_aochan; /* num of D/A chans */
int n_diochan; // num of DIO chans int n_diochan; /* num of DIO chans */
int ao_maxdata; // resolution of D/A int ao_maxdata; /* resolution of D/A */
const struct comedi_lrange *rangelist_ao; // rangelist for D/A const struct comedi_lrange *rangelist_ao; /* rangelist for D/A */
}; };
static const struct pci1723_board boardtypes[] = { static const struct pci1723_board boardtypes[] = {
...@@ -157,12 +157,12 @@ static struct comedi_driver driver_pci1723 = { ...@@ -157,12 +157,12 @@ static struct comedi_driver driver_pci1723 = {
/* this structure is for data unique to this hardware driver. */ /* this structure is for data unique to this hardware driver. */
struct pci1723_private { struct pci1723_private {
int valid; //card is usable; int valid; /* card is usable; */
struct pci_dev *pcidev; struct pci_dev *pcidev;
unsigned char da_range[8]; // D/A output range for each channel unsigned char da_range[8]; /* D/A output range for each channel */
short ao_data[8]; // data output buffer short ao_data[8]; /* data output buffer */
}; };
/*the following macro to make it easy to /*the following macro to make it easy to
...@@ -180,22 +180,22 @@ static int pci1723_reset(struct comedi_device * dev) ...@@ -180,22 +180,22 @@ static int pci1723_reset(struct comedi_device * dev)
int i; int i;
DPRINTK("adv_pci1723 EDBG: BGN: pci1723_reset(...)\n"); DPRINTK("adv_pci1723 EDBG: BGN: pci1723_reset(...)\n");
outw(0x01, dev->iobase + PCI1723_SYN_SET); // set synchronous output mode outw(0x01, dev->iobase + PCI1723_SYN_SET); /* set synchronous output mode */
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
// set all outputs to 0V /* set all outputs to 0V */
devpriv->ao_data[i] = 0x8000; devpriv->ao_data[i] = 0x8000;
outw(devpriv->ao_data[i], dev->iobase + PCI1723_DA(i)); outw(devpriv->ao_data[i], dev->iobase + PCI1723_DA(i));
// set all ranges to +/- 10V /* set all ranges to +/- 10V */
devpriv->da_range[i] = 0; devpriv->da_range[i] = 0;
outw(((devpriv->da_range[i] << 4) | i), outw(((devpriv->da_range[i] << 4) | i),
PCI1723_RANGE_CALIBRATION_MODE); PCI1723_RANGE_CALIBRATION_MODE);
} }
outw(0, dev->iobase + PCI1723_CHANGE_CHA_OUTPUT_TYPE_STROBE); // update ranges outw(0, dev->iobase + PCI1723_CHANGE_CHA_OUTPUT_TYPE_STROBE); /* update ranges */
outw(0, dev->iobase + PCI1723_SYN_STROBE); // update outputs outw(0, dev->iobase + PCI1723_SYN_STROBE); /* update outputs */
// set asynchronous output mode /* set asynchronous output mode */
outw(0, dev->iobase + PCI1723_SYN_SET); outw(0, dev->iobase + PCI1723_SYN_SET);
DPRINTK("adv_pci1723 EDBG: END: pci1723_reset(...)\n"); DPRINTK("adv_pci1723 EDBG: END: pci1723_reset(...)\n");
...@@ -265,12 +265,12 @@ static int pci1723_dio_insn_config(struct comedi_device * dev, struct comedi_sub ...@@ -265,12 +265,12 @@ static int pci1723_dio_insn_config(struct comedi_device * dev, struct comedi_sub
return -EINVAL; return -EINVAL;
} }
// update hardware DIO mode /* update hardware DIO mode */
dio_mode = 0x0000; // low byte output, high byte output dio_mode = 0x0000; /* low byte output, high byte output */
if ((s->io_bits & 0x00FF) == 0) if ((s->io_bits & 0x00FF) == 0)
dio_mode |= 0x0001; // low byte input dio_mode |= 0x0001; /* low byte input */
if ((s->io_bits & 0xFF00) == 0) if ((s->io_bits & 0xFF00) == 0)
dio_mode |= 0x0002; // high byte input dio_mode |= 0x0002; /* high byte input */
outw(dio_mode, dev->iobase + PCI1723_DIGITAL_IO_PORT_SET); outw(dio_mode, dev->iobase + PCI1723_DIGITAL_IO_PORT_SET);
return 1; return 1;
} }
...@@ -389,22 +389,22 @@ static int pci1723_attach(struct comedi_device * dev, struct comedi_devconfig * ...@@ -389,22 +389,22 @@ static int pci1723_attach(struct comedi_device * dev, struct comedi_devconfig *
s->insn_write = pci1723_ao_write_winsn; s->insn_write = pci1723_ao_write_winsn;
s->insn_read = pci1723_insn_read_ao; s->insn_read = pci1723_insn_read_ao;
// read DIO config /* read DIO config */
switch (inw(dev->iobase + PCI1723_DIGITAL_IO_PORT_MODE) & 0x03) { switch (inw(dev->iobase + PCI1723_DIGITAL_IO_PORT_MODE) & 0x03) {
case 0x00: // low byte output, high byte output case 0x00: /* low byte output, high byte output */
s->io_bits = 0xFFFF; s->io_bits = 0xFFFF;
break; break;
case 0x01: // low byte input, high byte output case 0x01: /* low byte input, high byte output */
s->io_bits = 0xFF00; s->io_bits = 0xFF00;
break; break;
case 0x02: // low byte output, high byte input case 0x02: /* low byte output, high byte input */
s->io_bits = 0x00FF; s->io_bits = 0x00FF;
break; break;
case 0x03: // low byte input, high byte input case 0x03: /* low byte input, high byte input */
s->io_bits = 0x0000; s->io_bits = 0x0000;
break; break;
} }
// read DIO port state /* read DIO port state */
s->state = inw(dev->iobase + PCI1723_READ_DIGITAL_INPUT_DATA); s->state = inw(dev->iobase + PCI1723_READ_DIGITAL_INPUT_DATA);
subdev++; subdev++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment