Skip to content

L
linux
Commit b6c77757 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files
Options

Staging: comedi: Convert C99 style comments to traditional style comments 

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4dc6b15b
Show whitespace changes
Inline Side-by-side
Showing with 2117 additions and 2177 deletions
drivers/staging/comedi/comedi_ksyms.c
View file @ b6c77757
...@@ -31,12 +31,12 @@ ...@@ -31,12 +31,12 @@
/* for drivers */ /* for drivers */
EXPORT_SYMBOL(comedi_driver_register); EXPORT_SYMBOL(comedi_driver_register);
EXPORT_SYMBOL(comedi_driver_unregister); EXPORT_SYMBOL(comedi_driver_unregister);
//EXPORT_SYMBOL(comedi_bufcheck); /* EXPORT_SYMBOL(comedi_bufcheck); */
//EXPORT_SYMBOL(comedi_done); /* EXPORT_SYMBOL(comedi_done); */
//EXPORT_SYMBOL(comedi_error_done); /* EXPORT_SYMBOL(comedi_error_done); */
EXPORT_SYMBOL(comedi_error); EXPORT_SYMBOL(comedi_error);
//EXPORT_SYMBOL(comedi_eobuf); /* EXPORT_SYMBOL(comedi_eobuf); */
//EXPORT_SYMBOL(comedi_eos); /* EXPORT_SYMBOL(comedi_eos); */
EXPORT_SYMBOL(comedi_event); EXPORT_SYMBOL(comedi_event);
EXPORT_SYMBOL(comedi_get_subdevice_runflags); EXPORT_SYMBOL(comedi_get_subdevice_runflags);
EXPORT_SYMBOL(comedi_set_subdevice_runflags); EXPORT_SYMBOL(comedi_set_subdevice_runflags);
......
drivers/staging/comedi/drivers.c
View file @ b6c77757
...@@ -140,7 +140,7 @@ int comedi_device_attach(comedi_device * dev, comedi_devconfig * it) ...@@ -140,7 +140,7 @@ int comedi_device_attach(comedi_device * dev, comedi_devconfig * it)
continue; continue;
} }
} }
//initialize dev->driver here so comedi_error() can be called from attach /* initialize dev->driver here so comedi_error() can be called from attach */
dev->driver = driv; dev->driver = driv;
ret = driv->attach(dev, it); ret = driv->attach(dev, it);
if (ret < 0) { if (ret < 0) {
...@@ -151,8 +151,8 @@ int comedi_device_attach(comedi_device * dev, comedi_devconfig * it) ...@@ -151,8 +151,8 @@ int comedi_device_attach(comedi_device * dev, comedi_devconfig * it)
goto attached; goto attached;
} }
// recognize has failed if we get here /* recognize has failed if we get here */
// report valid board names before returning error /* report valid board names before returning error */
for (driv = comedi_drivers; driv; driv = driv->next) { for (driv = comedi_drivers; driv; driv = driv->next) {
if (!try_module_get(driv->module)) { if (!try_module_get(driv->module)) {
printk("comedi: failed to increment module count\n"); printk("comedi: failed to increment module count\n");
...@@ -299,7 +299,7 @@ static int postconfig(comedi_device * dev) ...@@ -299,7 +299,7 @@ static int postconfig(comedi_device * dev)
return 0; return 0;
} }
// generic recognize function for drivers that register their supported board names /* generic recognize function for drivers that register their supported board names */
void *comedi_recognize(comedi_driver * driv, const char *name) void *comedi_recognize(comedi_driver * driv, const char *name)
{ {
unsigned i; unsigned i;
...@@ -426,7 +426,7 @@ int comedi_buf_alloc(comedi_device * dev, comedi_subdevice * s, ...@@ -426,7 +426,7 @@ int comedi_buf_alloc(comedi_device * dev, comedi_subdevice * s,
if (async->prealloc_buf && async->prealloc_bufsz == new_size) { if (async->prealloc_buf && async->prealloc_bufsz == new_size) {
return 0; return 0;
} }
// deallocate old buffer /* deallocate old buffer */
if (async->prealloc_buf) { if (async->prealloc_buf) {
vunmap(async->prealloc_buf); vunmap(async->prealloc_buf);
async->prealloc_buf = NULL; async->prealloc_buf = NULL;
...@@ -455,7 +455,7 @@ int comedi_buf_alloc(comedi_device * dev, comedi_subdevice * s, ...@@ -455,7 +455,7 @@ int comedi_buf_alloc(comedi_device * dev, comedi_subdevice * s,
async->buf_page_list = NULL; async->buf_page_list = NULL;
async->n_buf_pages = 0; async->n_buf_pages = 0;
} }
// allocate new buffer /* allocate new buffer */
if (new_size) { if (new_size) {
unsigned i = 0; unsigned i = 0;
unsigned n_pages = new_size >> PAGE_SHIFT; unsigned n_pages = new_size >> PAGE_SHIFT;
...@@ -568,7 +568,7 @@ unsigned int comedi_buf_munge(comedi_async * async, unsigned int num_bytes) ...@@ -568,7 +568,7 @@ unsigned int comedi_buf_munge(comedi_async * async, unsigned int num_bytes)
s->munge(s->device, s, async->prealloc_buf + async->munge_ptr, s->munge(s->device, s, async->prealloc_buf + async->munge_ptr,
block_size, async->munge_chan); block_size, async->munge_chan);
smp_wmb(); //barrier insures data is munged in buffer before munge_count is incremented smp_wmb(); /* barrier insures data is munged in buffer before munge_count is incremented */
async->munge_chan += block_size / num_sample_bytes; async->munge_chan += block_size / num_sample_bytes;
async->munge_chan %= async->cmd.chanlist_len; async->munge_chan %= async->cmd.chanlist_len;
...@@ -667,7 +667,7 @@ unsigned comedi_buf_read_alloc(comedi_async * async, unsigned nbytes) ...@@ -667,7 +667,7 @@ unsigned comedi_buf_read_alloc(comedi_async * async, unsigned nbytes)
/* transfers control of a chunk from reader to free buffer space */ /* transfers control of a chunk from reader to free buffer space */
unsigned comedi_buf_read_free(comedi_async * async, unsigned int nbytes) unsigned comedi_buf_read_free(comedi_async * async, unsigned int nbytes)
{ {
// barrier insures data has been read out of buffer before read count is incremented /* barrier insures data has been read out of buffer before read count is incremented */
smp_mb(); smp_mb();
if ((int)(async->buf_read_count + nbytes - if ((int)(async->buf_read_count + nbytes -
async->buf_read_alloc_count) > 0) { async->buf_read_alloc_count) > 0) {
...@@ -852,9 +852,9 @@ int comedi_pci_auto_config(struct pci_dev *pcidev, const char *board_name) ...@@ -852,9 +852,9 @@ int comedi_pci_auto_config(struct pci_dev *pcidev, const char *board_name)
{ {
int options[2]; int options[2];
// pci bus /* pci bus */
options[0] = pcidev->bus->number; options[0] = pcidev->bus->number;
// pci slot /* pci slot */
options[1] = PCI_SLOT(pcidev->devfn); options[1] = PCI_SLOT(pcidev->devfn);
return comedi_auto_config(&pcidev->dev, board_name, options, sizeof(options) / sizeof(options[0])); return comedi_auto_config(&pcidev->dev, board_name, options, sizeof(options) / sizeof(options[0]));
......
drivers/staging/comedi/drivers/icp_multi.c
View file @ b6c77757
...@@ -61,7 +61,7 @@ There are 4 x 12-bit Analogue Outputs. Ranges : 5V, 10V, +/-5V, +/-10V ...@@ -61,7 +61,7 @@ There are 4 x 12-bit Analogue Outputs. Ranges : 5V, 10V, +/-5V, +/-10V
#define ICP_MULTI_EXTDEBUG #define ICP_MULTI_EXTDEBUG
// Hardware types of the cards /* Hardware types of the cards */
#define TYPE_ICP_MULTI 0 #define TYPE_ICP_MULTI 0
#define IORANGE_ICP_MULTI 32 #define IORANGE_ICP_MULTI 32
...@@ -81,20 +81,20 @@ There are 4 x 12-bit Analogue Outputs. Ranges : 5V, 10V, +/-5V, +/-10V ...@@ -81,20 +81,20 @@ There are 4 x 12-bit Analogue Outputs. Ranges : 5V, 10V, +/-5V, +/-10V
#define ICP_MULTI_SIZE 0x20 /* 32 bytes */ #define ICP_MULTI_SIZE 0x20 /* 32 bytes */
// Define bits from ADC command/status register /* Define bits from ADC command/status register */
#define ADC_ST 0x0001 /* Start ADC */ #define ADC_ST 0x0001 /* Start ADC */
#define ADC_BSY 0x0001 /* ADC busy */ #define ADC_BSY 0x0001 /* ADC busy */
#define ADC_BI 0x0010 /* Bipolar input range 1 = bipolar */ #define ADC_BI 0x0010 /* Bipolar input range 1 = bipolar */
#define ADC_RA 0x0020 /* Input range 0 = 5V, 1 = 10V */ #define ADC_RA 0x0020 /* Input range 0 = 5V, 1 = 10V */
#define ADC_DI 0x0040 /* Differential input mode 1 = differential */ #define ADC_DI 0x0040 /* Differential input mode 1 = differential */
// Define bits from DAC command/status register /* Define bits from DAC command/status register */
#define DAC_ST 0x0001 /* Start DAC */ #define DAC_ST 0x0001 /* Start DAC */
#define DAC_BSY 0x0001 /* DAC busy */ #define DAC_BSY 0x0001 /* DAC busy */
#define DAC_BI 0x0010 /* Bipolar input range 1 = bipolar */ #define DAC_BI 0x0010 /* Bipolar input range 1 = bipolar */
#define DAC_RA 0x0020 /* Input range 0 = 5V, 1 = 10V */ #define DAC_RA 0x0020 /* Input range 0 = 5V, 1 = 10V */
// Define bits from interrupt enable/status registers /* Define bits from interrupt enable/status registers */
#define ADC_READY 0x0001 /* A/d conversion ready interrupt */ #define ADC_READY 0x0001 /* A/d conversion ready interrupt */
#define DAC_READY 0x0002 /* D/a conversion ready interrupt */ #define DAC_READY 0x0002 /* D/a conversion ready interrupt */
#define DOUT_ERROR 0x0004 /* Digital output error interrupt */ #define DOUT_ERROR 0x0004 /* Digital output error interrupt */
...@@ -104,10 +104,10 @@ There are 4 x 12-bit Analogue Outputs. Ranges : 5V, 10V, +/-5V, +/-10V ...@@ -104,10 +104,10 @@ There are 4 x 12-bit Analogue Outputs. Ranges : 5V, 10V, +/-5V, +/-10V
#define CIE2 0x0040 /* Counter 2 overrun interrupt */ #define CIE2 0x0040 /* Counter 2 overrun interrupt */
#define CIE3 0x0080 /* Counter 3 overrun interrupt */ #define CIE3 0x0080 /* Counter 3 overrun interrupt */
// Useful definitions /* Useful definitions */
#define Status_IRQ 0x00ff // All interrupts #define Status_IRQ 0x00ff /* All interrupts */
// Define analogue range /* Define analogue range */
static const comedi_lrange range_analog = { 4, { static const comedi_lrange range_analog = { 4, {
UNI_RANGE(5), UNI_RANGE(5),
UNI_RANGE(10), UNI_RANGE(10),
...@@ -134,41 +134,41 @@ static int icp_multi_detach(comedi_device * dev); ...@@ -134,41 +134,41 @@ static int icp_multi_detach(comedi_device * dev);
static unsigned short pci_list_builded = 0; /*>0 list of card is known */ static unsigned short pci_list_builded = 0; /*>0 list of card is known */
typedef struct { typedef struct {
const char *name; // driver name const char *name; /* driver name */
int device_id; int device_id;
int iorange; // I/O range len int iorange; /* I/O range len */
char have_irq; // 1=card support IRQ char have_irq; /* 1=card support IRQ */
char cardtype; // 0=ICP Multi char cardtype; /* 0=ICP Multi */
int n_aichan; // num of A/D chans int n_aichan; /* num of A/D chans */
int n_aichand; // num of A/D chans in diff mode int n_aichand; /* num of A/D chans in diff mode */
int n_aochan; // num of D/A chans int n_aochan; /* num of D/A chans */
int n_dichan; // num of DI chans int n_dichan; /* num of DI chans */
int n_dochan; // num of DO chans int n_dochan; /* num of DO chans */
int n_ctrs; // num of counters int n_ctrs; /* num of counters */
int ai_maxdata; // resolution of A/D int ai_maxdata; /* resolution of A/D */
int ao_maxdata; // resolution of D/A int ao_maxdata; /* resolution of D/A */
const comedi_lrange *rangelist_ai; // rangelist for A/D const comedi_lrange *rangelist_ai; /* rangelist for A/D */
const char *rangecode; // range codes for programming const char *rangecode; /* range codes for programming */
const comedi_lrange *rangelist_ao; // rangelist for D/A const comedi_lrange *rangelist_ao; /* rangelist for D/A */
} boardtype; } boardtype;
static const boardtype boardtypes[] = { static const boardtype boardtypes[] = {
{"icp_multi", // Driver name {"icp_multi", /* Driver name */
DEVICE_ID, // PCI device ID DEVICE_ID, /* PCI device ID */
IORANGE_ICP_MULTI, // I/O range length IORANGE_ICP_MULTI, /* I/O range length */
1, // 1=Card supports interrupts 1, /* 1=Card supports interrupts */
TYPE_ICP_MULTI, // Card type = ICP MULTI TYPE_ICP_MULTI, /* Card type = ICP MULTI */
16, // Num of A/D channels 16, /* Num of A/D channels */
8, // Num of A/D channels in diff mode 8, /* Num of A/D channels in diff mode */
4, // Num of D/A channels 4, /* Num of D/A channels */
16, // Num of digital inputs 16, /* Num of digital inputs */
8, // Num of digital outputs 8, /* Num of digital outputs */
4, // Num of counters 4, /* Num of counters */
0x0fff, // Resolution of A/D 0x0fff, /* Resolution of A/D */
0x0fff, // Resolution of D/A 0x0fff, /* Resolution of D/A */
&range_analog, // Rangelist for A/D &range_analog, /* Rangelist for A/D */
range_codes_analog, // Range codes for programming range_codes_analog, /* Range codes for programming */
&range_analog}, // Rangelist for D/A &range_analog}, /* Rangelist for D/A */
}; };
#define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype)) #define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype))
...@@ -186,22 +186,22 @@ static comedi_driver driver_icp_multi = { ...@@ -186,22 +186,22 @@ static comedi_driver driver_icp_multi = {
COMEDI_INITCLEANUP(driver_icp_multi); COMEDI_INITCLEANUP(driver_icp_multi);
typedef struct { typedef struct {
struct pcilst_struct *card; // pointer to card struct pcilst_struct *card; /* pointer to card */
char valid; // card is usable char valid; /* card is usable */
void *io_addr; // Pointer to mapped io address void *io_addr; /* Pointer to mapped io address */
resource_size_t phys_iobase; // Physical io address resource_size_t phys_iobase; /* Physical io address */
unsigned int AdcCmdStatus; // ADC Command/Status register unsigned int AdcCmdStatus; /* ADC Command/Status register */
unsigned int DacCmdStatus; // DAC Command/Status register unsigned int DacCmdStatus; /* DAC Command/Status register */
unsigned int IntEnable; // Interrupt Enable register unsigned int IntEnable; /* Interrupt Enable register */
unsigned int IntStatus; // Interrupt Status register unsigned int IntStatus; /* Interrupt Status register */
unsigned int act_chanlist[32]; // list of scaned channel unsigned int act_chanlist[32]; /* list of scaned channel */
unsigned char act_chanlist_len; // len of scanlist unsigned char act_chanlist_len; /* len of scanlist */
unsigned char act_chanlist_pos; // actual position in MUX list unsigned char act_chanlist_pos; /* actual position in MUX list */
unsigned int *ai_chanlist; // actaul chanlist unsigned int *ai_chanlist; /* actaul chanlist */
sampl_t *ai_data; // data buffer sampl_t *ai_data; /* data buffer */
sampl_t ao_data[4]; // data output buffer sampl_t ao_data[4]; /* data output buffer */
sampl_t di_data; // Digital input data sampl_t di_data; /* Digital input data */
unsigned int do_data; // Remember digital output data unsigned int do_data; /* Remember digital output data */
} icp_multi_private; } icp_multi_private;
#define devpriv ((icp_multi_private *)dev->private) #define devpriv ((icp_multi_private *)dev->private)
...@@ -253,15 +253,15 @@ static int icp_multi_insn_read_ai(comedi_device * dev, comedi_subdevice * s, ...@@ -253,15 +253,15 @@ static int icp_multi_insn_read_ai(comedi_device * dev, comedi_subdevice * s,
#ifdef ICP_MULTI_EXTDEBUG #ifdef ICP_MULTI_EXTDEBUG
printk("icp multi EDBG: BGN: icp_multi_insn_read_ai(...)\n"); printk("icp multi EDBG: BGN: icp_multi_insn_read_ai(...)\n");
#endif #endif
// Disable A/D conversion ready interrupt /* Disable A/D conversion ready interrupt */
devpriv->IntEnable &= ~ADC_READY; devpriv->IntEnable &= ~ADC_READY;
writew(devpriv->IntEnable, devpriv->io_addr + ICP_MULTI_INT_EN); writew(devpriv->IntEnable, devpriv->io_addr + ICP_MULTI_INT_EN);
// Clear interrupt status /* Clear interrupt status */
devpriv->IntStatus |= ADC_READY; devpriv->IntStatus |= ADC_READY;
writew(devpriv->IntStatus, devpriv->io_addr + ICP_MULTI_INT_STAT); writew(devpriv->IntStatus, devpriv->io_addr + ICP_MULTI_INT_STAT);
// Set up appropriate channel, mode and range data, for specified channel /* Set up appropriate channel, mode and range data, for specified channel */
setup_channel_list(dev, s, &insn->chanspec, 1); setup_channel_list(dev, s, &insn->chanspec, 1);
#ifdef ICP_MULTI_EXTDEBUG #ifdef ICP_MULTI_EXTDEBUG
...@@ -271,7 +271,7 @@ static int icp_multi_insn_read_ai(comedi_device * dev, comedi_subdevice * s, ...@@ -271,7 +271,7 @@ static int icp_multi_insn_read_ai(comedi_device * dev, comedi_subdevice * s,
#endif #endif
for (n = 0; n < insn->n; n++) { for (n = 0; n < insn->n; n++) {
// Set start ADC bit /* Set start ADC bit */
devpriv->AdcCmdStatus |= ADC_ST; devpriv->AdcCmdStatus |= ADC_ST;
writew(devpriv->AdcCmdStatus, writew(devpriv->AdcCmdStatus,
devpriv->io_addr + ICP_MULTI_ADC_CSR); devpriv->io_addr + ICP_MULTI_ADC_CSR);
...@@ -289,7 +289,7 @@ static int icp_multi_insn_read_ai(comedi_device * dev, comedi_subdevice * s, ...@@ -289,7 +289,7 @@ static int icp_multi_insn_read_ai(comedi_device * dev, comedi_subdevice * s,
readw(devpriv->io_addr + ICP_MULTI_ADC_CSR)); readw(devpriv->io_addr + ICP_MULTI_ADC_CSR));
#endif #endif
// Wait for conversion to complete, or get fed up waiting /* Wait for conversion to complete, or get fed up waiting */
timeout = 100; timeout = 100;
while (timeout--) { while (timeout--) {
if (!(readw(devpriv->io_addr + if (!(readw(devpriv->io_addr +
...@@ -307,19 +307,19 @@ static int icp_multi_insn_read_ai(comedi_device * dev, comedi_subdevice * s, ...@@ -307,19 +307,19 @@ static int icp_multi_insn_read_ai(comedi_device * dev, comedi_subdevice * s,
comedi_udelay(1); comedi_udelay(1);
} }
// If we reach here, a timeout has occurred /* If we reach here, a timeout has occurred */
comedi_error(dev, "A/D insn timeout"); comedi_error(dev, "A/D insn timeout");
// Disable interrupt /* Disable interrupt */
devpriv->IntEnable &= ~ADC_READY; devpriv->IntEnable &= ~ADC_READY;
writew(devpriv->IntEnable, devpriv->io_addr + ICP_MULTI_INT_EN); writew(devpriv->IntEnable, devpriv->io_addr + ICP_MULTI_INT_EN);
// Clear interrupt status /* Clear interrupt status */
devpriv->IntStatus |= ADC_READY; devpriv->IntStatus |= ADC_READY;
writew(devpriv->IntStatus, writew(devpriv->IntStatus,
devpriv->io_addr + ICP_MULTI_INT_STAT); devpriv->io_addr + ICP_MULTI_INT_STAT);
// Clear data received /* Clear data received */
data[n] = 0; data[n] = 0;
#ifdef ICP_MULTI_EXTDEBUG #ifdef ICP_MULTI_EXTDEBUG
...@@ -332,11 +332,11 @@ static int icp_multi_insn_read_ai(comedi_device * dev, comedi_subdevice * s, ...@@ -332,11 +332,11 @@ static int icp_multi_insn_read_ai(comedi_device * dev, comedi_subdevice * s,
(readw(devpriv->io_addr + ICP_MULTI_AI) >> 4) & 0x0fff; (readw(devpriv->io_addr + ICP_MULTI_AI) >> 4) & 0x0fff;
} }
// Disable interrupt /* Disable interrupt */
devpriv->IntEnable &= ~ADC_READY; devpriv->IntEnable &= ~ADC_READY;
writew(devpriv->IntEnable, devpriv->io_addr + ICP_MULTI_INT_EN); writew(devpriv->IntEnable, devpriv->io_addr + ICP_MULTI_INT_EN);
// Clear interrupt status /* Clear interrupt status */
devpriv->IntStatus |= ADC_READY; devpriv->IntStatus |= ADC_READY;
writew(devpriv->IntStatus, devpriv->io_addr + ICP_MULTI_INT_STAT); writew(devpriv->IntStatus, devpriv->io_addr + ICP_MULTI_INT_STAT);
...@@ -372,23 +372,23 @@ static int icp_multi_insn_write_ao(comedi_device * dev, comedi_subdevice * s, ...@@ -372,23 +372,23 @@ static int icp_multi_insn_write_ao(comedi_device * dev, comedi_subdevice * s,
#ifdef ICP_MULTI_EXTDEBUG #ifdef ICP_MULTI_EXTDEBUG
printk("icp multi EDBG: BGN: icp_multi_insn_write_ao(...)\n"); printk("icp multi EDBG: BGN: icp_multi_insn_write_ao(...)\n");
#endif #endif
// Disable D/A conversion ready interrupt /* Disable D/A conversion ready interrupt */
devpriv->IntEnable &= ~DAC_READY; devpriv->IntEnable &= ~DAC_READY;
writew(devpriv->IntEnable, devpriv->io_addr + ICP_MULTI_INT_EN); writew(devpriv->IntEnable, devpriv->io_addr + ICP_MULTI_INT_EN);
// Clear interrupt status /* Clear interrupt status */
devpriv->IntStatus |= DAC_READY; devpriv->IntStatus |= DAC_READY;
writew(devpriv->IntStatus, devpriv->io_addr + ICP_MULTI_INT_STAT); writew(devpriv->IntStatus, devpriv->io_addr + ICP_MULTI_INT_STAT);
// Get channel number and range /* Get channel number and range */
chan = CR_CHAN(insn->chanspec); chan = CR_CHAN(insn->chanspec);
range = CR_RANGE(insn->chanspec); range = CR_RANGE(insn->chanspec);
// Set up range and channel data /* Set up range and channel data */
// Bit 4 = 1 : Bipolar /* Bit 4 = 1 : Bipolar */
// Bit 5 = 0 : 5V /* Bit 5 = 0 : 5V */
// Bit 5 = 1 : 10V /* Bit 5 = 1 : 10V */
// Bits 8-9 : Channel number /* Bits 8-9 : Channel number */
devpriv->DacCmdStatus &= 0xfccf; devpriv->DacCmdStatus &= 0xfccf;
devpriv->DacCmdStatus |= this_board->rangecode[range]; devpriv->DacCmdStatus |= this_board->rangecode[range];
devpriv->DacCmdStatus |= (chan << 8); devpriv->DacCmdStatus |= (chan << 8);
...@@ -396,7 +396,7 @@ static int icp_multi_insn_write_ao(comedi_device * dev, comedi_subdevice * s, ...@@ -396,7 +396,7 @@ static int icp_multi_insn_write_ao(comedi_device * dev, comedi_subdevice * s,
writew(devpriv->DacCmdStatus, devpriv->io_addr + ICP_MULTI_DAC_CSR); writew(devpriv->DacCmdStatus, devpriv->io_addr + ICP_MULTI_DAC_CSR);
for (n = 0; n < insn->n; n++) { for (n = 0; n < insn->n; n++) {
// Wait for analogue output data register to be ready for new data, or get fed up waiting /* Wait for analogue output data register to be ready for new data, or get fed up waiting */
timeout = 100; timeout = 100;
while (timeout--) { while (timeout--) {
if (!(readw(devpriv->io_addr + if (!(readw(devpriv->io_addr +
...@@ -414,19 +414,19 @@ static int icp_multi_insn_write_ao(comedi_device * dev, comedi_subdevice * s, ...@@ -414,19 +414,19 @@ static int icp_multi_insn_write_ao(comedi_device * dev, comedi_subdevice * s,
comedi_udelay(1); comedi_udelay(1);
} }
// If we reach here, a timeout has occurred /* If we reach here, a timeout has occurred */
comedi_error(dev, "D/A insn timeout"); comedi_error(dev, "D/A insn timeout");
// Disable interrupt /* Disable interrupt */
devpriv->IntEnable &= ~DAC_READY; devpriv->IntEnable &= ~DAC_READY;
writew(devpriv->IntEnable, devpriv->io_addr + ICP_MULTI_INT_EN); writew(devpriv->IntEnable, devpriv->io_addr + ICP_MULTI_INT_EN);
// Clear interrupt status /* Clear interrupt status */
devpriv->IntStatus |= DAC_READY; devpriv->IntStatus |= DAC_READY;
writew(devpriv->IntStatus, writew(devpriv->IntStatus,
devpriv->io_addr + ICP_MULTI_INT_STAT); devpriv->io_addr + ICP_MULTI_INT_STAT);
// Clear data received /* Clear data received */
devpriv->ao_data[chan] = 0; devpriv->ao_data[chan] = 0;
#ifdef ICP_MULTI_EXTDEBUG #ifdef ICP_MULTI_EXTDEBUG
...@@ -435,16 +435,16 @@ static int icp_multi_insn_write_ao(comedi_device * dev, comedi_subdevice * s, ...@@ -435,16 +435,16 @@ static int icp_multi_insn_write_ao(comedi_device * dev, comedi_subdevice * s,
return -ETIME; return -ETIME;
dac_ready: dac_ready:
// Write data to analogue output data register /* Write data to analogue output data register */
writew(data[n], devpriv->io_addr + ICP_MULTI_AO); writew(data[n], devpriv->io_addr + ICP_MULTI_AO);
// Set DAC_ST bit to write the data to selected channel /* Set DAC_ST bit to write the data to selected channel */
devpriv->DacCmdStatus |= DAC_ST; devpriv->DacCmdStatus |= DAC_ST;
writew(devpriv->DacCmdStatus, writew(devpriv->DacCmdStatus,
devpriv->io_addr + ICP_MULTI_DAC_CSR); devpriv->io_addr + ICP_MULTI_DAC_CSR);
devpriv->DacCmdStatus &= ~DAC_ST; devpriv->DacCmdStatus &= ~DAC_ST;
// Save analogue output data /* Save analogue output data */
devpriv->ao_data[chan] = data[n]; devpriv->ao_data[chan] = data[n];
} }
...@@ -477,10 +477,10 @@ static int icp_multi_insn_read_ao(comedi_device * dev, comedi_subdevice * s, ...@@ -477,10 +477,10 @@ static int icp_multi_insn_read_ao(comedi_device * dev, comedi_subdevice * s,
{ {
int n, chan; int n, chan;
// Get channel number /* Get channel number */
chan = CR_CHAN(insn->chanspec); chan = CR_CHAN(insn->chanspec);
// Read analogue outputs /* Read analogue outputs */
for (n = 0; n < insn->n; n++) for (n = 0; n < insn->n; n++)
data[n] = devpriv->ao_data[chan]; data[n] = devpriv->ao_data[chan];
...@@ -628,10 +628,10 @@ static irqreturn_t interrupt_service_icp_multi(int irq, void *d PT_REGS_ARG) ...@@ -628,10 +628,10 @@ static irqreturn_t interrupt_service_icp_multi(int irq, void *d PT_REGS_ARG)
irq); irq);
#endif #endif
// Is this interrupt from our board? /* Is this interrupt from our board? */
int_no = readw(devpriv->io_addr + ICP_MULTI_INT_STAT) & Status_IRQ; int_no = readw(devpriv->io_addr + ICP_MULTI_INT_STAT) & Status_IRQ;
if (!int_no) if (!int_no)
// No, exit /* No, exit */
return IRQ_NONE; return IRQ_NONE;
#ifdef ICP_MULTI_EXTDEBUG #ifdef ICP_MULTI_EXTDEBUG
...@@ -639,7 +639,7 @@ static irqreturn_t interrupt_service_icp_multi(int irq, void *d PT_REGS_ARG) ...@@ -639,7 +639,7 @@ static irqreturn_t interrupt_service_icp_multi(int irq, void *d PT_REGS_ARG)
readw(devpriv->io_addr + ICP_MULTI_INT_STAT)); readw(devpriv->io_addr + ICP_MULTI_INT_STAT));
#endif #endif
// Determine which interrupt is active & handle it /* Determine which interrupt is active & handle it */
switch (int_no) { switch (int_no) {
case ADC_READY: case ADC_READY:
break; break;
...@@ -697,14 +697,14 @@ static int check_channel_list(comedi_device * dev, comedi_subdevice * s, ...@@ -697,14 +697,14 @@ static int check_channel_list(comedi_device * dev, comedi_subdevice * s,
#ifdef ICP_MULTI_EXTDEBUG #ifdef ICP_MULTI_EXTDEBUG
printk("icp multi EDBG: check_channel_list(...,%d)\n", n_chan); printk("icp multi EDBG: check_channel_list(...,%d)\n", n_chan);
#endif #endif
// Check that we at least have one channel to check /* Check that we at least have one channel to check */
if (n_chan < 1) { if (n_chan < 1) {
comedi_error(dev, "range/channel list is empty!"); comedi_error(dev, "range/channel list is empty!");
return 0; return 0;
} }
// Check all channels /* Check all channels */
for (i = 0; i < n_chan; i++) { for (i = 0; i < n_chan; i++) {
// Check that channel number is < maximum /* Check that channel number is < maximum */
if (CR_AREF(chanlist[i]) == AREF_DIFF) { if (CR_AREF(chanlist[i]) == AREF_DIFF) {
if (CR_CHAN(chanlist[i]) > this_board->n_aichand) { if (CR_CHAN(chanlist[i]) > this_board->n_aichand) {
comedi_error(dev, comedi_error(dev,
...@@ -756,10 +756,10 @@ static void setup_channel_list(comedi_device * dev, comedi_subdevice * s, ...@@ -756,10 +756,10 @@ static void setup_channel_list(comedi_device * dev, comedi_subdevice * s,
devpriv->act_chanlist_pos = 0; devpriv->act_chanlist_pos = 0;
for (i = 0; i < n_chan; i++) { for (i = 0; i < n_chan; i++) {
// Get channel /* Get channel */
chanprog = CR_CHAN(chanlist[i]); chanprog = CR_CHAN(chanlist[i]);
// Determine if it is a differential channel (Bit 15 = 1) /* Determine if it is a differential channel (Bit 15 = 1) */
if (CR_AREF(chanlist[i]) == AREF_DIFF) { if (CR_AREF(chanlist[i]) == AREF_DIFF) {
diff = 1; diff = 1;
chanprog &= 0x0007; chanprog &= 0x0007;
...@@ -768,21 +768,21 @@ static void setup_channel_list(comedi_device * dev, comedi_subdevice * s, ...@@ -768,21 +768,21 @@ static void setup_channel_list(comedi_device * dev, comedi_subdevice * s,
chanprog &= 0x000f; chanprog &= 0x000f;
} }
// Clear channel, range and input mode bits in A/D command/status register /* Clear channel, range and input mode bits in A/D command/status register */
devpriv->AdcCmdStatus &= 0xf00f; devpriv->AdcCmdStatus &= 0xf00f;
// Set channel number and differential mode status bit /* Set channel number and differential mode status bit */
if (diff) { if (diff) {
// Set channel number, bits 9-11 & mode, bit 6 /* Set channel number, bits 9-11 & mode, bit 6 */
devpriv->AdcCmdStatus |= (chanprog << 9); devpriv->AdcCmdStatus |= (chanprog << 9);
devpriv->AdcCmdStatus |= ADC_DI; devpriv->AdcCmdStatus |= ADC_DI;
} else } else
// Set channel number, bits 8-11 /* Set channel number, bits 8-11 */
devpriv->AdcCmdStatus |= (chanprog << 8); devpriv->AdcCmdStatus |= (chanprog << 8);
// Get range for current channel /* Get range for current channel */
range = this_board->rangecode[CR_RANGE(chanlist[i])]; range = this_board->rangecode[CR_RANGE(chanlist[i])];
// Set range. bits 4-5 /* Set range. bits 4-5 */
devpriv->AdcCmdStatus |= range; devpriv->AdcCmdStatus |= range;
/* Output channel, range, mode to ICP Multi */ /* Output channel, range, mode to ICP Multi */
...@@ -819,32 +819,32 @@ static int icp_multi_reset(comedi_device * dev) ...@@ -819,32 +819,32 @@ static int icp_multi_reset(comedi_device * dev)
#ifdef ICP_MULTI_EXTDEBUG #ifdef ICP_MULTI_EXTDEBUG
printk("icp_multi EDBG: BGN: icp_multi_reset(...)\n"); printk("icp_multi EDBG: BGN: icp_multi_reset(...)\n");
#endif #endif
// Clear INT enables and requests /* Clear INT enables and requests */
writew(0, devpriv->io_addr + ICP_MULTI_INT_EN); writew(0, devpriv->io_addr + ICP_MULTI_INT_EN);
writew(0x00ff, devpriv->io_addr + ICP_MULTI_INT_STAT); writew(0x00ff, devpriv->io_addr + ICP_MULTI_INT_STAT);
if (this_board->n_aochan) if (this_board->n_aochan)
// Set DACs to 0..5V range and 0V output /* Set DACs to 0..5V range and 0V output */
for (i = 0; i < this_board->n_aochan; i++) { for (i = 0; i < this_board->n_aochan; i++) {
devpriv->DacCmdStatus &= 0xfcce; devpriv->DacCmdStatus &= 0xfcce;
// Set channel number /* Set channel number */
devpriv->DacCmdStatus |= (i << 8); devpriv->DacCmdStatus |= (i << 8);
// Output 0V /* Output 0V */
writew(0, devpriv->io_addr + ICP_MULTI_AO); writew(0, devpriv->io_addr + ICP_MULTI_AO);
// Set start conversion bit /* Set start conversion bit */
devpriv->DacCmdStatus |= DAC_ST; devpriv->DacCmdStatus |= DAC_ST;
// Output to command / status register /* Output to command / status register */
writew(devpriv->DacCmdStatus, writew(devpriv->DacCmdStatus,
devpriv->io_addr + ICP_MULTI_DAC_CSR); devpriv->io_addr + ICP_MULTI_DAC_CSR);
// Delay to allow DAC time to recover /* Delay to allow DAC time to recover */
comedi_udelay(1); comedi_udelay(1);
} }
// Digital outputs to 0 /* Digital outputs to 0 */
writew(0, devpriv->io_addr + ICP_MULTI_DO); writew(0, devpriv->io_addr + ICP_MULTI_DO);
#ifdef ICP_MULTI_EXTDEBUG #ifdef ICP_MULTI_EXTDEBUG
...@@ -881,11 +881,11 @@ static int icp_multi_attach(comedi_device * dev, comedi_devconfig * it) ...@@ -881,11 +881,11 @@ static int icp_multi_attach(comedi_device * dev, comedi_devconfig * it)
printk("icp_multi EDBG: BGN: icp_multi_attach(...)\n"); printk("icp_multi EDBG: BGN: icp_multi_attach(...)\n");
// Alocate private data storage space /* Alocate private data storage space */
if ((ret = alloc_private(dev, sizeof(icp_multi_private))) < 0) if ((ret = alloc_private(dev, sizeof(icp_multi_private))) < 0)
return ret; return ret;
// Initialise list of PCI cards in system, if not already done so /* Initialise list of PCI cards in system, if not already done so */
if (pci_list_builded++ == 0) { if (pci_list_builded++ == 0) {
pci_card_list_init(PCI_VENDOR_ID_ICP, pci_card_list_init(PCI_VENDOR_ID_ICP,
#ifdef ICP_MULTI_EXTDEBUG #ifdef ICP_MULTI_EXTDEBUG
......
drivers/staging/comedi/drivers/icp_multi.h
View file @ b6c77757
...@@ -28,7 +28,8 @@ struct pcilst_struct { ...@@ -28,7 +28,8 @@ struct pcilst_struct {
unsigned int irq; unsigned int irq;
}; };
struct pcilst_struct *inova_devices; // ptr to root list of all Inova devices struct pcilst_struct *inova_devices;
/* ptr to root list of all Inova devices */
/****************************************************************************/ /****************************************************************************/
...@@ -150,14 +151,14 @@ static int find_free_pci_card_by_position(unsigned short vendor_id, ...@@ -150,14 +151,14 @@ static int find_free_pci_card_by_position(unsigned short vendor_id,
&& (inova->pci_slot == pci_slot)) { && (inova->pci_slot == pci_slot)) {
if (!(inova->used)) { if (!(inova->used)) {
*card = inova; *card = inova;
return 0; // ok, card is found return 0; /* ok, card is found */
} else { } else {
return 2; // card exist but is used return 2; /* card exist but is used */
} }
} }
} }
return 1; // no card found return 1; /* no card found */
} }
/****************************************************************************/ /****************************************************************************/
...@@ -243,7 +244,7 @@ static struct pcilst_struct *select_and_alloc_pci_card(unsigned short vendor_id, ...@@ -243,7 +244,7 @@ static struct pcilst_struct *select_and_alloc_pci_card(unsigned short vendor_id,
struct pcilst_struct *card; struct pcilst_struct *card;
int err; int err;
if ((pci_bus < 1) & (pci_slot < 1)) { // use autodetection if ((pci_bus < 1) & (pci_slot < 1)) { /* use autodetection */
if ((card = find_free_pci_card_by_device(vendor_id, if ((card = find_free_pci_card_by_device(vendor_id,
device_id)) == NULL) { device_id)) == NULL) {
rt_printk(" - Unused card not found in system!\n"); rt_printk(" - Unused card not found in system!\n");
......
drivers/staging/comedi/drivers/me4000.c
View file @ b6c77757
...@@ -277,7 +277,7 @@ static int me4000_attach(comedi_device * dev, comedi_devconfig * it) ...@@ -277,7 +277,7 @@ static int me4000_attach(comedi_device * dev, comedi_devconfig * it)
s->subdev_flags = s->subdev_flags =
SDF_READABLE | SDF_COMMON | SDF_GROUND | SDF_DIFF; SDF_READABLE | SDF_COMMON | SDF_GROUND | SDF_DIFF;
s->n_chan = thisboard->ai.count; s->n_chan = thisboard->ai.count;
s->maxdata = 0xFFFF; // 16 bit ADC s->maxdata = 0xFFFF; /* 16 bit ADC */
s->len_chanlist = ME4000_AI_CHANNEL_LIST_COUNT; s->len_chanlist = ME4000_AI_CHANNEL_LIST_COUNT;
s->range_table = &me4000_ai_range; s->range_table = &me4000_ai_range;
s->insn_read = me4000_ai_insn_read; s->insn_read = me4000_ai_insn_read;
...@@ -312,7 +312,7 @@ static int me4000_attach(comedi_device * dev, comedi_devconfig * it) ...@@ -312,7 +312,7 @@ static int me4000_attach(comedi_device * dev, comedi_devconfig * it)
s->type = COMEDI_SUBD_AO; s->type = COMEDI_SUBD_AO;
s->subdev_flags = SDF_WRITEABLE | SDF_COMMON | SDF_GROUND; s->subdev_flags = SDF_WRITEABLE | SDF_COMMON | SDF_GROUND;
s->n_chan = thisboard->ao.count; s->n_chan = thisboard->ao.count;
s->maxdata = 0xFFFF; // 16 bit DAC s->maxdata = 0xFFFF; /* 16 bit DAC */
s->range_table = &me4000_ao_range; s->range_table = &me4000_ao_range;
s->insn_write = me4000_ao_insn_write; s->insn_write = me4000_ao_insn_write;
s->insn_read = me4000_ao_insn_read; s->insn_read = me4000_ao_insn_read;
...@@ -358,7 +358,7 @@ static int me4000_attach(comedi_device * dev, comedi_devconfig * it) ...@@ -358,7 +358,7 @@ static int me4000_attach(comedi_device * dev, comedi_devconfig * it)
s->type = COMEDI_SUBD_COUNTER; s->type = COMEDI_SUBD_COUNTER;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE; s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = thisboard->cnt.count; s->n_chan = thisboard->cnt.count;
s->maxdata = 0xFFFF; // 16 bit counters s->maxdata = 0xFFFF; /* 16 bit counters */
s->insn_read = me4000_cnt_insn_read; s->insn_read = me4000_cnt_insn_read;
s->insn_write = me4000_cnt_insn_write; s->insn_write = me4000_cnt_insn_write;
s->insn_config = me4000_cnt_insn_config; s->insn_config = me4000_cnt_insn_config;
...@@ -571,8 +571,8 @@ static int init_board_info(comedi_device * dev, struct pci_dev *pci_dev_p) ...@@ -571,8 +571,8 @@ static int init_board_info(comedi_device * dev, struct pci_dev *pci_dev_p)
CALL_PDEBUG("In init_board_info()\n"); CALL_PDEBUG("In init_board_info()\n");
/* Init spin locks */ /* Init spin locks */
//spin_lock_init(&info->preload_lock); /* spin_lock_init(&info->preload_lock); */
//spin_lock_init(&info->ai_ctrl_lock); /* spin_lock_init(&info->ai_ctrl_lock); */
/* Get the serial number */ /* Get the serial number */
result = pci_read_config_dword(pci_dev_p, 0x2C, &info->serial_no); result = pci_read_config_dword(pci_dev_p, 0x2C, &info->serial_no);
...@@ -605,7 +605,7 @@ static int init_ao_context(comedi_device * dev) ...@@ -605,7 +605,7 @@ static int init_ao_context(comedi_device * dev)
CALL_PDEBUG("In init_ao_context()\n"); CALL_PDEBUG("In init_ao_context()\n");
for (i = 0; i < thisboard->ao.count; i++) { for (i = 0; i < thisboard->ao.count; i++) {
//spin_lock_init(&info->ao_context[i].use_lock); /* spin_lock_init(&info->ao_context[i].use_lock); */
info->ao_context[i].irq = info->irq; info->ao_context[i].irq = info->irq;
switch (i) { switch (i) {
...@@ -1604,21 +1604,21 @@ static int me4000_ai_do_cmd_test(comedi_device * dev, ...@@ -1604,21 +1604,21 @@ static int me4000_ai_do_cmd_test(comedi_device * dev,
printk(KERN_ERR printk(KERN_ERR
"comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n", "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n",
dev->minor); dev->minor);
cmd->start_arg = 2000; // 66 ticks at least cmd->start_arg = 2000; /* 66 ticks at least */
err++; err++;
} }
if (chan_ticks < ME4000_AI_MIN_TICKS) { if (chan_ticks < ME4000_AI_MIN_TICKS) {
printk(KERN_ERR printk(KERN_ERR
"comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid convert arg\n", "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid convert arg\n",
dev->minor); dev->minor);
cmd->convert_arg = 2000; // 66 ticks at least cmd->convert_arg = 2000; /* 66 ticks at least */
err++; err++;
} }
if (scan_ticks <= cmd->chanlist_len * chan_ticks) { if (scan_ticks <= cmd->chanlist_len * chan_ticks) {
printk(KERN_ERR printk(KERN_ERR
"comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid scan end arg\n", "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid scan end arg\n",
dev->minor); dev->minor);
cmd->scan_end_arg = 2000 * cmd->chanlist_len + 31; // At least one tick more cmd->scan_end_arg = 2000 * cmd->chanlist_len + 31; /* At least one tick more */
err++; err++;
} }
} else if (cmd->start_src == TRIG_NOW && } else if (cmd->start_src == TRIG_NOW &&
...@@ -1630,14 +1630,14 @@ static int me4000_ai_do_cmd_test(comedi_device * dev, ...@@ -1630,14 +1630,14 @@ static int me4000_ai_do_cmd_test(comedi_device * dev,
printk(KERN_ERR printk(KERN_ERR
"comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n", "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n",
dev->minor); dev->minor);
cmd->start_arg = 2000; // 66 ticks at least cmd->start_arg = 2000; /* 66 ticks at least */
err++; err++;
} }
if (chan_ticks < ME4000_AI_MIN_TICKS) { if (chan_ticks < ME4000_AI_MIN_TICKS) {
printk(KERN_ERR printk(KERN_ERR
"comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid convert arg\n", "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid convert arg\n",
dev->minor); dev->minor);
cmd->convert_arg = 2000; // 66 ticks at least cmd->convert_arg = 2000; /* 66 ticks at least */
err++; err++;
} }
} else if (cmd->start_src == TRIG_EXT && } else if (cmd->start_src == TRIG_EXT &&
...@@ -1649,21 +1649,21 @@ static int me4000_ai_do_cmd_test(comedi_device * dev, ...@@ -1649,21 +1649,21 @@ static int me4000_ai_do_cmd_test(comedi_device * dev,
printk(KERN_ERR printk(KERN_ERR
"comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n", "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n",
dev->minor); dev->minor);
cmd->start_arg = 2000; // 66 ticks at least cmd->start_arg = 2000; /* 66 ticks at least */
err++; err++;
} }
if (chan_ticks < ME4000_AI_MIN_TICKS) { if (chan_ticks < ME4000_AI_MIN_TICKS) {
printk(KERN_ERR printk(KERN_ERR
"comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid convert arg\n", "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid convert arg\n",
dev->minor); dev->minor);
cmd->convert_arg = 2000; // 66 ticks at least cmd->convert_arg = 2000; /* 66 ticks at least */
err++; err++;
} }
if (scan_ticks <= cmd->chanlist_len * chan_ticks) { if (scan_ticks <= cmd->chanlist_len * chan_ticks) {
printk(KERN_ERR printk(KERN_ERR
"comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid scan end arg\n", "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid scan end arg\n",
dev->minor); dev->minor);
cmd->scan_end_arg = 2000 * cmd->chanlist_len + 31; // At least one tick more cmd->scan_end_arg = 2000 * cmd->chanlist_len + 31; /* At least one tick more */
err++; err++;
} }
} else if (cmd->start_src == TRIG_EXT && } else if (cmd->start_src == TRIG_EXT &&
...@@ -1675,14 +1675,14 @@ static int me4000_ai_do_cmd_test(comedi_device * dev, ...@@ -1675,14 +1675,14 @@ static int me4000_ai_do_cmd_test(comedi_device * dev,
printk(KERN_ERR printk(KERN_ERR
"comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n", "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n",
dev->minor); dev->minor);
cmd->start_arg = 2000; // 66 ticks at least cmd->start_arg = 2000; /* 66 ticks at least */
err++; err++;
} }
if (chan_ticks < ME4000_AI_MIN_TICKS) { if (chan_ticks < ME4000_AI_MIN_TICKS) {
printk(KERN_ERR printk(KERN_ERR
"comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid convert arg\n", "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid convert arg\n",
dev->minor); dev->minor);
cmd->convert_arg = 2000; // 66 ticks at least cmd->convert_arg = 2000; /* 66 ticks at least */
err++; err++;
} }
} else if (cmd->start_src == TRIG_EXT && } else if (cmd->start_src == TRIG_EXT &&
...@@ -1694,14 +1694,14 @@ static int me4000_ai_do_cmd_test(comedi_device * dev, ...@@ -1694,14 +1694,14 @@ static int me4000_ai_do_cmd_test(comedi_device * dev,
printk(KERN_ERR printk(KERN_ERR
"comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n", "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n",
dev->minor); dev->minor);
cmd->start_arg = 2000; // 66 ticks at least cmd->start_arg = 2000; /* 66 ticks at least */
err++; err++;
} }
if (chan_ticks < ME4000_AI_MIN_TICKS) { if (chan_ticks < ME4000_AI_MIN_TICKS) {
printk(KERN_ERR printk(KERN_ERR
"comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid convert arg\n", "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid convert arg\n",
dev->minor); dev->minor);
cmd->convert_arg = 2000; // 66 ticks at least cmd->convert_arg = 2000; /* 66 ticks at least */
err++; err++;
} }
} else if (cmd->start_src == TRIG_EXT && } else if (cmd->start_src == TRIG_EXT &&
...@@ -1713,7 +1713,7 @@ static int me4000_ai_do_cmd_test(comedi_device * dev, ...@@ -1713,7 +1713,7 @@ static int me4000_ai_do_cmd_test(comedi_device * dev,
printk(KERN_ERR printk(KERN_ERR
"comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n", "comedi%d: me4000: me4000_ai_do_cmd_test(): Invalid start arg\n",
dev->minor); dev->minor);
cmd->start_arg = 2000; // 66 ticks at least cmd->start_arg = 2000; /* 66 ticks at least */
err++; err++;
} }
} }
......
drivers/staging/comedi/drivers/me4000.h
View file @ b6c77757
...@@ -28,37 +28,37 @@ ...@@ -28,37 +28,37 @@
Debug section Debug section
===========================================================================*/ ===========================================================================*/
#undef ME4000_CALL_DEBUG // Debug function entry and exit #undef ME4000_CALL_DEBUG /* Debug function entry and exit */
#undef ME4000_PORT_DEBUG // Debug port access #undef ME4000_PORT_DEBUG /* Debug port access */
#undef ME4000_ISR_DEBUG // Debug the interrupt service routine #undef ME4000_ISR_DEBUG /* Debug the interrupt service routine */
#undef ME4000_DEBUG // General purpose debug masseges #undef ME4000_DEBUG /* General purpose debug masseges */
#ifdef ME4000_CALL_DEBUG #ifdef ME4000_CALL_DEBUG
#undef CALL_PDEBUG #undef CALL_PDEBUG
#define CALL_PDEBUG(fmt, args...) printk(KERN_DEBUG"comedi%d: me4000: " fmt, dev->minor, ##args) #define CALL_PDEBUG(fmt, args...) printk(KERN_DEBUG"comedi%d: me4000: " fmt, dev->minor, ##args)
#else #else
# define CALL_PDEBUG(fmt, args...) // no debugging, do nothing # define CALL_PDEBUG(fmt, args...) /* no debugging, do nothing */
#endif #endif
#ifdef ME4000_PORT_DEBUG #ifdef ME4000_PORT_DEBUG
#undef PORT_PDEBUG #undef PORT_PDEBUG
#define PORT_PDEBUG(fmt, args...) printk(KERN_DEBUG"comedi%d: me4000: " fmt, dev->minor, ##args) #define PORT_PDEBUG(fmt, args...) printk(KERN_DEBUG"comedi%d: me4000: " fmt, dev->minor, ##args)
#else #else
#define PORT_PDEBUG(fmt, args...) // no debugging, do nothing #define PORT_PDEBUG(fmt, args...) /* no debugging, do nothing */
#endif #endif
#ifdef ME4000_ISR_DEBUG #ifdef ME4000_ISR_DEBUG
#undef ISR_PDEBUG #undef ISR_PDEBUG
#define ISR_PDEBUG(fmt, args...) printk(KERN_DEBUG"comedi%d: me4000: " fmt, dev->minor, ##args) #define ISR_PDEBUG(fmt, args...) printk(KERN_DEBUG"comedi%d: me4000: " fmt, dev->minor, ##args)
#else #else
#define ISR_PDEBUG(fmt, args...) // no debugging, do nothing #define ISR_PDEBUG(fmt, args...) /* no debugging, do nothing */
#endif #endif
#ifdef ME4000_DEBUG #ifdef ME4000_DEBUG
#undef PDEBUG #undef PDEBUG
#define PDEBUG(fmt, args...) printk(KERN_DEBUG"comedi%d: me4000: " fmt, dev->minor, ##args) #define PDEBUG(fmt, args...) printk(KERN_DEBUG"comedi%d: me4000: " fmt, dev->minor, ##args)
#else #else
#define PDEBUG(fmt, args...) // no debugging, do nothing #define PDEBUG(fmt, args...) /* no debugging, do nothing */
#endif #endif
/*============================================================================= /*=============================================================================
...@@ -67,78 +67,78 @@ ...@@ -67,78 +67,78 @@
#define PCI_VENDOR_ID_MEILHAUS 0x1402 #define PCI_VENDOR_ID_MEILHAUS 0x1402
#define PCI_DEVICE_ID_MEILHAUS_ME4650 0x4650 // Low Cost version #define PCI_DEVICE_ID_MEILHAUS_ME4650 0x4650 /* Low Cost version */
#define PCI_DEVICE_ID_MEILHAUS_ME4660 0x4660 // Standard version #define PCI_DEVICE_ID_MEILHAUS_ME4660 0x4660 /* Standard version */
#define PCI_DEVICE_ID_MEILHAUS_ME4660I 0x4661 // Isolated version #define PCI_DEVICE_ID_MEILHAUS_ME4660I 0x4661 /* Isolated version */
#define PCI_DEVICE_ID_MEILHAUS_ME4660S 0x4662 // Standard version with Sample and Hold #define PCI_DEVICE_ID_MEILHAUS_ME4660S 0x4662 /* Standard version with Sample and Hold */
#define PCI_DEVICE_ID_MEILHAUS_ME4660IS 0x4663 // Isolated version with Sample and Hold #define PCI_DEVICE_ID_MEILHAUS_ME4660IS 0x4663 /* Isolated version with Sample and Hold */
#define PCI_DEVICE_ID_MEILHAUS_ME4670 0x4670 // Standard version #define PCI_DEVICE_ID_MEILHAUS_ME4670 0x4670 /* Standard version */
#define PCI_DEVICE_ID_MEILHAUS_ME4670I 0x4671 // Isolated version #define PCI_DEVICE_ID_MEILHAUS_ME4670I 0x4671 /* Isolated version */
#define PCI_DEVICE_ID_MEILHAUS_ME4670S 0x4672 // Standard version with Sample and Hold #define PCI_DEVICE_ID_MEILHAUS_ME4670S 0x4672 /* Standard version with Sample and Hold */
#define PCI_DEVICE_ID_MEILHAUS_ME4670IS 0x4673 // Isolated version with Sample and Hold #define PCI_DEVICE_ID_MEILHAUS_ME4670IS 0x4673 /* Isolated version with Sample and Hold */
#define PCI_DEVICE_ID_MEILHAUS_ME4680 0x4680 // Standard version #define PCI_DEVICE_ID_MEILHAUS_ME4680 0x4680 /* Standard version */
#define PCI_DEVICE_ID_MEILHAUS_ME4680I 0x4681 // Isolated version #define PCI_DEVICE_ID_MEILHAUS_ME4680I 0x4681 /* Isolated version */
#define PCI_DEVICE_ID_MEILHAUS_ME4680S 0x4682 // Standard version with Sample and Hold #define PCI_DEVICE_ID_MEILHAUS_ME4680S 0x4682 /* Standard version with Sample and Hold */
#define PCI_DEVICE_ID_MEILHAUS_ME4680IS 0x4683 // Isolated version with Sample and Hold #define PCI_DEVICE_ID_MEILHAUS_ME4680IS 0x4683 /* Isolated version with Sample and Hold */
/*============================================================================= /*=============================================================================
ME-4000 base register offsets ME-4000 base register offsets
===========================================================================*/ ===========================================================================*/
#define ME4000_AO_00_CTRL_REG 0x00 // R/W #define ME4000_AO_00_CTRL_REG 0x00 /* R/W */
#define ME4000_AO_00_STATUS_REG 0x04 // R/_ #define ME4000_AO_00_STATUS_REG 0x04 /* R/_ */
#define ME4000_AO_00_FIFO_REG 0x08 // _/W #define ME4000_AO_00_FIFO_REG 0x08 /* _/W */
#define ME4000_AO_00_SINGLE_REG 0x0C // R/W #define ME4000_AO_00_SINGLE_REG 0x0C /* R/W */
#define ME4000_AO_00_TIMER_REG 0x10 // _/W #define ME4000_AO_00_TIMER_REG 0x10 /* _/W */
#define ME4000_AO_01_CTRL_REG 0x18 // R/W #define ME4000_AO_01_CTRL_REG 0x18 /* R/W */
#define ME4000_AO_01_STATUS_REG 0x1C // R/_ #define ME4000_AO_01_STATUS_REG 0x1C /* R/_ */
#define ME4000_AO_01_FIFO_REG 0x20 // _/W #define ME4000_AO_01_FIFO_REG 0x20 /* _/W */
#define ME4000_AO_01_SINGLE_REG 0x24 // R/W #define ME4000_AO_01_SINGLE_REG 0x24 /* R/W */
#define ME4000_AO_01_TIMER_REG 0x28 // _/W #define ME4000_AO_01_TIMER_REG 0x28 /* _/W */
#define ME4000_AO_02_CTRL_REG 0x30 // R/W #define ME4000_AO_02_CTRL_REG 0x30 /* R/W */
#define ME4000_AO_02_STATUS_REG 0x34 // R/_ #define ME4000_AO_02_STATUS_REG 0x34 /* R/_ */
#define ME4000_AO_02_FIFO_REG 0x38 // _/W #define ME4000_AO_02_FIFO_REG 0x38 /* _/W */
#define ME4000_AO_02_SINGLE_REG 0x3C // R/W #define ME4000_AO_02_SINGLE_REG 0x3C /* R/W */
#define ME4000_AO_02_TIMER_REG 0x40 // _/W #define ME4000_AO_02_TIMER_REG 0x40 /* _/W */
#define ME4000_AO_03_CTRL_REG 0x48 // R/W #define ME4000_AO_03_CTRL_REG 0x48 /* R/W */
#define ME4000_AO_03_STATUS_REG 0x4C // R/_ #define ME4000_AO_03_STATUS_REG 0x4C /* R/_ */
#define ME4000_AO_03_FIFO_REG 0x50 // _/W #define ME4000_AO_03_FIFO_REG 0x50 /* _/W */
#define ME4000_AO_03_SINGLE_REG 0x54 // R/W #define ME4000_AO_03_SINGLE_REG 0x54 /* R/W */
#define ME4000_AO_03_TIMER_REG 0x58 // _/W #define ME4000_AO_03_TIMER_REG 0x58 /* _/W */
#define ME4000_AI_CTRL_REG 0x74 // _/W #define ME4000_AI_CTRL_REG 0x74 /* _/W */
#define ME4000_AI_STATUS_REG 0x74 // R/_ #define ME4000_AI_STATUS_REG 0x74 /* R/_ */
#define ME4000_AI_CHANNEL_LIST_REG 0x78 // _/W #define ME4000_AI_CHANNEL_LIST_REG 0x78 /* _/W */
#define ME4000_AI_DATA_REG 0x7C // R/_ #define ME4000_AI_DATA_REG 0x7C /* R/_ */
#define ME4000_AI_CHAN_TIMER_REG 0x80 // _/W #define ME4000_AI_CHAN_TIMER_REG 0x80 /* _/W */
#define ME4000_AI_CHAN_PRE_TIMER_REG 0x84 // _/W #define ME4000_AI_CHAN_PRE_TIMER_REG 0x84 /* _/W */
#define ME4000_AI_SCAN_TIMER_LOW_REG 0x88 // _/W #define ME4000_AI_SCAN_TIMER_LOW_REG 0x88 /* _/W */
#define ME4000_AI_SCAN_TIMER_HIGH_REG 0x8C // _/W #define ME4000_AI_SCAN_TIMER_HIGH_REG 0x8C /* _/W */
#define ME4000_AI_SCAN_PRE_TIMER_LOW_REG 0x90 // _/W #define ME4000_AI_SCAN_PRE_TIMER_LOW_REG 0x90 /* _/W */
#define ME4000_AI_SCAN_PRE_TIMER_HIGH_REG 0x94 // _/W #define ME4000_AI_SCAN_PRE_TIMER_HIGH_REG 0x94 /* _/W */
#define ME4000_AI_START_REG 0x98 // R/_ #define ME4000_AI_START_REG 0x98 /* R/_ */
#define ME4000_IRQ_STATUS_REG 0x9C // R/_ #define ME4000_IRQ_STATUS_REG 0x9C /* R/_ */
#define ME4000_DIO_PORT_0_REG 0xA0 // R/W #define ME4000_DIO_PORT_0_REG 0xA0 /* R/W */
#define ME4000_DIO_PORT_1_REG 0xA4 // R/W #define ME4000_DIO_PORT_1_REG 0xA4 /* R/W */
#define ME4000_DIO_PORT_2_REG 0xA8 // R/W #define ME4000_DIO_PORT_2_REG 0xA8 /* R/W */
#define ME4000_DIO_PORT_3_REG 0xAC // R/W #define ME4000_DIO_PORT_3_REG 0xAC /* R/W */
#define ME4000_DIO_DIR_REG 0xB0 // R/W #define ME4000_DIO_DIR_REG 0xB0 /* R/W */
#define ME4000_AO_LOADSETREG_XX 0xB4 // R/W #define ME4000_AO_LOADSETREG_XX 0xB4 /* R/W */
#define ME4000_DIO_CTRL_REG 0xB8 // R/W #define ME4000_DIO_CTRL_REG 0xB8 /* R/W */
#define ME4000_AO_DEMUX_ADJUST_REG 0xBC // -/W #define ME4000_AO_DEMUX_ADJUST_REG 0xBC /* -/W */
#define ME4000_AI_SAMPLE_COUNTER_REG 0xC0 // _/W #define ME4000_AI_SAMPLE_COUNTER_REG 0xC0 /* _/W */
/*============================================================================= /*=============================================================================
Value to adjust Demux Value to adjust Demux
...@@ -159,21 +159,21 @@ ...@@ -159,21 +159,21 @@
PLX base register offsets PLX base register offsets
===========================================================================*/ ===========================================================================*/
#define PLX_INTCSR 0x4C // Interrupt control and status register #define PLX_INTCSR 0x4C /* Interrupt control and status register */
#define PLX_ICR 0x50 // Initialization control register #define PLX_ICR 0x50 /* Initialization control register */
/*============================================================================= /*=============================================================================
Bits for the PLX_ICSR register Bits for the PLX_ICSR register
===========================================================================*/ ===========================================================================*/
#define PLX_INTCSR_LOCAL_INT1_EN 0x01 // If set, local interrupt 1 is enabled (r/w) #define PLX_INTCSR_LOCAL_INT1_EN 0x01 /* If set, local interrupt 1 is enabled (r/w) */
#define PLX_INTCSR_LOCAL_INT1_POL 0x02 // If set, local interrupt 1 polarity is active high (r/w) #define PLX_INTCSR_LOCAL_INT1_POL 0x02 /* If set, local interrupt 1 polarity is active high (r/w) */
#define PLX_INTCSR_LOCAL_INT1_STATE 0x04 // If set, local interrupt 1 is active (r/_) #define PLX_INTCSR_LOCAL_INT1_STATE 0x04 /* If set, local interrupt 1 is active (r/_) */
#define PLX_INTCSR_LOCAL_INT2_EN 0x08 // If set, local interrupt 2 is enabled (r/w) #define PLX_INTCSR_LOCAL_INT2_EN 0x08 /* If set, local interrupt 2 is enabled (r/w) */
#define PLX_INTCSR_LOCAL_INT2_POL 0x10 // If set, local interrupt 2 polarity is active high (r/w) #define PLX_INTCSR_LOCAL_INT2_POL 0x10 /* If set, local interrupt 2 polarity is active high (r/w) */
#define PLX_INTCSR_LOCAL_INT2_STATE 0x20 // If set, local interrupt 2 is active (r/_) #define PLX_INTCSR_LOCAL_INT2_STATE 0x20 /* If set, local interrupt 2 is active (r/_) */
#define PLX_INTCSR_PCI_INT_EN 0x40 // If set, PCI interrupt is enabled (r/w) #define PLX_INTCSR_PCI_INT_EN 0x40 /* If set, PCI interrupt is enabled (r/w) */
#define PLX_INTCSR_SOFT_INT 0x80 // If set, a software interrupt is generated (r/w) #define PLX_INTCSR_SOFT_INT 0x80 /* If set, a software interrupt is generated (r/w) */
/*============================================================================= /*=============================================================================
Bits for the PLX_ICR register Bits for the PLX_ICR register
...@@ -331,7 +331,7 @@ typedef struct me4000_board { ...@@ -331,7 +331,7 @@ typedef struct me4000_board {
typedef struct me4000_ao_context { typedef struct me4000_ao_context {
int irq; int irq;
unsigned long mirror; // Store the last written value unsigned long mirror; /* Store the last written value */
unsigned long ctrl_reg; unsigned long ctrl_reg;
unsigned long status_reg; unsigned long status_reg;
...@@ -377,29 +377,29 @@ typedef struct me4000_cnt_context { ...@@ -377,29 +377,29 @@ typedef struct me4000_cnt_context {
} me4000_cnt_context_t; } me4000_cnt_context_t;
typedef struct me4000_info { typedef struct me4000_info {
unsigned long plx_regbase; // PLX configuration space base address unsigned long plx_regbase; /* PLX configuration space base address */
unsigned long me4000_regbase; // Base address of the ME4000 unsigned long me4000_regbase; /* Base address of the ME4000 */
unsigned long timer_regbase; // Base address of the timer circuit unsigned long timer_regbase; /* Base address of the timer circuit */
unsigned long program_regbase; // Base address to set the program pin for the xilinx unsigned long program_regbase; /* Base address to set the program pin for the xilinx */
unsigned long plx_regbase_size; // PLX register set space unsigned long plx_regbase_size; /* PLX register set space */
unsigned long me4000_regbase_size; // ME4000 register set space unsigned long me4000_regbase_size; /* ME4000 register set space */
unsigned long timer_regbase_size; // Timer circuit register set space unsigned long timer_regbase_size; /* Timer circuit register set space */
unsigned long program_regbase_size; // Size of program base address of the ME4000 unsigned long program_regbase_size; /* Size of program base address of the ME4000 */
unsigned int serial_no; // Serial number of the board unsigned int serial_no; /* Serial number of the board */
unsigned char hw_revision; // Hardware revision of the board unsigned char hw_revision; /* Hardware revision of the board */
unsigned short vendor_id; // Meilhaus vendor id unsigned short vendor_id; /* Meilhaus vendor id */
unsigned short device_id; // Device id unsigned short device_id; /* Device id */
struct pci_dev *pci_dev_p; // General PCI information struct pci_dev *pci_dev_p; /* General PCI information */
unsigned int irq; // IRQ assigned from the PCI BIOS unsigned int irq; /* IRQ assigned from the PCI BIOS */
struct me4000_ai_context ai_context; // Analog input specific context struct me4000_ai_context ai_context; /* Analog input specific context */
struct me4000_ao_context ao_context[4]; // Vector with analog output specific context struct me4000_ao_context ao_context[4]; /* Vector with analog output specific context */
struct me4000_dio_context dio_context; // Digital I/O specific context struct me4000_dio_context dio_context; /* Digital I/O specific context */
struct me4000_cnt_context cnt_context; // Counter specific context struct me4000_cnt_context cnt_context; /* Counter specific context */
} me4000_info_t; } me4000_info_t;
#define info ((me4000_info_t *)dev->private) #define info ((me4000_info_t *)dev->private)
...@@ -412,7 +412,7 @@ typedef struct me4000_info { ...@@ -412,7 +412,7 @@ typedef struct me4000_info {
#define ME4000_AI_FIFO_COUNT 2048 #define ME4000_AI_FIFO_COUNT 2048
#define ME4000_AI_MIN_TICKS 66 #define ME4000_AI_MIN_TICKS 66
#define ME4000_AI_MIN_SAMPLE_TIME 2000 // Minimum sample time [ns] #define ME4000_AI_MIN_SAMPLE_TIME 2000 /* Minimum sample time [ns] */
#define ME4000_AI_BASE_FREQUENCY (unsigned int) 33E6 #define ME4000_AI_BASE_FREQUENCY (unsigned int) 33E6
/* Channel list defines and masks */ /* Channel list defines and masks */
...@@ -436,11 +436,11 @@ typedef struct me4000_info { ...@@ -436,11 +436,11 @@ typedef struct me4000_info {
#define ME4000_CNT_COUNTER_1 0x40 #define ME4000_CNT_COUNTER_1 0x40
#define ME4000_CNT_COUNTER_2 0x80 #define ME4000_CNT_COUNTER_2 0x80
#define ME4000_CNT_MODE_0 0x00 // Change state if zero crossing #define ME4000_CNT_MODE_0 0x00 /* Change state if zero crossing */
#define ME4000_CNT_MODE_1 0x02 // Retriggerable One-Shot #define ME4000_CNT_MODE_1 0x02 /* Retriggerable One-Shot */
#define ME4000_CNT_MODE_2 0x04 // Asymmetrical divider #define ME4000_CNT_MODE_2 0x04 /* Asymmetrical divider */
#define ME4000_CNT_MODE_3 0x06 // Symmetrical divider #define ME4000_CNT_MODE_3 0x06 /* Symmetrical divider */
#define ME4000_CNT_MODE_4 0x08 // Counter start by software trigger #define ME4000_CNT_MODE_4 0x08 /* Counter start by software trigger */
#define ME4000_CNT_MODE_5 0x0A // Counter start by hardware trigger #define ME4000_CNT_MODE_5 0x0A /* Counter start by hardware trigger */
#endif #endif
drivers/staging/comedi/drivers/mite.c
View file @ b6c77757
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
*/ */
//#define USE_KMALLOC /* #define USE_KMALLOC */
#include "mite.h" #include "mite.h"
...@@ -139,7 +139,7 @@ int mite_setup2(struct mite_struct *mite, unsigned use_iodwbsr_1) ...@@ -139,7 +139,7 @@ int mite_setup2(struct mite_struct *mite, unsigned use_iodwbsr_1)
addr = pci_resource_start(mite->pcidev, 1); addr = pci_resource_start(mite->pcidev, 1);
mite->daq_phys_addr = addr; mite->daq_phys_addr = addr;
length = pci_resource_len(mite->pcidev, 1); length = pci_resource_len(mite->pcidev, 1);
// In case of a 660x board, DAQ size is 8k instead of 4k (see as shown by lspci output) /* In case of a 660x board, DAQ size is 8k instead of 4k (see as shown by lspci output) */
mite->daq_io_addr = ioremap(mite->daq_phys_addr, length); mite->daq_io_addr = ioremap(mite->daq_phys_addr, length);
if (!mite->daq_io_addr) { if (!mite->daq_io_addr) {
printk("failed to remap daq io memory address\n"); printk("failed to remap daq io memory address\n");
...@@ -212,7 +212,7 @@ void mite_cleanup(void) ...@@ -212,7 +212,7 @@ void mite_cleanup(void)
void mite_unsetup(struct mite_struct *mite) void mite_unsetup(struct mite_struct *mite)
{ {
//unsigned long offset, start, length; /* unsigned long offset, start, length; */
if (!mite) if (!mite)
return; return;
...@@ -257,7 +257,7 @@ struct mite_channel *mite_request_channel_in_range(struct mite_struct *mite, ...@@ -257,7 +257,7 @@ struct mite_channel *mite_request_channel_in_range(struct mite_struct *mite,
unsigned long flags; unsigned long flags;
struct mite_channel *channel = NULL; struct mite_channel *channel = NULL;
// spin lock so mite_release_channel can be called safely from interrupts /* spin lock so mite_release_channel can be called safely from interrupts */
comedi_spin_lock_irqsave(&mite->lock, flags); comedi_spin_lock_irqsave(&mite->lock, flags);
for (i = min_channel; i <= max_channel; ++i) { for (i = min_channel; i <= max_channel; ++i) {
if (mite->channel_allocated[i] == 0) { if (mite->channel_allocated[i] == 0) {
...@@ -276,7 +276,7 @@ void mite_release_channel(struct mite_channel *mite_chan) ...@@ -276,7 +276,7 @@ void mite_release_channel(struct mite_channel *mite_chan)
struct mite_struct *mite = mite_chan->mite; struct mite_struct *mite = mite_chan->mite;
unsigned long flags; unsigned long flags;
// spin lock to prevent races with mite_request_channel /* spin lock to prevent races with mite_request_channel */
comedi_spin_lock_irqsave(&mite->lock, flags); comedi_spin_lock_irqsave(&mite->lock, flags);
if (mite->channel_allocated[mite_chan->channel]) { if (mite->channel_allocated[mite_chan->channel]) {
mite_dma_disarm(mite_chan); mite_dma_disarm(mite_chan);
...@@ -312,7 +312,7 @@ void mite_dma_arm(struct mite_channel *mite_chan) ...@@ -312,7 +312,7 @@ void mite_dma_arm(struct mite_channel *mite_chan)
writel(chor, mite->mite_io_addr + MITE_CHOR(mite_chan->channel)); writel(chor, mite->mite_io_addr + MITE_CHOR(mite_chan->channel));
mmiowb(); mmiowb();
comedi_spin_unlock_irqrestore(&mite->lock, flags); comedi_spin_unlock_irqrestore(&mite->lock, flags);
// mite_dma_tcr(mite, channel); /* mite_dma_tcr(mite, channel); */
} }
/**************************************/ /**************************************/
...@@ -466,7 +466,7 @@ u32 mite_bytes_in_transit(struct mite_channel * mite_chan) ...@@ -466,7 +466,7 @@ u32 mite_bytes_in_transit(struct mite_channel * mite_chan)
MITE_FCR(mite_chan->channel)) & 0x000000FF; MITE_FCR(mite_chan->channel)) & 0x000000FF;
} }
// returns lower bound for number of bytes transferred from device to memory /* returns lower bound for number of bytes transferred from device to memory */
u32 mite_bytes_written_to_memory_lb(struct mite_channel * mite_chan) u32 mite_bytes_written_to_memory_lb(struct mite_channel * mite_chan)
{ {
u32 device_byte_count; u32 device_byte_count;
...@@ -475,7 +475,7 @@ u32 mite_bytes_written_to_memory_lb(struct mite_channel * mite_chan) ...@@ -475,7 +475,7 @@ u32 mite_bytes_written_to_memory_lb(struct mite_channel * mite_chan)
return device_byte_count - mite_bytes_in_transit(mite_chan); return device_byte_count - mite_bytes_in_transit(mite_chan);
} }
// returns upper bound for number of bytes transferred from device to memory /* returns upper bound for number of bytes transferred from device to memory */
u32 mite_bytes_written_to_memory_ub(struct mite_channel * mite_chan) u32 mite_bytes_written_to_memory_ub(struct mite_channel * mite_chan)
{ {
u32 in_transit_count; u32 in_transit_count;
...@@ -484,7 +484,7 @@ u32 mite_bytes_written_to_memory_ub(struct mite_channel * mite_chan) ...@@ -484,7 +484,7 @@ u32 mite_bytes_written_to_memory_ub(struct mite_channel * mite_chan)
return mite_device_bytes_transferred(mite_chan) - in_transit_count; return mite_device_bytes_transferred(mite_chan) - in_transit_count;
} }
// returns lower bound for number of bytes read from memory for transfer to device /* returns lower bound for number of bytes read from memory for transfer to device */
u32 mite_bytes_read_from_memory_lb(struct mite_channel * mite_chan) u32 mite_bytes_read_from_memory_lb(struct mite_channel * mite_chan)
{ {
u32 device_byte_count; u32 device_byte_count;
...@@ -493,7 +493,7 @@ u32 mite_bytes_read_from_memory_lb(struct mite_channel * mite_chan) ...@@ -493,7 +493,7 @@ u32 mite_bytes_read_from_memory_lb(struct mite_channel * mite_chan)
return device_byte_count + mite_bytes_in_transit(mite_chan); return device_byte_count + mite_bytes_in_transit(mite_chan);
} }
// returns upper bound for number of bytes read from memory for transfer to device /* returns upper bound for number of bytes read from memory for transfer to device */
u32 mite_bytes_read_from_memory_ub(struct mite_channel * mite_chan) u32 mite_bytes_read_from_memory_ub(struct mite_channel * mite_chan)
{ {
u32 in_transit_count; u32 in_transit_count;
...@@ -533,7 +533,7 @@ int mite_sync_input_dma(struct mite_channel *mite_chan, comedi_async * async) ...@@ -533,7 +533,7 @@ int mite_sync_input_dma(struct mite_channel *mite_chan, comedi_async * async)
const unsigned bytes_per_scan = cfc_bytes_per_scan(async->subdevice); const unsigned bytes_per_scan = cfc_bytes_per_scan(async->subdevice);
old_alloc_count = async->buf_write_alloc_count; old_alloc_count = async->buf_write_alloc_count;
// write alloc as much as we can /* write alloc as much as we can */
comedi_buf_write_alloc(async, async->prealloc_bufsz); comedi_buf_write_alloc(async, async->prealloc_bufsz);
nbytes = mite_bytes_written_to_memory_lb(mite_chan); nbytes = mite_bytes_written_to_memory_lb(mite_chan);
...@@ -570,7 +570,7 @@ int mite_sync_output_dma(struct mite_channel *mite_chan, comedi_async * async) ...@@ -570,7 +570,7 @@ int mite_sync_output_dma(struct mite_channel *mite_chan, comedi_async * async)
async->cmd.stop_arg * cfc_bytes_per_scan(async->subdevice); async->cmd.stop_arg * cfc_bytes_per_scan(async->subdevice);
old_alloc_count = async->buf_read_alloc_count; old_alloc_count = async->buf_read_alloc_count;
// read alloc as much as we can /* read alloc as much as we can */
comedi_buf_read_alloc(async, async->prealloc_bufsz); comedi_buf_read_alloc(async, async->prealloc_bufsz);
nbytes_lb = mite_bytes_read_from_memory_lb(mite_chan); nbytes_lb = mite_bytes_read_from_memory_lb(mite_chan);
if (async->cmd.stop_src == TRIG_COUNT && if (async->cmd.stop_src == TRIG_COUNT &&
......
drivers/staging/comedi/drivers/mite.h
View file @ b6c77757
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#define PCI_VENDOR_ID_NATINST 0x1093 #define PCI_VENDOR_ID_NATINST 0x1093
// #define DEBUG_MITE /* #define DEBUG_MITE */
#define PCIMIO_COMPAT #define PCIMIO_COMPAT
#ifdef DEBUG_MITE #ifdef DEBUG_MITE
...@@ -179,83 +179,83 @@ enum mite_registers { ...@@ -179,83 +179,83 @@ enum mite_registers {
written and read back. The bits 0x1f always read as 1. written and read back. The bits 0x1f always read as 1.
The rest always read as zero. */ The rest always read as zero. */
MITE_UNKNOWN_DMA_BURST_REG = 0x28, MITE_UNKNOWN_DMA_BURST_REG = 0x28,
MITE_IODWBSR = 0xc0, //IO Device Window Base Size Register MITE_IODWBSR = 0xc0, /* IO Device Window Base Size Register */
MITE_IODWBSR_1 = 0xc4, // IO Device Window Base Size Register 1 MITE_IODWBSR_1 = 0xc4, /* IO Device Window Base Size Register 1 */
MITE_IODWCR_1 = 0xf4, MITE_IODWCR_1 = 0xf4,
MITE_PCI_CONFIG_OFFSET = 0x300, MITE_PCI_CONFIG_OFFSET = 0x300,
MITE_CSIGR = 0x460 //chip signature MITE_CSIGR = 0x460 /* chip signature */
}; };
static inline int MITE_CHOR(int channel) // channel operation static inline int MITE_CHOR(int channel) /* channel operation */
{ {
return CHAN_OFFSET(channel) + 0x0; return CHAN_OFFSET(channel) + 0x0;
}; };
static inline int MITE_CHCR(int channel) // channel control static inline int MITE_CHCR(int channel) /* channel control */
{ {
return CHAN_OFFSET(channel) + 0x4; return CHAN_OFFSET(channel) + 0x4;
}; };
static inline int MITE_TCR(int channel) // transfer count static inline int MITE_TCR(int channel) /* transfer count */
{ {
return CHAN_OFFSET(channel) + 0x8; return CHAN_OFFSET(channel) + 0x8;
}; };
static inline int MITE_MCR(int channel) // memory configuration static inline int MITE_MCR(int channel) /* memory configuration */
{ {
return CHAN_OFFSET(channel) + 0xc; return CHAN_OFFSET(channel) + 0xc;
}; };
static inline int MITE_MAR(int channel) // memory address static inline int MITE_MAR(int channel) /* memory address */
{ {
return CHAN_OFFSET(channel) + 0x10; return CHAN_OFFSET(channel) + 0x10;
}; };
static inline int MITE_DCR(int channel) // device configuration static inline int MITE_DCR(int channel) /* device configuration */
{ {
return CHAN_OFFSET(channel) + 0x14; return CHAN_OFFSET(channel) + 0x14;
}; };
static inline int MITE_DAR(int channel) // device address static inline int MITE_DAR(int channel) /* device address */
{ {
return CHAN_OFFSET(channel) + 0x18; return CHAN_OFFSET(channel) + 0x18;
}; };
static inline int MITE_LKCR(int channel) // link configuration static inline int MITE_LKCR(int channel) /* link configuration */
{ {
return CHAN_OFFSET(channel) + 0x1c; return CHAN_OFFSET(channel) + 0x1c;
}; };
static inline int MITE_LKAR(int channel) // link address static inline int MITE_LKAR(int channel) /* link address */
{ {
return CHAN_OFFSET(channel) + 0x20; return CHAN_OFFSET(channel) + 0x20;
}; };
static inline int MITE_LLKAR(int channel) // see mite section of tnt5002 manual static inline int MITE_LLKAR(int channel) /* see mite section of tnt5002 manual */
{ {
return CHAN_OFFSET(channel) + 0x24; return CHAN_OFFSET(channel) + 0x24;
}; };
static inline int MITE_BAR(int channel) // base address static inline int MITE_BAR(int channel) /* base address */
{ {
return CHAN_OFFSET(channel) + 0x28; return CHAN_OFFSET(channel) + 0x28;
}; };
static inline int MITE_BCR(int channel) // base count static inline int MITE_BCR(int channel) /* base count */
{ {
return CHAN_OFFSET(channel) + 0x2c; return CHAN_OFFSET(channel) + 0x2c;
}; };
static inline int MITE_SAR(int channel) // ? address static inline int MITE_SAR(int channel) /* ? address */
{ {
return CHAN_OFFSET(channel) + 0x30; return CHAN_OFFSET(channel) + 0x30;
}; };
static inline int MITE_WSCR(int channel) // ? static inline int MITE_WSCR(int channel) /* ? */
{ {
return CHAN_OFFSET(channel) + 0x34; return CHAN_OFFSET(channel) + 0x34;
}; };
static inline int MITE_WSER(int channel) // ? static inline int MITE_WSER(int channel) /* ? */
{ {
return CHAN_OFFSET(channel) + 0x38; return CHAN_OFFSET(channel) + 0x38;
}; };
static inline int MITE_CHSR(int channel) // channel status static inline int MITE_CHSR(int channel) /* channel status */
{ {
return CHAN_OFFSET(channel) + 0x3c; return CHAN_OFFSET(channel) + 0x3c;
}; };
static inline int MITE_FCR(int channel) // fifo count static inline int MITE_FCR(int channel) /* fifo count */
{ {
return CHAN_OFFSET(channel) + 0x40; return CHAN_OFFSET(channel) + 0x40;
}; };
enum MITE_IODWBSR_bits { enum MITE_IODWBSR_bits {
WENAB = 0x80, // window enable WENAB = 0x80, /* window enable */
}; };
static inline unsigned MITE_IODWBSR_1_WSIZE_bits(unsigned size) static inline unsigned MITE_IODWBSR_1_WSIZE_bits(unsigned size)
...@@ -276,23 +276,23 @@ static inline int mite_csigr_version(u32 csigr_bits) ...@@ -276,23 +276,23 @@ static inline int mite_csigr_version(u32 csigr_bits)
return csigr_bits & 0xf; return csigr_bits & 0xf;
}; };
static inline int mite_csigr_type(u32 csigr_bits) static inline int mite_csigr_type(u32 csigr_bits)
{ // original mite = 0, minimite = 1 { /* original mite = 0, minimite = 1 */
return (csigr_bits >> 4) & 0xf; return (csigr_bits >> 4) & 0xf;
}; };
static inline int mite_csigr_mmode(u32 csigr_bits) static inline int mite_csigr_mmode(u32 csigr_bits)
{ // mite mode, minimite = 1 { /* mite mode, minimite = 1 */
return (csigr_bits >> 8) & 0x3; return (csigr_bits >> 8) & 0x3;
}; };
static inline int mite_csigr_imode(u32 csigr_bits) static inline int mite_csigr_imode(u32 csigr_bits)
{ // cpu port interface mode, pci = 0x3 { /* cpu port interface mode, pci = 0x3 */
return (csigr_bits >> 12) & 0x3; return (csigr_bits >> 12) & 0x3;
}; };
static inline int mite_csigr_dmac(u32 csigr_bits) static inline int mite_csigr_dmac(u32 csigr_bits)
{ // number of dma channels { /* number of dma channels */
return (csigr_bits >> 16) & 0xf; return (csigr_bits >> 16) & 0xf;
}; };
static inline int mite_csigr_wpdep(u32 csigr_bits) static inline int mite_csigr_wpdep(u32 csigr_bits)
{ // write post fifo depth { /* write post fifo depth */
unsigned int wpdep_bits = (csigr_bits >> 20) & 0x7; unsigned int wpdep_bits = (csigr_bits >> 20) & 0x7;
if (wpdep_bits == 0) if (wpdep_bits == 0)
return 0; return 0;
...@@ -304,7 +304,7 @@ static inline int mite_csigr_wins(u32 csigr_bits) ...@@ -304,7 +304,7 @@ static inline int mite_csigr_wins(u32 csigr_bits)
return (csigr_bits >> 24) & 0x1f; return (csigr_bits >> 24) & 0x1f;
}; };
static inline int mite_csigr_iowins(u32 csigr_bits) static inline int mite_csigr_iowins(u32 csigr_bits)
{ // number of io windows { /* number of io windows */
return (csigr_bits >> 29) & 0x7; return (csigr_bits >> 29) & 0x7;
}; };
......
drivers/staging/comedi/drivers/plx9080.h
View file @ b6c77757
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#ifndef __COMEDI_PLX9080_H #ifndef __COMEDI_PLX9080_H
#define __COMEDI_PLX9080_H #define __COMEDI_PLX9080_H
// descriptor block used for chained dma transfers /* descriptor block used for chained dma transfers */
struct plx_dma_desc { struct plx_dma_desc {
volatile uint32_t pci_start_addr; volatile uint32_t pci_start_addr;
volatile uint32_t local_start_addr; volatile uint32_t local_start_addr;
...@@ -52,14 +52,14 @@ struct plx_dma_desc { ...@@ -52,14 +52,14 @@ struct plx_dma_desc {
#define LRNG_ANY32 0x00000000 /* Locate anywhere in 32 bit */ #define LRNG_ANY32 0x00000000 /* Locate anywhere in 32 bit */
#define LRNG_LT1MB 0x00000002 /* Locate in 1st meg */ #define LRNG_LT1MB 0x00000002 /* Locate in 1st meg */
#define LRNG_ANY64 0x00000004 /* Locate anywhere in 64 bit */ #define LRNG_ANY64 0x00000004 /* Locate anywhere in 64 bit */
#define LRNG_MEM_MASK 0xfffffff0 // bits that specify range for memory io #define LRNG_MEM_MASK 0xfffffff0 /* bits that specify range for memory io */
#define LRNG_IO_MASK 0xfffffffa // bits that specify range for normal io #define LRNG_IO_MASK 0xfffffffa /* bits that specify range for normal io */
#define PLX_LAS0MAP_REG 0x0004 /* L, Local Addr Space 0 Remap Register */ #define PLX_LAS0MAP_REG 0x0004 /* L, Local Addr Space 0 Remap Register */
#define PLX_LAS1MAP_REG 0x00f4 /* L, Local Addr Space 1 Remap Register */ #define PLX_LAS1MAP_REG 0x00f4 /* L, Local Addr Space 1 Remap Register */
#define LMAP_EN 0x00000001 /* Enable slave decode */ #define LMAP_EN 0x00000001 /* Enable slave decode */
#define LMAP_MEM_MASK 0xfffffff0 // bits that specify decode for memory io #define LMAP_MEM_MASK 0xfffffff0 /* bits that specify decode for memory io */
#define LMAP_IO_MASK 0xfffffffa // bits that specify decode bits for normal io #define LMAP_IO_MASK 0xfffffffa /* bits that specify decode bits for normal io */
/* Mode/Arbitration Register. /* Mode/Arbitration Register.
*/ */
...@@ -169,7 +169,7 @@ enum bigend_bits { ...@@ -169,7 +169,7 @@ enum bigend_bits {
#define ICS_AERR 0x00000001 /* Assert LSERR on ABORT */ #define ICS_AERR 0x00000001 /* Assert LSERR on ABORT */
#define ICS_PERR 0x00000002 /* Assert LSERR on Parity Error */ #define ICS_PERR 0x00000002 /* Assert LSERR on Parity Error */
#define ICS_SERR 0x00000004 /* Generate PCI SERR# */ #define ICS_SERR 0x00000004 /* Generate PCI SERR# */
#define ICS_MBIE 0x00000008 // mailbox interrupt enable #define ICS_MBIE 0x00000008 /* mailbox interrupt enable */
#define ICS_PIE 0x00000100 /* PCI Interrupt Enable */ #define ICS_PIE 0x00000100 /* PCI Interrupt Enable */
#define ICS_PDIE 0x00000200 /* PCI Doorbell Interrupt Enable */ #define ICS_PDIE 0x00000200 /* PCI Doorbell Interrupt Enable */
#define ICS_PAIE 0x00000400 /* PCI Abort Interrupt Enable */ #define ICS_PAIE 0x00000400 /* PCI Abort Interrupt Enable */
...@@ -190,7 +190,7 @@ enum bigend_bits { ...@@ -190,7 +190,7 @@ enum bigend_bits {
#define ICS_TA_DMA0 0x02000000 /* Target Abort - DMA #0 */ #define ICS_TA_DMA0 0x02000000 /* Target Abort - DMA #0 */
#define ICS_TA_DMA1 0x04000000 /* Target Abort - DMA #1 */ #define ICS_TA_DMA1 0x04000000 /* Target Abort - DMA #1 */
#define ICS_TA_RA 0x08000000 /* Target Abort - Retry Timeout */ #define ICS_TA_RA 0x08000000 /* Target Abort - Retry Timeout */
#define ICS_MBIA(x) (0x10000000 << ((x) & 0x3)) // mailbox x is active #define ICS_MBIA(x) (0x10000000 << ((x) & 0x3)) /* mailbox x is active */
#define PLX_CONTROL_REG 0x006C /* L, EEPROM Cntl & PCI Cmd Codes */ #define PLX_CONTROL_REG 0x006C /* L, EEPROM Cntl & PCI Cmd Codes */
#define CTL_RDMA 0x0000000E /* DMA Read Command */ #define CTL_RDMA 0x0000000E /* DMA Read Command */
...@@ -208,51 +208,51 @@ enum bigend_bits { ...@@ -208,51 +208,51 @@ enum bigend_bits {
#define CTL_RESET 0x40000000 /* !! Adapter Reset !! */ #define CTL_RESET 0x40000000 /* !! Adapter Reset !! */
#define CTL_READY 0x80000000 /* Local Init Done */ #define CTL_READY 0x80000000 /* Local Init Done */
#define PLX_ID_REG 0x70 // hard-coded plx vendor and device ids #define PLX_ID_REG 0x70 /* hard-coded plx vendor and device ids */
#define PLX_REVISION_REG 0x74 // silicon revision #define PLX_REVISION_REG 0x74 /* silicon revision */
#define PLX_DMA0_MODE_REG 0x80 // dma channel 0 mode register #define PLX_DMA0_MODE_REG 0x80 /* dma channel 0 mode register */
#define PLX_DMA1_MODE_REG 0x94 // dma channel 0 mode register #define PLX_DMA1_MODE_REG 0x94 /* dma channel 0 mode register */
#define PLX_LOCAL_BUS_16_WIDE_BITS 0x1 #define PLX_LOCAL_BUS_16_WIDE_BITS 0x1
#define PLX_LOCAL_BUS_32_WIDE_BITS 0x3 #define PLX_LOCAL_BUS_32_WIDE_BITS 0x3
#define PLX_LOCAL_BUS_WIDTH_MASK 0x3 #define PLX_LOCAL_BUS_WIDTH_MASK 0x3
#define PLX_DMA_EN_READYIN_BIT 0x40 // enable ready in input #define PLX_DMA_EN_READYIN_BIT 0x40 /* enable ready in input */
#define PLX_EN_BTERM_BIT 0x80 // enable BTERM# input #define PLX_EN_BTERM_BIT 0x80 /* enable BTERM# input */
#define PLX_DMA_LOCAL_BURST_EN_BIT 0x100 // enable local burst mode #define PLX_DMA_LOCAL_BURST_EN_BIT 0x100 /* enable local burst mode */
#define PLX_EN_CHAIN_BIT 0x200 // enables chaining #define PLX_EN_CHAIN_BIT 0x200 /* enables chaining */
#define PLX_EN_DMA_DONE_INTR_BIT 0x400 // enables interrupt on dma done #define PLX_EN_DMA_DONE_INTR_BIT 0x400 /* enables interrupt on dma done */
#define PLX_LOCAL_ADDR_CONST_BIT 0x800 // hold local address constant (don't increment) #define PLX_LOCAL_ADDR_CONST_BIT 0x800 /* hold local address constant (don't increment) */
#define PLX_DEMAND_MODE_BIT 0x1000 // enables demand-mode for dma transfer #define PLX_DEMAND_MODE_BIT 0x1000 /* enables demand-mode for dma transfer */
#define PLX_EOT_ENABLE_BIT 0x4000 #define PLX_EOT_ENABLE_BIT 0x4000
#define PLX_STOP_MODE_BIT 0x8000 #define PLX_STOP_MODE_BIT 0x8000
#define PLX_DMA_INTR_PCI_BIT 0x20000 // routes dma interrupt to pci bus (instead of local bus) #define PLX_DMA_INTR_PCI_BIT 0x20000 /* routes dma interrupt to pci bus (instead of local bus) */
#define PLX_DMA0_PCI_ADDRESS_REG 0x84 // pci address that dma transfers start at #define PLX_DMA0_PCI_ADDRESS_REG 0x84 /* pci address that dma transfers start at */
#define PLX_DMA1_PCI_ADDRESS_REG 0x98 #define PLX_DMA1_PCI_ADDRESS_REG 0x98
#define PLX_DMA0_LOCAL_ADDRESS_REG 0x88 // local address that dma transfers start at #define PLX_DMA0_LOCAL_ADDRESS_REG 0x88 /* local address that dma transfers start at */
#define PLX_DMA1_LOCAL_ADDRESS_REG 0x9c #define PLX_DMA1_LOCAL_ADDRESS_REG 0x9c
#define PLX_DMA0_TRANSFER_SIZE_REG 0x8c // number of bytes to transfer (first 23 bits) #define PLX_DMA0_TRANSFER_SIZE_REG 0x8c /* number of bytes to transfer (first 23 bits) */
#define PLX_DMA1_TRANSFER_SIZE_REG 0xa0 #define PLX_DMA1_TRANSFER_SIZE_REG 0xa0
#define PLX_DMA0_DESCRIPTOR_REG 0x90 // descriptor pointer register #define PLX_DMA0_DESCRIPTOR_REG 0x90 /* descriptor pointer register */
#define PLX_DMA1_DESCRIPTOR_REG 0xa4 #define PLX_DMA1_DESCRIPTOR_REG 0xa4
#define PLX_DESC_IN_PCI_BIT 0x1 // descriptor is located in pci space (not local space) #define PLX_DESC_IN_PCI_BIT 0x1 /* descriptor is located in pci space (not local space) */
#define PLX_END_OF_CHAIN_BIT 0x2 // end of chain bit #define PLX_END_OF_CHAIN_BIT 0x2 /* end of chain bit */
#define PLX_INTR_TERM_COUNT 0x4 // interrupt when this descriptor's transfer is finished #define PLX_INTR_TERM_COUNT 0x4 /* interrupt when this descriptor's transfer is finished */
#define PLX_XFER_LOCAL_TO_PCI 0x8 // transfer from local to pci bus (not pci to local) #define PLX_XFER_LOCAL_TO_PCI 0x8 /* transfer from local to pci bus (not pci to local) */
#define PLX_DMA0_CS_REG 0xa8 // command status register #define PLX_DMA0_CS_REG 0xa8 /* command status register */
#define PLX_DMA1_CS_REG 0xa9 #define PLX_DMA1_CS_REG 0xa9
#define PLX_DMA_EN_BIT 0x1 // enable dma channel #define PLX_DMA_EN_BIT 0x1 /* enable dma channel */
#define PLX_DMA_START_BIT 0x2 // start dma transfer #define PLX_DMA_START_BIT 0x2 /* start dma transfer */
#define PLX_DMA_ABORT_BIT 0x4 // abort dma transfer #define PLX_DMA_ABORT_BIT 0x4 /* abort dma transfer */
#define PLX_CLEAR_DMA_INTR_BIT 0x8 // clear dma interrupt #define PLX_CLEAR_DMA_INTR_BIT 0x8 /* clear dma interrupt */
#define PLX_DMA_DONE_BIT 0x10 // transfer done status bit #define PLX_DMA_DONE_BIT 0x10 /* transfer done status bit */
#define PLX_DMA0_THRESHOLD_REG 0xb0 // command status register #define PLX_DMA0_THRESHOLD_REG 0xb0 /* command status register */
/* /*
* Accesses near the end of memory can cause the PLX chip * Accesses near the end of memory can cause the PLX chip
...@@ -392,12 +392,12 @@ static inline int plx9080_abort_dma(void *iobase, unsigned int channel) ...@@ -392,12 +392,12 @@ static inline int plx9080_abort_dma(void *iobase, unsigned int channel)
else else
dma_cs_addr = iobase + PLX_DMA0_CS_REG; dma_cs_addr = iobase + PLX_DMA0_CS_REG;
// abort dma transfer if necessary /* abort dma transfer if necessary */
dma_status = readb(dma_cs_addr); dma_status = readb(dma_cs_addr);
if ((dma_status & PLX_DMA_EN_BIT) == 0) { if ((dma_status & PLX_DMA_EN_BIT) == 0) {
return 0; return 0;
} }
// wait to make sure done bit is zero /* wait to make sure done bit is zero */
for (i = 0; (dma_status & PLX_DMA_DONE_BIT) && i < timeout; i++) { for (i = 0; (dma_status & PLX_DMA_DONE_BIT) && i < timeout; i++) {
comedi_udelay(1); comedi_udelay(1);
dma_status = readb(dma_cs_addr); dma_status = readb(dma_cs_addr);
...@@ -408,9 +408,9 @@ static inline int plx9080_abort_dma(void *iobase, unsigned int channel) ...@@ -408,9 +408,9 @@ static inline int plx9080_abort_dma(void *iobase, unsigned int channel)
channel); channel);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
// disable and abort channel /* disable and abort channel */
writeb(PLX_DMA_ABORT_BIT, dma_cs_addr); writeb(PLX_DMA_ABORT_BIT, dma_cs_addr);
// wait for dma done bit /* wait for dma done bit */
dma_status = readb(dma_cs_addr); dma_status = readb(dma_cs_addr);
for (i = 0; (dma_status & PLX_DMA_DONE_BIT) == 0 && i < timeout; i++) { for (i = 0; (dma_status & PLX_DMA_DONE_BIT) == 0 && i < timeout; i++) {
comedi_udelay(1); comedi_udelay(1);
......
drivers/staging/comedi/drivers/rtd520.c
View file @ b6c77757
...@@ -704,7 +704,7 @@ static int rtd_ai_cmdtest(comedi_device * dev, comedi_subdevice * s, ...@@ -704,7 +704,7 @@ static int rtd_ai_cmdtest(comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd); comedi_cmd * cmd);
static int rtd_ai_cmd(comedi_device * dev, comedi_subdevice * s); static int rtd_ai_cmd(comedi_device * dev, comedi_subdevice * s);
static int rtd_ai_cancel(comedi_device * dev, comedi_subdevice * s); static int rtd_ai_cancel(comedi_device * dev, comedi_subdevice * s);
//static int rtd_ai_poll (comedi_device *dev,comedi_subdevice *s); /* static int rtd_ai_poll (comedi_device *dev,comedi_subdevice *s); */
static int rtd_ns_to_timer(unsigned int *ns, int roundMode); static int rtd_ns_to_timer(unsigned int *ns, int roundMode);
static irqreturn_t rtd_interrupt(int irq, void *d PT_REGS_ARG); static irqreturn_t rtd_interrupt(int irq, void *d PT_REGS_ARG);
static int rtd520_probe_fifo_depth(comedi_device *dev); static int rtd520_probe_fifo_depth(comedi_device *dev);
...@@ -866,7 +866,7 @@ static int rtd_attach(comedi_device * dev, comedi_devconfig * it) ...@@ -866,7 +866,7 @@ static int rtd_attach(comedi_device * dev, comedi_devconfig * it)
s->do_cmd = rtd_ai_cmd; s->do_cmd = rtd_ai_cmd;
s->do_cmdtest = rtd_ai_cmdtest; s->do_cmdtest = rtd_ai_cmdtest;
s->cancel = rtd_ai_cancel; s->cancel = rtd_ai_cancel;
/*s->poll = rtd_ai_poll; *//* not ready yet */ /* s->poll = rtd_ai_poll; */ /* not ready yet */
s = dev->subdevices + 1; s = dev->subdevices + 1;
/* analog output subdevice */ /* analog output subdevice */
...@@ -1005,7 +1005,7 @@ static int rtd_attach(comedi_device * dev, comedi_devconfig * it) ...@@ -1005,7 +1005,7 @@ static int rtd_attach(comedi_device * dev, comedi_devconfig * it)
#if 0 #if 0
/* hit an error, clean up memory and return ret */ /* hit an error, clean up memory and return ret */
//rtd_attach_die_error: /* rtd_attach_die_error: */
#ifdef USE_DMA #ifdef USE_DMA
for (index = 0; index < DMA_CHAIN_COUNT; index++) { for (index = 0; index < DMA_CHAIN_COUNT; index++) {
if (NULL != devpriv->dma0Buff[index]) { /* free buffer memory */ if (NULL != devpriv->dma0Buff[index]) { /* free buffer memory */
...@@ -1377,15 +1377,15 @@ void abort_dma(comedi_device * dev, unsigned int channel) ...@@ -1377,15 +1377,15 @@ void abort_dma(comedi_device * dev, unsigned int channel)
unsigned long dma_cs_addr; /* the control/status register */ unsigned long dma_cs_addr; /* the control/status register */
uint8_t status; uint8_t status;
unsigned int ii; unsigned int ii;
//unsigned long flags; /* unsigned long flags; */
dma_cs_addr = (unsigned long)devpriv->lcfg dma_cs_addr = (unsigned long)devpriv->lcfg
+ ((channel == 0) ? LCFG_DMACSR0 : LCFG_DMACSR1); + ((channel == 0) ? LCFG_DMACSR0 : LCFG_DMACSR1);
// spinlock for plx dma control/status reg /* spinlock for plx dma control/status reg */
//comedi_spin_lock_irqsave( &dev->spinlock, flags ); /* comedi_spin_lock_irqsave( &dev->spinlock, flags ); */
// abort dma transfer if necessary /* abort dma transfer if necessary */
status = readb(dma_cs_addr); status = readb(dma_cs_addr);
if ((status & PLX_DMA_EN_BIT) == 0) { /* not enabled (Error?) */ if ((status & PLX_DMA_EN_BIT) == 0) { /* not enabled (Error?) */
DPRINTK("rtd520: AbortDma on non-active channel %d (0x%x)\n", DPRINTK("rtd520: AbortDma on non-active channel %d (0x%x)\n",
...@@ -1410,7 +1410,7 @@ void abort_dma(comedi_device * dev, unsigned int channel) ...@@ -1410,7 +1410,7 @@ void abort_dma(comedi_device * dev, unsigned int channel)
/* set abort bit for channel */ /* set abort bit for channel */
writeb(PLX_DMA_ABORT_BIT, dma_cs_addr); writeb(PLX_DMA_ABORT_BIT, dma_cs_addr);
// wait for dma done bit to be set /* wait for dma done bit to be set */
status = readb(dma_cs_addr); status = readb(dma_cs_addr);
for (ii = 0; for (ii = 0;
(status & PLX_DMA_DONE_BIT) == 0 && ii < RTD_DMA_TIMEOUT; (status & PLX_DMA_DONE_BIT) == 0 && ii < RTD_DMA_TIMEOUT;
...@@ -1424,7 +1424,7 @@ void abort_dma(comedi_device * dev, unsigned int channel) ...@@ -1424,7 +1424,7 @@ void abort_dma(comedi_device * dev, unsigned int channel)
} }
abortDmaExit: abortDmaExit:
//comedi_spin_unlock_irqrestore( &dev->spinlock, flags ); /* comedi_spin_unlock_irqrestore( &dev->spinlock, flags ); */
} }
/* /*
......
drivers/staging/comedi/drivers/rtd520.h
View file @ b6c77757
...@@ -29,366 +29,366 @@ ...@@ -29,366 +29,366 @@
LAS0 Runtime Area LAS0 Runtime Area
Local Address Space 0 Offset Read Function Write Function Local Address Space 0 Offset Read Function Write Function
*/ */
#define LAS0_SPARE_00 0x0000 // - - #define LAS0_SPARE_00 0x0000 /* - - */
#define LAS0_SPARE_04 0x0004 // - - #define LAS0_SPARE_04 0x0004 /* - - */
#define LAS0_USER_IO 0x0008 // Read User Inputs Write User Outputs #define LAS0_USER_IO 0x0008 /* Read User Inputs Write User Outputs */
#define LAS0_SPARE_0C 0x000C // - - #define LAS0_SPARE_0C 0x000C /* - - */
#define LAS0_ADC 0x0010 // Read FIFO Status Software A/D Start #define LAS0_ADC 0x0010 /* Read FIFO Status Software A/D Start */
#define LAS0_DAC1 0x0014 // - Software D/A1 Update #define LAS0_DAC1 0x0014 /* - Software D/A1 Update */
#define LAS0_DAC2 0x0018 // - Software D/A2 Update #define LAS0_DAC2 0x0018 /* - Software D/A2 Update */
#define LAS0_SPARE_1C 0x001C // - - #define LAS0_SPARE_1C 0x001C /* - - */
#define LAS0_SPARE_20 0x0020 // - - #define LAS0_SPARE_20 0x0020 /* - - */
#define LAS0_DAC 0x0024 // - Software Simultaneous D/A1 and D/A2 Update #define LAS0_DAC 0x0024 /* - Software Simultaneous D/A1 and D/A2 Update */
#define LAS0_PACER 0x0028 // Software Pacer Start Software Pacer Stop #define LAS0_PACER 0x0028 /* Software Pacer Start Software Pacer Stop */
#define LAS0_TIMER 0x002C // Read Timer Counters Status HDIN Software Trigger #define LAS0_TIMER 0x002C /* Read Timer Counters Status HDIN Software Trigger */
#define LAS0_IT 0x0030 // Read Interrupt Status Write Interrupt Enable Mask Register #define LAS0_IT 0x0030 /* Read Interrupt Status Write Interrupt Enable Mask Register */
#define LAS0_CLEAR 0x0034 // Clear ITs set by Clear Mask Set Interrupt Clear Mask #define LAS0_CLEAR 0x0034 /* Clear ITs set by Clear Mask Set Interrupt Clear Mask */
#define LAS0_OVERRUN 0x0038 // Read pending interrupts Clear Overrun Register #define LAS0_OVERRUN 0x0038 /* Read pending interrupts Clear Overrun Register */
#define LAS0_SPARE_3C 0x003C // - - #define LAS0_SPARE_3C 0x003C /* - - */
/* /*
LAS0 Runtime Area Timer/Counter,Dig.IO LAS0 Runtime Area Timer/Counter,Dig.IO
Name Local Address Function Name Local Address Function
*/ */
#define LAS0_PCLK 0x0040 // Pacer Clock value (24bit) Pacer Clock load (24bit) #define LAS0_PCLK 0x0040 /* Pacer Clock value (24bit) Pacer Clock load (24bit) */
#define LAS0_BCLK 0x0044 // Burst Clock value (10bit) Burst Clock load (10bit) #define LAS0_BCLK 0x0044 /* Burst Clock value (10bit) Burst Clock load (10bit) */
#define LAS0_ADC_SCNT 0x0048 // A/D Sample counter value (10bit) A/D Sample counter load (10bit) #define LAS0_ADC_SCNT 0x0048 /* A/D Sample counter value (10bit) A/D Sample counter load (10bit) */
#define LAS0_DAC1_UCNT 0x004C // D/A1 Update counter value (10 bit) D/A1 Update counter load (10bit) #define LAS0_DAC1_UCNT 0x004C /* D/A1 Update counter value (10 bit) D/A1 Update counter load (10bit) */
#define LAS0_DAC2_UCNT 0x0050 // D/A2 Update counter value (10 bit) D/A2 Update counter load (10bit) #define LAS0_DAC2_UCNT 0x0050 /* D/A2 Update counter value (10 bit) D/A2 Update counter load (10bit) */
#define LAS0_DCNT 0x0054 // Delay counter value (16 bit) Delay counter load (16bit) #define LAS0_DCNT 0x0054 /* Delay counter value (16 bit) Delay counter load (16bit) */
#define LAS0_ACNT 0x0058 // About counter value (16 bit) About counter load (16bit) #define LAS0_ACNT 0x0058 /* About counter value (16 bit) About counter load (16bit) */
#define LAS0_DAC_CLK 0x005C // DAC clock value (16bit) DAC clock load (16bit) #define LAS0_DAC_CLK 0x005C /* DAC clock value (16bit) DAC clock load (16bit) */
#define LAS0_UTC0 0x0060 // 8254 TC Counter 0 User TC 0 value Load count in TC Counter 0 #define LAS0_UTC0 0x0060 /* 8254 TC Counter 0 User TC 0 value Load count in TC Counter 0 */
#define LAS0_UTC1 0x0064 // 8254 TC Counter 1 User TC 1 value Load count in TC Counter 1 #define LAS0_UTC1 0x0064 /* 8254 TC Counter 1 User TC 1 value Load count in TC Counter 1 */
#define LAS0_UTC2 0x0068 // 8254 TC Counter 2 User TC 2 value Load count in TC Counter 2 #define LAS0_UTC2 0x0068 /* 8254 TC Counter 2 User TC 2 value Load count in TC Counter 2 */
#define LAS0_UTC_CTRL 0x006C // 8254 TC Control Word Program counter mode for TC #define LAS0_UTC_CTRL 0x006C /* 8254 TC Control Word Program counter mode for TC */
#define LAS0_DIO0 0x0070 // Digital I/O Port 0 Read Port Digital I/O Port 0 Write Port #define LAS0_DIO0 0x0070 /* Digital I/O Port 0 Read Port Digital I/O Port 0 Write Port */
#define LAS0_DIO1 0x0074 // Digital I/O Port 1 Read Port Digital I/O Port 1 Write Port #define LAS0_DIO1 0x0074 /* Digital I/O Port 1 Read Port Digital I/O Port 1 Write Port */
#define LAS0_DIO0_CTRL 0x0078 // Clear digital IRQ status flag/read Clear digital chip/program Port 0 #define LAS0_DIO0_CTRL 0x0078 /* Clear digital IRQ status flag/read Clear digital chip/program Port 0 */
#define LAS0_DIO_STATUS 0x007C // Read Digital I/O Status word Program digital control register & #define LAS0_DIO_STATUS 0x007C /* Read Digital I/O Status word Program digital control register & */
/* /*
LAS0 Setup Area LAS0 Setup Area
Name Local Address Function Name Local Address Function
*/ */
#define LAS0_BOARD_RESET 0x0100 // Board reset #define LAS0_BOARD_RESET 0x0100 /* Board reset */
#define LAS0_DMA0_SRC 0x0104 // DMA 0 Sources select #define LAS0_DMA0_SRC 0x0104 /* DMA 0 Sources select */
#define LAS0_DMA1_SRC 0x0108 // DMA 1 Sources select #define LAS0_DMA1_SRC 0x0108 /* DMA 1 Sources select */
#define LAS0_ADC_CONVERSION 0x010C // A/D Conversion Signal select #define LAS0_ADC_CONVERSION 0x010C /* A/D Conversion Signal select */
#define LAS0_BURST_START 0x0110 // Burst Clock Start Trigger select #define LAS0_BURST_START 0x0110 /* Burst Clock Start Trigger select */
#define LAS0_PACER_START 0x0114 // Pacer Clock Start Trigger select #define LAS0_PACER_START 0x0114 /* Pacer Clock Start Trigger select */
#define LAS0_PACER_STOP 0x0118 // Pacer Clock Stop Trigger select #define LAS0_PACER_STOP 0x0118 /* Pacer Clock Stop Trigger select */
#define LAS0_ACNT_STOP_ENABLE 0x011C // About Counter Stop Enable #define LAS0_ACNT_STOP_ENABLE 0x011C /* About Counter Stop Enable */
#define LAS0_PACER_REPEAT 0x0120 // Pacer Start Trigger Mode select #define LAS0_PACER_REPEAT 0x0120 /* Pacer Start Trigger Mode select */
#define LAS0_DIN_START 0x0124 // High Speed Digital Input Sampling Signal select #define LAS0_DIN_START 0x0124 /* High Speed Digital Input Sampling Signal select */
#define LAS0_DIN_FIFO_CLEAR 0x0128 // Digital Input FIFO Clear #define LAS0_DIN_FIFO_CLEAR 0x0128 /* Digital Input FIFO Clear */
#define LAS0_ADC_FIFO_CLEAR 0x012C // A/D FIFO Clear #define LAS0_ADC_FIFO_CLEAR 0x012C /* A/D FIFO Clear */
#define LAS0_CGT_WRITE 0x0130 // Channel Gain Table Write #define LAS0_CGT_WRITE 0x0130 /* Channel Gain Table Write */
#define LAS0_CGL_WRITE 0x0134 // Channel Gain Latch Write #define LAS0_CGL_WRITE 0x0134 /* Channel Gain Latch Write */
#define LAS0_CG_DATA 0x0138 // Digital Table Write #define LAS0_CG_DATA 0x0138 /* Digital Table Write */
#define LAS0_CGT_ENABLE 0x013C // Channel Gain Table Enable #define LAS0_CGT_ENABLE 0x013C /* Channel Gain Table Enable */
#define LAS0_CG_ENABLE 0x0140 // Digital Table Enable #define LAS0_CG_ENABLE 0x0140 /* Digital Table Enable */
#define LAS0_CGT_PAUSE 0x0144 // Table Pause Enable #define LAS0_CGT_PAUSE 0x0144 /* Table Pause Enable */
#define LAS0_CGT_RESET 0x0148 // Reset Channel Gain Table #define LAS0_CGT_RESET 0x0148 /* Reset Channel Gain Table */
#define LAS0_CGT_CLEAR 0x014C // Clear Channel Gain Table #define LAS0_CGT_CLEAR 0x014C /* Clear Channel Gain Table */
#define LAS0_DAC1_CTRL 0x0150 // D/A1 output type/range #define LAS0_DAC1_CTRL 0x0150 /* D/A1 output type/range */
#define LAS0_DAC1_SRC 0x0154 // D/A1 update source #define LAS0_DAC1_SRC 0x0154 /* D/A1 update source */
#define LAS0_DAC1_CYCLE 0x0158 // D/A1 cycle mode #define LAS0_DAC1_CYCLE 0x0158 /* D/A1 cycle mode */
#define LAS0_DAC1_RESET 0x015C // D/A1 FIFO reset #define LAS0_DAC1_RESET 0x015C /* D/A1 FIFO reset */
#define LAS0_DAC1_FIFO_CLEAR 0x0160 // D/A1 FIFO clear #define LAS0_DAC1_FIFO_CLEAR 0x0160 /* D/A1 FIFO clear */
#define LAS0_DAC2_CTRL 0x0164 // D/A2 output type/range #define LAS0_DAC2_CTRL 0x0164 /* D/A2 output type/range */
#define LAS0_DAC2_SRC 0x0168 // D/A2 update source #define LAS0_DAC2_SRC 0x0168 /* D/A2 update source */
#define LAS0_DAC2_CYCLE 0x016C // D/A2 cycle mode #define LAS0_DAC2_CYCLE 0x016C /* D/A2 cycle mode */
#define LAS0_DAC2_RESET 0x0170 // D/A2 FIFO reset #define LAS0_DAC2_RESET 0x0170 /* D/A2 FIFO reset */
#define LAS0_DAC2_FIFO_CLEAR 0x0174 // D/A2 FIFO clear #define LAS0_DAC2_FIFO_CLEAR 0x0174 /* D/A2 FIFO clear */
#define LAS0_ADC_SCNT_SRC 0x0178 // A/D Sample Counter Source select #define LAS0_ADC_SCNT_SRC 0x0178 /* A/D Sample Counter Source select */
#define LAS0_PACER_SELECT 0x0180 // Pacer Clock select #define LAS0_PACER_SELECT 0x0180 /* Pacer Clock select */
#define LAS0_SBUS0_SRC 0x0184 // SyncBus 0 Source select #define LAS0_SBUS0_SRC 0x0184 /* SyncBus 0 Source select */
#define LAS0_SBUS0_ENABLE 0x0188 // SyncBus 0 enable #define LAS0_SBUS0_ENABLE 0x0188 /* SyncBus 0 enable */
#define LAS0_SBUS1_SRC 0x018C // SyncBus 1 Source select #define LAS0_SBUS1_SRC 0x018C /* SyncBus 1 Source select */
#define LAS0_SBUS1_ENABLE 0x0190 // SyncBus 1 enable #define LAS0_SBUS1_ENABLE 0x0190 /* SyncBus 1 enable */
#define LAS0_SBUS2_SRC 0x0198 // SyncBus 2 Source select #define LAS0_SBUS2_SRC 0x0198 /* SyncBus 2 Source select */
#define LAS0_SBUS2_ENABLE 0x019C // SyncBus 2 enable #define LAS0_SBUS2_ENABLE 0x019C /* SyncBus 2 enable */
#define LAS0_ETRG_POLARITY 0x01A4 // External Trigger polarity select #define LAS0_ETRG_POLARITY 0x01A4 /* External Trigger polarity select */
#define LAS0_EINT_POLARITY 0x01A8 // External Interrupt polarity select #define LAS0_EINT_POLARITY 0x01A8 /* External Interrupt polarity select */
#define LAS0_UTC0_CLOCK 0x01AC // UTC0 Clock select #define LAS0_UTC0_CLOCK 0x01AC /* UTC0 Clock select */
#define LAS0_UTC0_GATE 0x01B0 // UTC0 Gate select #define LAS0_UTC0_GATE 0x01B0 /* UTC0 Gate select */
#define LAS0_UTC1_CLOCK 0x01B4 // UTC1 Clock select #define LAS0_UTC1_CLOCK 0x01B4 /* UTC1 Clock select */
#define LAS0_UTC1_GATE 0x01B8 // UTC1 Gate select #define LAS0_UTC1_GATE 0x01B8 /* UTC1 Gate select */
#define LAS0_UTC2_CLOCK 0x01BC // UTC2 Clock select #define LAS0_UTC2_CLOCK 0x01BC /* UTC2 Clock select */
#define LAS0_UTC2_GATE 0x01C0 // UTC2 Gate select #define LAS0_UTC2_GATE 0x01C0 /* UTC2 Gate select */
#define LAS0_UOUT0_SELECT 0x01C4 // User Output 0 source select #define LAS0_UOUT0_SELECT 0x01C4 /* User Output 0 source select */
#define LAS0_UOUT1_SELECT 0x01C8 // User Output 1 source select #define LAS0_UOUT1_SELECT 0x01C8 /* User Output 1 source select */
#define LAS0_DMA0_RESET 0x01CC // DMA0 Request state machine reset #define LAS0_DMA0_RESET 0x01CC /* DMA0 Request state machine reset */
#define LAS0_DMA1_RESET 0x01D0 // DMA1 Request state machine reset #define LAS0_DMA1_RESET 0x01D0 /* DMA1 Request state machine reset */
/* /*
LAS1 LAS1
Name Local Address Function Name Local Address Function
*/ */
#define LAS1_ADC_FIFO 0x0000 // Read A/D FIFO (16bit) - #define LAS1_ADC_FIFO 0x0000 /* Read A/D FIFO (16bit) - */
#define LAS1_HDIO_FIFO 0x0004 // Read High Speed Digital Input FIFO (16bit) - #define LAS1_HDIO_FIFO 0x0004 /* Read High Speed Digital Input FIFO (16bit) - */
#define LAS1_DAC1_FIFO 0x0008 // - Write D/A1 FIFO (16bit) #define LAS1_DAC1_FIFO 0x0008 /* - Write D/A1 FIFO (16bit) */
#define LAS1_DAC2_FIFO 0x000C // - Write D/A2 FIFO (16bit) #define LAS1_DAC2_FIFO 0x000C /* - Write D/A2 FIFO (16bit) */
/* /*
LCFG: PLX 9080 local config & runtime registers LCFG: PLX 9080 local config & runtime registers
Name Local Address Function Name Local Address Function
*/ */
#define LCFG_ITCSR 0x0068 // INTCSR, Interrupt Control/Status Register #define LCFG_ITCSR 0x0068 /* INTCSR, Interrupt Control/Status Register */
#define LCFG_DMAMODE0 0x0080 // DMA Channel 0 Mode Register #define LCFG_DMAMODE0 0x0080 /* DMA Channel 0 Mode Register */
#define LCFG_DMAPADR0 0x0084 // DMA Channel 0 PCI Address Register #define LCFG_DMAPADR0 0x0084 /* DMA Channel 0 PCI Address Register */
#define LCFG_DMALADR0 0x0088 // DMA Channel 0 Local Address Reg #define LCFG_DMALADR0 0x0088 /* DMA Channel 0 Local Address Reg */
#define LCFG_DMASIZ0 0x008C // DMA Channel 0 Transfer Size (Bytes) Register #define LCFG_DMASIZ0 0x008C /* DMA Channel 0 Transfer Size (Bytes) Register */
#define LCFG_DMADPR0 0x0090 // DMA Channel 0 Descriptor Pointer Register #define LCFG_DMADPR0 0x0090 /* DMA Channel 0 Descriptor Pointer Register */
#define LCFG_DMAMODE1 0x0094 // DMA Channel 1 Mode Register #define LCFG_DMAMODE1 0x0094 /* DMA Channel 1 Mode Register */
#define LCFG_DMAPADR1 0x0098 // DMA Channel 1 PCI Address Register #define LCFG_DMAPADR1 0x0098 /* DMA Channel 1 PCI Address Register */
#define LCFG_DMALADR1 0x009C // DMA Channel 1 Local Address Register #define LCFG_DMALADR1 0x009C /* DMA Channel 1 Local Address Register */
#define LCFG_DMASIZ1 0x00A0 // DMA Channel 1 Transfer Size (Bytes) Register #define LCFG_DMASIZ1 0x00A0 /* DMA Channel 1 Transfer Size (Bytes) Register */
#define LCFG_DMADPR1 0x00A4 // DMA Channel 1 Descriptor Pointer Register #define LCFG_DMADPR1 0x00A4 /* DMA Channel 1 Descriptor Pointer Register */
#define LCFG_DMACSR0 0x00A8 // DMA Channel 0 Command/Status Register #define LCFG_DMACSR0 0x00A8 /* DMA Channel 0 Command/Status Register */
#define LCFG_DMACSR1 0x00A9 // DMA Channel 0 Command/Status Register #define LCFG_DMACSR1 0x00A9 /* DMA Channel 0 Command/Status Register */
#define LCFG_DMAARB 0x00AC // DMA Arbitration Register #define LCFG_DMAARB 0x00AC /* DMA Arbitration Register */
#define LCFG_DMATHR 0x00B0 // DMA Threshold Register #define LCFG_DMATHR 0x00B0 /* DMA Threshold Register */
/*====================================================================== /*======================================================================
Resister bit definitions Resister bit definitions
======================================================================*/ ======================================================================*/
// FIFO Status Word Bits (RtdFifoStatus) /* FIFO Status Word Bits (RtdFifoStatus) */
#define FS_DAC1_NOT_EMPTY 0x0001 // D0 - DAC1 FIFO not empty #define FS_DAC1_NOT_EMPTY 0x0001 /* D0 - DAC1 FIFO not empty */
#define FS_DAC1_HEMPTY 0x0002 // D1 - DAC1 FIFO half empty #define FS_DAC1_HEMPTY 0x0002 /* D1 - DAC1 FIFO half empty */
#define FS_DAC1_NOT_FULL 0x0004 // D2 - DAC1 FIFO not full #define FS_DAC1_NOT_FULL 0x0004 /* D2 - DAC1 FIFO not full */
#define FS_DAC2_NOT_EMPTY 0x0010 // D4 - DAC2 FIFO not empty #define FS_DAC2_NOT_EMPTY 0x0010 /* D4 - DAC2 FIFO not empty */
#define FS_DAC2_HEMPTY 0x0020 // D5 - DAC2 FIFO half empty #define FS_DAC2_HEMPTY 0x0020 /* D5 - DAC2 FIFO half empty */
#define FS_DAC2_NOT_FULL 0x0040 // D6 - DAC2 FIFO not full #define FS_DAC2_NOT_FULL 0x0040 /* D6 - DAC2 FIFO not full */
#define FS_ADC_NOT_EMPTY 0x0100 // D8 - ADC FIFO not empty #define FS_ADC_NOT_EMPTY 0x0100 /* D8 - ADC FIFO not empty */
#define FS_ADC_HEMPTY 0x0200 // D9 - ADC FIFO half empty #define FS_ADC_HEMPTY 0x0200 /* D9 - ADC FIFO half empty */
#define FS_ADC_NOT_FULL 0x0400 // D10 - ADC FIFO not full #define FS_ADC_NOT_FULL 0x0400 /* D10 - ADC FIFO not full */
#define FS_DIN_NOT_EMPTY 0x1000 // D12 - DIN FIFO not empty #define FS_DIN_NOT_EMPTY 0x1000 /* D12 - DIN FIFO not empty */
#define FS_DIN_HEMPTY 0x2000 // D13 - DIN FIFO half empty #define FS_DIN_HEMPTY 0x2000 /* D13 - DIN FIFO half empty */
#define FS_DIN_NOT_FULL 0x4000 // D14 - DIN FIFO not full #define FS_DIN_NOT_FULL 0x4000 /* D14 - DIN FIFO not full */
// Timer Status Word Bits (GetTimerStatus) /* Timer Status Word Bits (GetTimerStatus) */
#define TS_PCLK_GATE 0x0001 #define TS_PCLK_GATE 0x0001
// D0 - Pacer Clock Gate [0 - gated, 1 - enabled] /* D0 - Pacer Clock Gate [0 - gated, 1 - enabled] */
#define TS_BCLK_GATE 0x0002 #define TS_BCLK_GATE 0x0002
// D1 - Burst Clock Gate [0 - disabled, 1 - running] /* D1 - Burst Clock Gate [0 - disabled, 1 - running] */
#define TS_DCNT_GATE 0x0004 #define TS_DCNT_GATE 0x0004
// D2 - Pacer Clock Delayed Start Trigger [0 - delay over, 1 - delay in /* D2 - Pacer Clock Delayed Start Trigger [0 - delay over, 1 - delay in */
// progress] /* progress] */
#define TS_ACNT_GATE 0x0008 #define TS_ACNT_GATE 0x0008
// D3 - Pacer Clock About Trigger [0 - completed, 1 - in progress] /* D3 - Pacer Clock About Trigger [0 - completed, 1 - in progress] */
#define TS_PCLK_RUN 0x0010 #define TS_PCLK_RUN 0x0010
// D4 - Pacer Clock Shutdown Flag [0 - Pacer Clock cannot be start /* D4 - Pacer Clock Shutdown Flag [0 - Pacer Clock cannot be start */
// triggered only by Software Pacer Start Command, 1 - Pacer Clock can /* triggered only by Software Pacer Start Command, 1 - Pacer Clock can */
// be start triggered] /* be start triggered] */
// External Trigger polarity select /* External Trigger polarity select */
// External Interrupt polarity select /* External Interrupt polarity select */
#define POL_POSITIVE 0x0 // positive edge #define POL_POSITIVE 0x0 /* positive edge */
#define POL_NEGATIVE 0x1 // negative edge #define POL_NEGATIVE 0x1 /* negative edge */
// User Output Signal select (SetUout0Source, SetUout1Source) /* User Output Signal select (SetUout0Source, SetUout1Source) */
#define UOUT_ADC 0x0 // A/D Conversion Signal #define UOUT_ADC 0x0 /* A/D Conversion Signal */
#define UOUT_DAC1 0x1 // D/A1 Update #define UOUT_DAC1 0x1 /* D/A1 Update */
#define UOUT_DAC2 0x2 // D/A2 Update #define UOUT_DAC2 0x2 /* D/A2 Update */
#define UOUT_SOFTWARE 0x3 // Software Programmable #define UOUT_SOFTWARE 0x3 /* Software Programmable */
// Pacer clock select (SetPacerSource) /* Pacer clock select (SetPacerSource) */
#define PCLK_INTERNAL 1 // Internal Pacer Clock #define PCLK_INTERNAL 1 /* Internal Pacer Clock */
#define PCLK_EXTERNAL 0 // External Pacer Clock #define PCLK_EXTERNAL 0 /* External Pacer Clock */
// A/D Sample Counter Sources (SetAdcntSource, SetupSampleCounter) /* A/D Sample Counter Sources (SetAdcntSource, SetupSampleCounter) */
#define ADC_SCNT_CGT_RESET 0x0 // needs restart with StartPacer #define ADC_SCNT_CGT_RESET 0x0 /* needs restart with StartPacer */
#define ADC_SCNT_FIFO_WRITE 0x1 #define ADC_SCNT_FIFO_WRITE 0x1
// A/D Conversion Signal Select (for SetConversionSelect) /* A/D Conversion Signal Select (for SetConversionSelect) */
#define ADC_START_SOFTWARE 0x0 // Software A/D Start #define ADC_START_SOFTWARE 0x0 /* Software A/D Start */
#define ADC_START_PCLK 0x1 // Pacer Clock (Ext. Int. see Func.509) #define ADC_START_PCLK 0x1 /* Pacer Clock (Ext. Int. see Func.509) */
#define ADC_START_BCLK 0x2 // Burst Clock #define ADC_START_BCLK 0x2 /* Burst Clock */
#define ADC_START_DIGITAL_IT 0x3 // Digital Interrupt #define ADC_START_DIGITAL_IT 0x3 /* Digital Interrupt */
#define ADC_START_DAC1_MARKER1 0x4 // D/A 1 Data Marker 1 #define ADC_START_DAC1_MARKER1 0x4 /* D/A 1 Data Marker 1 */
#define ADC_START_DAC2_MARKER1 0x5 // D/A 2 Data Marker 1 #define ADC_START_DAC2_MARKER1 0x5 /* D/A 2 Data Marker 1 */
#define ADC_START_SBUS0 0x6 // SyncBus 0 #define ADC_START_SBUS0 0x6 /* SyncBus 0 */
#define ADC_START_SBUS1 0x7 // SyncBus 1 #define ADC_START_SBUS1 0x7 /* SyncBus 1 */
#define ADC_START_SBUS2 0x8 // SyncBus 2 #define ADC_START_SBUS2 0x8 /* SyncBus 2 */
// Burst Clock start trigger select (SetBurstStart) /* Burst Clock start trigger select (SetBurstStart) */
#define BCLK_START_SOFTWARE 0x0 // Software A/D Start (StartBurst) #define BCLK_START_SOFTWARE 0x0 /* Software A/D Start (StartBurst) */
#define BCLK_START_PCLK 0x1 // Pacer Clock #define BCLK_START_PCLK 0x1 /* Pacer Clock */
#define BCLK_START_ETRIG 0x2 // External Trigger #define BCLK_START_ETRIG 0x2 /* External Trigger */
#define BCLK_START_DIGITAL_IT 0x3 // Digital Interrupt #define BCLK_START_DIGITAL_IT 0x3 /* Digital Interrupt */
#define BCLK_START_SBUS0 0x4 // SyncBus 0 #define BCLK_START_SBUS0 0x4 /* SyncBus 0 */
#define BCLK_START_SBUS1 0x5 // SyncBus 1 #define BCLK_START_SBUS1 0x5 /* SyncBus 1 */
#define BCLK_START_SBUS2 0x6 // SyncBus 2 #define BCLK_START_SBUS2 0x6 /* SyncBus 2 */
// Pacer Clock start trigger select (SetPacerStart) /* Pacer Clock start trigger select (SetPacerStart) */
#define PCLK_START_SOFTWARE 0x0 // Software Pacer Start (StartPacer) #define PCLK_START_SOFTWARE 0x0 /* Software Pacer Start (StartPacer) */
#define PCLK_START_ETRIG 0x1 // External trigger #define PCLK_START_ETRIG 0x1 /* External trigger */
#define PCLK_START_DIGITAL_IT 0x2 // Digital interrupt #define PCLK_START_DIGITAL_IT 0x2 /* Digital interrupt */
#define PCLK_START_UTC2 0x3 // User TC 2 out #define PCLK_START_UTC2 0x3 /* User TC 2 out */
#define PCLK_START_SBUS0 0x4 // SyncBus 0 #define PCLK_START_SBUS0 0x4 /* SyncBus 0 */
#define PCLK_START_SBUS1 0x5 // SyncBus 1 #define PCLK_START_SBUS1 0x5 /* SyncBus 1 */
#define PCLK_START_SBUS2 0x6 // SyncBus 2 #define PCLK_START_SBUS2 0x6 /* SyncBus 2 */
#define PCLK_START_D_SOFTWARE 0x8 // Delayed Software Pacer Start #define PCLK_START_D_SOFTWARE 0x8 /* Delayed Software Pacer Start */
#define PCLK_START_D_ETRIG 0x9 // Delayed external trigger #define PCLK_START_D_ETRIG 0x9 /* Delayed external trigger */
#define PCLK_START_D_DIGITAL_IT 0xA // Delayed digital interrupt #define PCLK_START_D_DIGITAL_IT 0xA /* Delayed digital interrupt */
#define PCLK_START_D_UTC2 0xB // Delayed User TC 2 out #define PCLK_START_D_UTC2 0xB /* Delayed User TC 2 out */
#define PCLK_START_D_SBUS0 0xC // Delayed SyncBus 0 #define PCLK_START_D_SBUS0 0xC /* Delayed SyncBus 0 */
#define PCLK_START_D_SBUS1 0xD // Delayed SyncBus 1 #define PCLK_START_D_SBUS1 0xD /* Delayed SyncBus 1 */
#define PCLK_START_D_SBUS2 0xE // Delayed SyncBus 2 #define PCLK_START_D_SBUS2 0xE /* Delayed SyncBus 2 */
#define PCLK_START_ETRIG_GATED 0xF // External Trigger Gated controlled mode #define PCLK_START_ETRIG_GATED 0xF /* External Trigger Gated controlled mode */
// Pacer Clock Stop Trigger select (SetPacerStop) /* Pacer Clock Stop Trigger select (SetPacerStop) */
#define PCLK_STOP_SOFTWARE 0x0 // Software Pacer Stop (StopPacer) #define PCLK_STOP_SOFTWARE 0x0 /* Software Pacer Stop (StopPacer) */
#define PCLK_STOP_ETRIG 0x1 // External Trigger #define PCLK_STOP_ETRIG 0x1 /* External Trigger */
#define PCLK_STOP_DIGITAL_IT 0x2 // Digital Interrupt #define PCLK_STOP_DIGITAL_IT 0x2 /* Digital Interrupt */
#define PCLK_STOP_ACNT 0x3 // About Counter #define PCLK_STOP_ACNT 0x3 /* About Counter */
#define PCLK_STOP_UTC2 0x4 // User TC2 out #define PCLK_STOP_UTC2 0x4 /* User TC2 out */
#define PCLK_STOP_SBUS0 0x5 // SyncBus 0 #define PCLK_STOP_SBUS0 0x5 /* SyncBus 0 */
#define PCLK_STOP_SBUS1 0x6 // SyncBus 1 #define PCLK_STOP_SBUS1 0x6 /* SyncBus 1 */
#define PCLK_STOP_SBUS2 0x7 // SyncBus 2 #define PCLK_STOP_SBUS2 0x7 /* SyncBus 2 */
#define PCLK_STOP_A_SOFTWARE 0x8 // About Software Pacer Stop #define PCLK_STOP_A_SOFTWARE 0x8 /* About Software Pacer Stop */
#define PCLK_STOP_A_ETRIG 0x9 // About External Trigger #define PCLK_STOP_A_ETRIG 0x9 /* About External Trigger */
#define PCLK_STOP_A_DIGITAL_IT 0xA // About Digital Interrupt #define PCLK_STOP_A_DIGITAL_IT 0xA /* About Digital Interrupt */
#define PCLK_STOP_A_UTC2 0xC // About User TC2 out #define PCLK_STOP_A_UTC2 0xC /* About User TC2 out */
#define PCLK_STOP_A_SBUS0 0xD // About SyncBus 0 #define PCLK_STOP_A_SBUS0 0xD /* About SyncBus 0 */
#define PCLK_STOP_A_SBUS1 0xE // About SyncBus 1 #define PCLK_STOP_A_SBUS1 0xE /* About SyncBus 1 */
#define PCLK_STOP_A_SBUS2 0xF // About SyncBus 2 #define PCLK_STOP_A_SBUS2 0xF /* About SyncBus 2 */
// About Counter Stop Enable /* About Counter Stop Enable */
#define ACNT_STOP 0x0 // stop enable #define ACNT_STOP 0x0 /* stop enable */
#define ACNT_NO_STOP 0x1 // stop disabled #define ACNT_NO_STOP 0x1 /* stop disabled */
// DAC update source (SetDAC1Start & SetDAC2Start) /* DAC update source (SetDAC1Start & SetDAC2Start) */
#define DAC_START_SOFTWARE 0x0 // Software Update #define DAC_START_SOFTWARE 0x0 /* Software Update */
#define DAC_START_CGT 0x1 // CGT controlled Update #define DAC_START_CGT 0x1 /* CGT controlled Update */
#define DAC_START_DAC_CLK 0x2 // D/A Clock #define DAC_START_DAC_CLK 0x2 /* D/A Clock */
#define DAC_START_EPCLK 0x3 // External Pacer Clock #define DAC_START_EPCLK 0x3 /* External Pacer Clock */
#define DAC_START_SBUS0 0x4 // SyncBus 0 #define DAC_START_SBUS0 0x4 /* SyncBus 0 */
#define DAC_START_SBUS1 0x5 // SyncBus 1 #define DAC_START_SBUS1 0x5 /* SyncBus 1 */
#define DAC_START_SBUS2 0x6 // SyncBus 2 #define DAC_START_SBUS2 0x6 /* SyncBus 2 */
// DAC Cycle Mode (SetDAC1Cycle, SetDAC2Cycle, SetupDAC) /* DAC Cycle Mode (SetDAC1Cycle, SetDAC2Cycle, SetupDAC) */
#define DAC_CYCLE_SINGLE 0x0 // not cycle #define DAC_CYCLE_SINGLE 0x0 /* not cycle */
#define DAC_CYCLE_MULTI 0x1 // cycle #define DAC_CYCLE_MULTI 0x1 /* cycle */
// 8254 Operation Modes (Set8254Mode, SetupTimerCounter) /* 8254 Operation Modes (Set8254Mode, SetupTimerCounter) */
#define M8254_EVENT_COUNTER 0 // Event Counter #define M8254_EVENT_COUNTER 0 /* Event Counter */
#define M8254_HW_ONE_SHOT 1 // Hardware-Retriggerable One-Shot #define M8254_HW_ONE_SHOT 1 /* Hardware-Retriggerable One-Shot */
#define M8254_RATE_GENERATOR 2 // Rate Generator #define M8254_RATE_GENERATOR 2 /* Rate Generator */
#define M8254_SQUARE_WAVE 3 // Square Wave Mode #define M8254_SQUARE_WAVE 3 /* Square Wave Mode */
#define M8254_SW_STROBE 4 // Software Triggered Strobe #define M8254_SW_STROBE 4 /* Software Triggered Strobe */
#define M8254_HW_STROBE 5 // Hardware Triggered Strobe (Retriggerable) #define M8254_HW_STROBE 5 /* Hardware Triggered Strobe (Retriggerable) */
// User Timer/Counter 0 Clock Select (SetUtc0Clock) /* User Timer/Counter 0 Clock Select (SetUtc0Clock) */
#define CUTC0_8MHZ 0x0 // 8MHz #define CUTC0_8MHZ 0x0 /* 8MHz */
#define CUTC0_EXT_TC_CLOCK1 0x1 // Ext. TC Clock 1 #define CUTC0_EXT_TC_CLOCK1 0x1 /* Ext. TC Clock 1 */
#define CUTC0_EXT_TC_CLOCK2 0x2 // Ext. TC Clock 2 #define CUTC0_EXT_TC_CLOCK2 0x2 /* Ext. TC Clock 2 */
#define CUTC0_EXT_PCLK 0x3 // Ext. Pacer Clock #define CUTC0_EXT_PCLK 0x3 /* Ext. Pacer Clock */
// User Timer/Counter 1 Clock Select (SetUtc1Clock) /* User Timer/Counter 1 Clock Select (SetUtc1Clock) */
#define CUTC1_8MHZ 0x0 // 8MHz #define CUTC1_8MHZ 0x0 /* 8MHz */
#define CUTC1_EXT_TC_CLOCK1 0x1 // Ext. TC Clock 1 #define CUTC1_EXT_TC_CLOCK1 0x1 /* Ext. TC Clock 1 */
#define CUTC1_EXT_TC_CLOCK2 0x2 // Ext. TC Clock 2 #define CUTC1_EXT_TC_CLOCK2 0x2 /* Ext. TC Clock 2 */
#define CUTC1_EXT_PCLK 0x3 // Ext. Pacer Clock #define CUTC1_EXT_PCLK 0x3 /* Ext. Pacer Clock */
#define CUTC1_UTC0_OUT 0x4 // User Timer/Counter 0 out #define CUTC1_UTC0_OUT 0x4 /* User Timer/Counter 0 out */
#define CUTC1_DIN_SIGNAL 0x5 // High-Speed Digital Input Sampling signal #define CUTC1_DIN_SIGNAL 0x5 /* High-Speed Digital Input Sampling signal */
// User Timer/Counter 2 Clock Select (SetUtc2Clock) /* User Timer/Counter 2 Clock Select (SetUtc2Clock) */
#define CUTC2_8MHZ 0x0 // 8MHz #define CUTC2_8MHZ 0x0 /* 8MHz */
#define CUTC2_EXT_TC_CLOCK1 0x1 // Ext. TC Clock 1 #define CUTC2_EXT_TC_CLOCK1 0x1 /* Ext. TC Clock 1 */
#define CUTC2_EXT_TC_CLOCK2 0x2 // Ext. TC Clock 2 #define CUTC2_EXT_TC_CLOCK2 0x2 /* Ext. TC Clock 2 */
#define CUTC2_EXT_PCLK 0x3 // Ext. Pacer Clock #define CUTC2_EXT_PCLK 0x3 /* Ext. Pacer Clock */
#define CUTC2_UTC1_OUT 0x4 // User Timer/Counter 1 out #define CUTC2_UTC1_OUT 0x4 /* User Timer/Counter 1 out */
// User Timer/Counter 0 Gate Select (SetUtc0Gate) /* User Timer/Counter 0 Gate Select (SetUtc0Gate) */
#define GUTC0_NOT_GATED 0x0 // Not gated #define GUTC0_NOT_GATED 0x0 /* Not gated */
#define GUTC0_GATED 0x1 // Gated #define GUTC0_GATED 0x1 /* Gated */
#define GUTC0_EXT_TC_GATE1 0x2 // Ext. TC Gate 1 #define GUTC0_EXT_TC_GATE1 0x2 /* Ext. TC Gate 1 */
#define GUTC0_EXT_TC_GATE2 0x3 // Ext. TC Gate 2 #define GUTC0_EXT_TC_GATE2 0x3 /* Ext. TC Gate 2 */
// User Timer/Counter 1 Gate Select (SetUtc1Gate) /* User Timer/Counter 1 Gate Select (SetUtc1Gate) */
#define GUTC1_NOT_GATED 0x0 // Not gated #define GUTC1_NOT_GATED 0x0 /* Not gated */
#define GUTC1_GATED 0x1 // Gated #define GUTC1_GATED 0x1 /* Gated */
#define GUTC1_EXT_TC_GATE1 0x2 // Ext. TC Gate 1 #define GUTC1_EXT_TC_GATE1 0x2 /* Ext. TC Gate 1 */
#define GUTC1_EXT_TC_GATE2 0x3 // Ext. TC Gate 2 #define GUTC1_EXT_TC_GATE2 0x3 /* Ext. TC Gate 2 */
#define GUTC1_UTC0_OUT 0x4 // User Timer/Counter 0 out #define GUTC1_UTC0_OUT 0x4 /* User Timer/Counter 0 out */
// User Timer/Counter 2 Gate Select (SetUtc2Gate) /* User Timer/Counter 2 Gate Select (SetUtc2Gate) */
#define GUTC2_NOT_GATED 0x0 // Not gated #define GUTC2_NOT_GATED 0x0 /* Not gated */
#define GUTC2_GATED 0x1 // Gated #define GUTC2_GATED 0x1 /* Gated */
#define GUTC2_EXT_TC_GATE1 0x2 // Ext. TC Gate 1 #define GUTC2_EXT_TC_GATE1 0x2 /* Ext. TC Gate 1 */
#define GUTC2_EXT_TC_GATE2 0x3 // Ext. TC Gate 2 #define GUTC2_EXT_TC_GATE2 0x3 /* Ext. TC Gate 2 */
#define GUTC2_UTC1_OUT 0x4 // User Timer/Counter 1 out #define GUTC2_UTC1_OUT 0x4 /* User Timer/Counter 1 out */
// Interrupt Source Masks (SetITMask, ClearITMask, GetITStatus) /* Interrupt Source Masks (SetITMask, ClearITMask, GetITStatus) */
#define IRQM_ADC_FIFO_WRITE 0x0001 // ADC FIFO Write #define IRQM_ADC_FIFO_WRITE 0x0001 /* ADC FIFO Write */
#define IRQM_CGT_RESET 0x0002 // Reset CGT #define IRQM_CGT_RESET 0x0002 /* Reset CGT */
#define IRQM_CGT_PAUSE 0x0008 // Pause CGT #define IRQM_CGT_PAUSE 0x0008 /* Pause CGT */
#define IRQM_ADC_ABOUT_CNT 0x0010 // About Counter out #define IRQM_ADC_ABOUT_CNT 0x0010 /* About Counter out */
#define IRQM_ADC_DELAY_CNT 0x0020 // Delay Counter out #define IRQM_ADC_DELAY_CNT 0x0020 /* Delay Counter out */
#define IRQM_ADC_SAMPLE_CNT 0x0040 // ADC Sample Counter #define IRQM_ADC_SAMPLE_CNT 0x0040 /* ADC Sample Counter */
#define IRQM_DAC1_UCNT 0x0080 // DAC1 Update Counter #define IRQM_DAC1_UCNT 0x0080 /* DAC1 Update Counter */
#define IRQM_DAC2_UCNT 0x0100 // DAC2 Update Counter #define IRQM_DAC2_UCNT 0x0100 /* DAC2 Update Counter */
#define IRQM_UTC1 0x0200 // User TC1 out #define IRQM_UTC1 0x0200 /* User TC1 out */
#define IRQM_UTC1_INV 0x0400 // User TC1 out, inverted #define IRQM_UTC1_INV 0x0400 /* User TC1 out, inverted */
#define IRQM_UTC2 0x0800 // User TC2 out #define IRQM_UTC2 0x0800 /* User TC2 out */
#define IRQM_DIGITAL_IT 0x1000 // Digital Interrupt #define IRQM_DIGITAL_IT 0x1000 /* Digital Interrupt */
#define IRQM_EXTERNAL_IT 0x2000 // External Interrupt #define IRQM_EXTERNAL_IT 0x2000 /* External Interrupt */
#define IRQM_ETRIG_RISING 0x4000 // External Trigger rising-edge #define IRQM_ETRIG_RISING 0x4000 /* External Trigger rising-edge */
#define IRQM_ETRIG_FALLING 0x8000 // External Trigger falling-edge #define IRQM_ETRIG_FALLING 0x8000 /* External Trigger falling-edge */
// DMA Request Sources (LAS0) /* DMA Request Sources (LAS0) */
#define DMAS_DISABLED 0x0 // DMA Disabled #define DMAS_DISABLED 0x0 /* DMA Disabled */
#define DMAS_ADC_SCNT 0x1 // ADC Sample Counter #define DMAS_ADC_SCNT 0x1 /* ADC Sample Counter */
#define DMAS_DAC1_UCNT 0x2 // D/A1 Update Counter #define DMAS_DAC1_UCNT 0x2 /* D/A1 Update Counter */
#define DMAS_DAC2_UCNT 0x3 // D/A2 Update Counter #define DMAS_DAC2_UCNT 0x3 /* D/A2 Update Counter */
#define DMAS_UTC1 0x4 // User TC1 out #define DMAS_UTC1 0x4 /* User TC1 out */
#define DMAS_ADFIFO_HALF_FULL 0x8 // A/D FIFO half full #define DMAS_ADFIFO_HALF_FULL 0x8 /* A/D FIFO half full */
#define DMAS_DAC1_FIFO_HALF_EMPTY 0x9 // D/A1 FIFO half empty #define DMAS_DAC1_FIFO_HALF_EMPTY 0x9 /* D/A1 FIFO half empty */
#define DMAS_DAC2_FIFO_HALF_EMPTY 0xA // D/A2 FIFO half empty #define DMAS_DAC2_FIFO_HALF_EMPTY 0xA /* D/A2 FIFO half empty */
// DMA Local Addresses (0x40000000+LAS1 offset) /* DMA Local Addresses (0x40000000+LAS1 offset) */
#define DMALADDR_ADC 0x40000000 // A/D FIFO #define DMALADDR_ADC 0x40000000 /* A/D FIFO */
#define DMALADDR_HDIN 0x40000004 // High Speed Digital Input FIFO #define DMALADDR_HDIN 0x40000004 /* High Speed Digital Input FIFO */
#define DMALADDR_DAC1 0x40000008 // D/A1 FIFO #define DMALADDR_DAC1 0x40000008 /* D/A1 FIFO */
#define DMALADDR_DAC2 0x4000000C // D/A2 FIFO #define DMALADDR_DAC2 0x4000000C /* D/A2 FIFO */
// Port 0 compare modes (SetDIO0CompareMode) /* Port 0 compare modes (SetDIO0CompareMode) */
#define DIO_MODE_EVENT 0 // Event Mode #define DIO_MODE_EVENT 0 /* Event Mode */
#define DIO_MODE_MATCH 1 // Match Mode #define DIO_MODE_MATCH 1 /* Match Mode */
// Digital Table Enable (Port 1 disable) /* Digital Table Enable (Port 1 disable) */
#define DTBL_DISABLE 0 // Enable Digital Table #define DTBL_DISABLE 0 /* Enable Digital Table */
#define DTBL_ENABLE 1 // Disable Digital Table #define DTBL_ENABLE 1 /* Disable Digital Table */
// Sampling Signal for High Speed Digital Input (SetHdinStart) /* Sampling Signal for High Speed Digital Input (SetHdinStart) */
#define HDIN_SOFTWARE 0x0 // Software Trigger #define HDIN_SOFTWARE 0x0 /* Software Trigger */
#define HDIN_ADC 0x1 // A/D Conversion Signal #define HDIN_ADC 0x1 /* A/D Conversion Signal */
#define HDIN_UTC0 0x2 // User TC out 0 #define HDIN_UTC0 0x2 /* User TC out 0 */
#define HDIN_UTC1 0x3 // User TC out 1 #define HDIN_UTC1 0x3 /* User TC out 1 */
#define HDIN_UTC2 0x4 // User TC out 2 #define HDIN_UTC2 0x4 /* User TC out 2 */
#define HDIN_EPCLK 0x5 // External Pacer Clock #define HDIN_EPCLK 0x5 /* External Pacer Clock */
#define HDIN_ETRG 0x6 // External Trigger #define HDIN_ETRG 0x6 /* External Trigger */
// Channel Gain Table / Channel Gain Latch /* Channel Gain Table / Channel Gain Latch */
#define CSC_LATCH 0 // Channel Gain Latch mode #define CSC_LATCH 0 /* Channel Gain Latch mode */
#define CSC_CGT 1 // Channel Gain Table mode #define CSC_CGT 1 /* Channel Gain Table mode */
// Channel Gain Table Pause Enable /* Channel Gain Table Pause Enable */
#define CGT_PAUSE_DISABLE 0 // Channel Gain Table Pause Disable #define CGT_PAUSE_DISABLE 0 /* Channel Gain Table Pause Disable */
#define CGT_PAUSE_ENABLE 1 // Channel Gain Table Pause Enable #define CGT_PAUSE_ENABLE 1 /* Channel Gain Table Pause Enable */
// DAC output type/range (p63) /* DAC output type/range (p63) */
#define AOUT_UNIP5 0 // 0..+5 Volt #define AOUT_UNIP5 0 /* 0..+5 Volt */
#define AOUT_UNIP10 1 // 0..+10 Volt #define AOUT_UNIP10 1 /* 0..+10 Volt */
#define AOUT_BIP5 2 // -5..+5 Volt #define AOUT_BIP5 2 /* -5..+5 Volt */
#define AOUT_BIP10 3 // -10..+10 Volt #define AOUT_BIP10 3 /* -10..+10 Volt */
// Ghannel Gain Table field definitions (p61) /* Ghannel Gain Table field definitions (p61) */
// Gain /* Gain */
#define GAIN1 0 #define GAIN1 0
#define GAIN2 1 #define GAIN2 1
#define GAIN4 2 #define GAIN4 2
...@@ -398,15 +398,15 @@ ...@@ -398,15 +398,15 @@
#define GAIN64 6 #define GAIN64 6
#define GAIN128 7 #define GAIN128 7
// Input range/polarity /* Input range/polarity */
#define AIN_BIP5 0 // -5..+5 Volt #define AIN_BIP5 0 /* -5..+5 Volt */
#define AIN_BIP10 1 // -10..+10 Volt #define AIN_BIP10 1 /* -10..+10 Volt */
#define AIN_UNIP10 2 // 0..+10 Volt #define AIN_UNIP10 2 /* 0..+10 Volt */
// non referenced single ended select bit /* non referenced single ended select bit */
#define NRSE_AGND 0 // AGND referenced SE input #define NRSE_AGND 0 /* AGND referenced SE input */
#define NRSE_AINS 1 // AIN SENSE referenced SE input #define NRSE_AINS 1 /* AIN SENSE referenced SE input */
// single ended vs differential /* single ended vs differential */
#define GND_SE 0 // Single-Ended #define GND_SE 0 /* Single-Ended */
#define GND_DIFF 1 // Differential #define GND_DIFF 1 /* Differential */
drivers/staging/comedi/drivers/s626.c
View file @ b6c77757
This source diff could not be displayed because it is too large. You can view the blob instead.
drivers/staging/comedi/drivers/s626.h
View file @ b6c77757
...@@ -51,15 +51,15 @@ ...@@ -51,15 +51,15 @@
Example code Example code
insn.insn=INSN_CONFIG; //configuration instruction insn.insn=INSN_CONFIG; // configuration instruction
insn.n=1; //number of operation (must be 1) insn.n=1; // number of operation (must be 1)
insn.data=&initialvalue; //initial value loaded into encoder insn.data=&initialvalue; // initial value loaded into encoder
//during configuration // during configuration
insn.subdev=5; //encoder subdevice insn.subdev=5; // encoder subdevice
insn.chanspec=CR_PACK(encoder_channel,0,AREF_OTHER); //encoder_channel insn.chanspec=CR_PACK(encoder_channel,0,AREF_OTHER); // encoder_channel
//to configure // to configure
comedi_do_insn(cf,&insn); //executing configuration comedi_do_insn(cf,&insn); // executing configuration
*/ */
#ifdef _DEBUG_ #ifdef _DEBUG_
...@@ -88,147 +88,136 @@ ...@@ -88,147 +88,136 @@
#define INLINE static __inline #define INLINE static __inline
#endif #endif
/////////////////////////////////////////////////////
#include<linux/slab.h> #include<linux/slab.h>
#define S626_SIZE 0x0200 #define S626_SIZE 0x0200
#define SIZEOF_ADDRESS_SPACE 0x0200 #define SIZEOF_ADDRESS_SPACE 0x0200
#define DMABUF_SIZE 4096 // 4k pages #define DMABUF_SIZE 4096 /* 4k pages */
#define S626_ADC_CHANNELS 16 #define S626_ADC_CHANNELS 16
#define S626_DAC_CHANNELS 4 #define S626_DAC_CHANNELS 4
#define S626_ENCODER_CHANNELS 6 #define S626_ENCODER_CHANNELS 6
#define S626_DIO_CHANNELS 48 #define S626_DIO_CHANNELS 48
#define S626_DIO_BANKS 3 // Number of DIO groups. #define S626_DIO_BANKS 3 /* Number of DIO groups. */
#define S626_DIO_EXTCHANS 40 // Number of #define S626_DIO_EXTCHANS 40 /* Number of */
// extended-capability /* extended-capability */
// DIO channels. /* DIO channels. */
#define NUM_TRIMDACS 12 // Number of valid TrimDAC channels. #define NUM_TRIMDACS 12 /* Number of valid TrimDAC channels. */
// PCI bus interface types. /* PCI bus interface types. */
#define INTEL 1 // Intel bus type. #define INTEL 1 /* Intel bus type. */
#define MOTOROLA 2 // Motorola bus type. #define MOTOROLA 2 /* Motorola bus type. */
////////////////////////////////////////////////////////// #define PLATFORM INTEL /* *** SELECT PLATFORM TYPE *** */
////////////////////////////////////////////////////////// #define RANGE_5V 0x10 /* +/-5V range */
#define PLATFORM INTEL // *** SELECT PLATFORM TYPE *** #define RANGE_10V 0x00 /* +/-10V range */
//////////////////////////////////////////////////////////
#define RANGE_5V 0x10 // +/-5V range #define EOPL 0x80 /* End of ADC poll list marker. */
#define RANGE_10V 0x00 // +/-10V range #define GSEL_BIPOLAR5V 0x00F0 /* LP_GSEL setting for 5V bipolar range. */
#define GSEL_BIPOLAR10V 0x00A0 /* LP_GSEL setting for 10V bipolar range. */
#define EOPL 0x80 // End of ADC poll list marker. /* Error codes that must be visible to this base class. */
#define GSEL_BIPOLAR5V 0x00F0 // LP_GSEL setting for 5V bipolar range. #define ERR_ILLEGAL_PARM 0x00010000 /* Illegal function parameter value was specified. */
#define GSEL_BIPOLAR10V 0x00A0 // LP_GSEL setting for 10V bipolar range. #define ERR_I2C 0x00020000 /* I2C error. */
#define ERR_COUNTERSETUP 0x00200000 /* Illegal setup specified for counter channel. */
#define ERR_DEBI_TIMEOUT 0x00400000 /* DEBI transfer timed out. */
// Error codes that must be visible to this base class. /* Organization (physical order) and size (in DWORDs) of logical DMA buffers contained by ANA_DMABUF. */
#define ERR_ILLEGAL_PARM 0x00010000 // Illegal function parameter value was specified. #define ADC_DMABUF_DWORDS 40 /* ADC DMA buffer must hold 16 samples, plus pre/post garbage samples. */
#define ERR_I2C 0x00020000 // I2C error. #define DAC_WDMABUF_DWORDS 1 /* DAC output DMA buffer holds a single sample. */
#define ERR_COUNTERSETUP 0x00200000 // Illegal setup specified for counter channel.
#define ERR_DEBI_TIMEOUT 0x00400000 // DEBI transfer timed out.
// Organization (physical order) and size (in DWORDs) of logical DMA buffers contained by ANA_DMABUF. /* All remaining space in 4KB DMA buffer is available for the RPS1 program. */
#define ADC_DMABUF_DWORDS 40 // ADC DMA buffer must hold 16 samples, plus pre/post garbage samples.
#define DAC_WDMABUF_DWORDS 1 // DAC output DMA buffer holds a single sample.
// All remaining space in 4KB DMA buffer is available for the RPS1 program. /* Address offsets, in DWORDS, from base of DMA buffer. */
// Address offsets, in DWORDS, from base of DMA buffer.
#define DAC_WDMABUF_OS ADC_DMABUF_DWORDS #define DAC_WDMABUF_OS ADC_DMABUF_DWORDS
// Interrupt enab bit in ISR and IER. /* Interrupt enab bit in ISR and IER. */
#define IRQ_GPIO3 0x00000040 // IRQ enable for GPIO3. #define IRQ_GPIO3 0x00000040 /* IRQ enable for GPIO3. */
#define IRQ_RPS1 0x10000000 #define IRQ_RPS1 0x10000000
#define ISR_AFOU 0x00000800 // Audio fifo #define ISR_AFOU 0x00000800
// under/overflow /* Audio fifo under/overflow detected. */
// detected.
#define IRQ_COINT1A 0x0400 // conter 1A overflow #define IRQ_COINT1A 0x0400 /* conter 1A overflow interrupt mask */
// interrupt mask #define IRQ_COINT1B 0x0800 /* conter 1B overflow interrupt mask */
#define IRQ_COINT1B 0x0800 // conter 1B overflow #define IRQ_COINT2A 0x1000 /* conter 2A overflow interrupt mask */
// interrupt mask #define IRQ_COINT2B 0x2000 /* conter 2B overflow interrupt mask */
#define IRQ_COINT2A 0x1000 // conter 2A overflow #define IRQ_COINT3A 0x4000 /* conter 3A overflow interrupt mask */
// interrupt mask #define IRQ_COINT3B 0x8000 /* conter 3B overflow interrupt mask */
#define IRQ_COINT2B 0x2000 // conter 2B overflow
// interrupt mask /* RPS command codes. */
#define IRQ_COINT3A 0x4000 // conter 3A overflow #define RPS_CLRSIGNAL 0x00000000 /* CLEAR SIGNAL */
// interrupt mask #define RPS_SETSIGNAL 0x10000000 /* SET SIGNAL */
#define IRQ_COINT3B 0x8000 // conter 3B overflow #define RPS_NOP 0x00000000 /* NOP */
// interrupt mask #define RPS_PAUSE 0x20000000 /* PAUSE */
#define RPS_UPLOAD 0x40000000 /* UPLOAD */
// RPS command codes. #define RPS_JUMP 0x80000000 /* JUMP */
#define RPS_CLRSIGNAL 0x00000000 // CLEAR SIGNAL #define RPS_LDREG 0x90000100 /* LDREG (1 uint32_t only) */
#define RPS_SETSIGNAL 0x10000000 // SET SIGNAL #define RPS_STREG 0xA0000100 /* STREG (1 uint32_t only) */
#define RPS_NOP 0x00000000 // NOP #define RPS_STOP 0x50000000 /* STOP */
#define RPS_PAUSE 0x20000000 // PAUSE #define RPS_IRQ 0x60000000 /* IRQ */
#define RPS_UPLOAD 0x40000000 // UPLOAD
#define RPS_JUMP 0x80000000 // JUMP #define RPS_LOGICAL_OR 0x08000000 /* Logical OR conditionals. */
#define RPS_LDREG 0x90000100 // LDREG (1 uint32_t only) #define RPS_INVERT 0x04000000 /* Test for negated semaphores. */
#define RPS_STREG 0xA0000100 // STREG (1 uint32_t only) #define RPS_DEBI 0x00000002 /* DEBI done */
#define RPS_STOP 0x50000000 // STOP
#define RPS_IRQ 0x60000000 // IRQ #define RPS_SIG0 0x00200000 /* RPS semaphore 0 (used by ADC). */
#define RPS_SIG1 0x00400000 /* RPS semaphore 1 (used by DAC). */
#define RPS_LOGICAL_OR 0x08000000 // Logical OR conditionals. #define RPS_SIG2 0x00800000 /* RPS semaphore 2 (not used). */
#define RPS_INVERT 0x04000000 // Test for negated semaphores. #define RPS_GPIO2 0x00080000 /* RPS GPIO2 */
#define RPS_DEBI 0x00000002 // DEBI done #define RPS_GPIO3 0x00100000 /* RPS GPIO3 */
#define RPS_SIG0 0x00200000 // RPS semaphore 0 (used by ADC). #define RPS_SIGADC RPS_SIG0 /* Trigger/status for ADC's RPS program. */
#define RPS_SIG1 0x00400000 // RPS semaphore 1 (used by DAC). #define RPS_SIGDAC RPS_SIG1 /* Trigger/status for DAC's RPS program. */
#define RPS_SIG2 0x00800000 // RPS semaphore 2 (not used).
#define RPS_GPIO2 0x00080000 // RPS GPIO2 /* RPS clock parameters. */
#define RPS_GPIO3 0x00100000 // RPS GPIO3 #define RPSCLK_SCALAR 8 /* This is apparent ratio of PCI/RPS clks (undocumented!!). */
#define RPSCLK_PER_US ( 33 / RPSCLK_SCALAR ) /* Number of RPS clocks in one microsecond. */
#define RPS_SIGADC RPS_SIG0 // Trigger/status for ADC's RPS program.
#define RPS_SIGDAC RPS_SIG1 // Trigger/status for DAC's RPS program. /* Event counter source addresses. */
#define SBA_RPS_A0 0x27 /* Time of RPS0 busy, in PCI clocks. */
// RPS clock parameters.
#define RPSCLK_SCALAR 8 // This is apparent ratio of PCI/RPS clks (undocumented!!). /* GPIO constants. */
#define RPSCLK_PER_US ( 33 / RPSCLK_SCALAR ) // Number of RPS clocks in one microsecond. #define GPIO_BASE 0x10004000 /* GPIO 0,2,3 = inputs, GPIO3 = IRQ; GPIO1 = out. */
#define GPIO1_LO 0x00000000 /* GPIO1 set to LOW. */
// Event counter source addresses. #define GPIO1_HI 0x00001000 /* GPIO1 set to HIGH. */
#define SBA_RPS_A0 0x27 // Time of RPS0 busy, in PCI clocks.
/* Primary Status Register (PSR) constants. */
// GPIO constants. #define PSR_DEBI_E 0x00040000 /* DEBI event flag. */
#define GPIO_BASE 0x10004000 // GPIO 0,2,3 = inputs, GPIO3 = IRQ; GPIO1 = out. #define PSR_DEBI_S 0x00080000 /* DEBI status flag. */
#define GPIO1_LO 0x00000000 // GPIO1 set to LOW. #define PSR_A2_IN 0x00008000 /* Audio output DMA2 protection address reached. */
#define GPIO1_HI 0x00001000 // GPIO1 set to HIGH. #define PSR_AFOU 0x00000800 /* Audio FIFO under/overflow detected. */
#define PSR_GPIO2 0x00000020 /* GPIO2 input pin: 0=AdcBusy, 1=AdcIdle. */
// Primary Status Register (PSR) constants. #define PSR_EC0S 0x00000001 /* Event counter 0 threshold reached. */
#define PSR_DEBI_E 0x00040000 // DEBI event flag.
#define PSR_DEBI_S 0x00080000 // DEBI status flag. /* Secondary Status Register (SSR) constants. */
#define PSR_A2_IN 0x00008000 // Audio output DMA2 protection address reached. #define SSR_AF2_OUT 0x00000200 /* Audio 2 output FIFO under/overflow detected. */
#define PSR_AFOU 0x00000800 // Audio FIFO under/overflow detected.
#define PSR_GPIO2 0x00000020 // GPIO2 input pin: 0=AdcBusy, 1=AdcIdle. /* Master Control Register 1 (MC1) constants. */
#define PSR_EC0S 0x00000001 // Event counter 0 threshold reached. #define MC1_SOFT_RESET 0x80000000 /* Invoke 7146 soft reset. */
#define MC1_SHUTDOWN 0x3FFF0000 /* Shut down all MC1-controlled enables. */
// Secondary Status Register (SSR) constants.
#define SSR_AF2_OUT 0x00000200 // Audio 2 output FIFO under/overflow detected. #define MC1_ERPS1 0x2000 /* enab/disable RPS task 1. */
#define MC1_ERPS0 0x1000 /* enab/disable RPS task 0. */
// Master Control Register 1 (MC1) constants. #define MC1_DEBI 0x0800 /* enab/disable DEBI pins. */
#define MC1_SOFT_RESET 0x80000000 // Invoke 7146 soft reset. #define MC1_AUDIO 0x0200 /* enab/disable audio port pins. */
#define MC1_SHUTDOWN 0x3FFF0000 // Shut down all MC1-controlled enables. #define MC1_I2C 0x0100 /* enab/disable I2C interface. */
#define MC1_A2OUT 0x0008 /* enab/disable transfer on A2 out. */
#define MC1_ERPS1 0x2000 // enab/disable RPS task 1. #define MC1_A2IN 0x0004 /* enab/disable transfer on A2 in. */
#define MC1_ERPS0 0x1000 // enab/disable RPS task 0. #define MC1_A1IN 0x0001 /* enab/disable transfer on A1 in. */
#define MC1_DEBI 0x0800 // enab/disable DEBI pins.
#define MC1_AUDIO 0x0200 // enab/disable audio port pins. /* Master Control Register 2 (MC2) constants. */
#define MC1_I2C 0x0100 // enab/disable I2C interface. #define MC2_UPLD_DEBIq 0x00020002 /* Upload DEBI registers. */
#define MC1_A2OUT 0x0008 // enab/disable transfer on A2 out. #define MC2_UPLD_IICq 0x00010001 /* Upload I2C registers. */
#define MC1_A2IN 0x0004 // enab/disable transfer on A2 in. #define MC2_RPSSIG2_ONq 0x20002000 /* Assert RPS_SIG2. */
#define MC1_A1IN 0x0001 // enab/disable transfer on A1 in. #define MC2_RPSSIG1_ONq 0x10001000 /* Assert RPS_SIG1. */
#define MC2_RPSSIG0_ONq 0x08000800 /* Assert RPS_SIG0. */
// Master Control Register 2 (MC2) constants. #define MC2_UPLD_DEBI_MASKq 0x00000002 /* Upload DEBI mask. */
#define MC2_UPLD_DEBIq 0x00020002 // Upload DEBI registers. #define MC2_UPLD_IIC_MASKq 0x00000001 /* Upload I2C mask. */
#define MC2_UPLD_IICq 0x00010001 // Upload I2C registers. #define MC2_RPSSIG2_MASKq 0x00002000 /* RPS_SIG2 bit mask. */
#define MC2_RPSSIG2_ONq 0x20002000 // Assert RPS_SIG2. #define MC2_RPSSIG1_MASKq 0x00001000 /* RPS_SIG1 bit mask. */
#define MC2_RPSSIG1_ONq 0x10001000 // Assert RPS_SIG1. #define MC2_RPSSIG0_MASKq 0x00000800 /* RPS_SIG0 bit mask. */
#define MC2_RPSSIG0_ONq 0x08000800 // Assert RPS_SIG0.
#define MC2_UPLD_DEBI_MASKq 0x00000002 // Upload DEBI mask.
#define MC2_UPLD_IIC_MASKq 0x00000001 // Upload I2C mask.
#define MC2_RPSSIG2_MASKq 0x00002000 // RPS_SIG2 bit mask.
#define MC2_RPSSIG1_MASKq 0x00001000 // RPS_SIG1 bit mask.
#define MC2_RPSSIG0_MASKq 0x00000800 // RPS_SIG0 bit mask.
#define MC2_DELAYTRIG_4USq MC2_RPSSIG1_ON #define MC2_DELAYTRIG_4USq MC2_RPSSIG1_ON
#define MC2_DELAYBUSY_4USq MC2_RPSSIG1_MASK #define MC2_DELAYBUSY_4USq MC2_RPSSIG1_MASK
...@@ -236,469 +225,425 @@ ...@@ -236,469 +225,425 @@
#define MC2_DELAYTRIG_6USq MC2_RPSSIG2_ON #define MC2_DELAYTRIG_6USq MC2_RPSSIG2_ON
#define MC2_DELAYBUSY_6USq MC2_RPSSIG2_MASK #define MC2_DELAYBUSY_6USq MC2_RPSSIG2_MASK
#define MC2_UPLD_DEBI 0x0002 // Upload DEBI. #define MC2_UPLD_DEBI 0x0002 /* Upload DEBI. */
#define MC2_UPLD_IIC 0x0001 // Upload I2C. #define MC2_UPLD_IIC 0x0001 /* Upload I2C. */
#define MC2_RPSSIG2 0x2000 // RPS signal 2 (not used). #define MC2_RPSSIG2 0x2000 /* RPS signal 2 (not used). */
#define MC2_RPSSIG1 0x1000 // RPS signal 1 (DAC RPS busy). #define MC2_RPSSIG1 0x1000 /* RPS signal 1 (DAC RPS busy). */
#define MC2_RPSSIG0 0x0800 // RPS signal 0 (ADC RPS busy). #define MC2_RPSSIG0 0x0800 /* RPS signal 0 (ADC RPS busy). */
#define MC2_ADC_RPS MC2_RPSSIG0 // ADC RPS busy. #define MC2_ADC_RPS MC2_RPSSIG0 /* ADC RPS busy. */
#define MC2_DAC_RPS MC2_RPSSIG1 // DAC RPS busy. #define MC2_DAC_RPS MC2_RPSSIG1 /* DAC RPS busy. */
///////////////////oldies/////////// /* ***** oldies ***** */
#define MC2_UPLD_DEBIQ 0x00020002 // Upload DEBI registers. #define MC2_UPLD_DEBIQ 0x00020002 /* Upload DEBI registers. */
#define MC2_UPLD_IICQ 0x00010001 // Upload I2C registers. #define MC2_UPLD_IICQ 0x00010001 /* Upload I2C registers. */
////////////////////////////////////////
/* PCI BUS (SAA7146) REGISTER ADDRESS OFFSETS */
// PCI BUS (SAA7146) REGISTER ADDRESS OFFSETS //////////////////////// #define P_PCI_BT_A 0x004C /* Audio DMA burst/threshold control. */
#define P_PCI_BT_A 0x004C // Audio DMA #define P_DEBICFG 0x007C /* DEBI configuration. */
// burst/threshold #define P_DEBICMD 0x0080 /* DEBI command. */
// control. #define P_DEBIPAGE 0x0084 /* DEBI page. */
#define P_DEBICFG 0x007C // DEBI configuration. #define P_DEBIAD 0x0088 /* DEBI target address. */
#define P_DEBICMD 0x0080 // DEBI command. #define P_I2CCTRL 0x008C /* I2C control. */
#define P_DEBIPAGE 0x0084 // DEBI page. #define P_I2CSTAT 0x0090 /* I2C status. */
#define P_DEBIAD 0x0088 // DEBI target address. #define P_BASEA2_IN 0x00AC /* Audio input 2 base physical DMAbuf
#define P_I2CCTRL 0x008C // I2C control. * address. */
#define P_I2CSTAT 0x0090 // I2C status. #define P_PROTA2_IN 0x00B0 /* Audio input 2 physical DMAbuf
#define P_BASEA2_IN 0x00AC // Audio input 2 base * protection address. */
// physical DMAbuf #define P_PAGEA2_IN 0x00B4 /* Audio input 2 paging attributes. */
// address. #define P_BASEA2_OUT 0x00B8 /* Audio output 2 base physical DMAbuf
#define P_PROTA2_IN 0x00B0 // Audio input 2 * address. */
// physical DMAbuf #define P_PROTA2_OUT 0x00BC /* Audio output 2 physical DMAbuf
// protection address. * protection address. */
#define P_PAGEA2_IN 0x00B4 // Audio input 2 #define P_PAGEA2_OUT 0x00C0 /* Audio output 2 paging attributes. */
// paging attributes. #define P_RPSPAGE0 0x00C4 /* RPS0 page. */
#define P_BASEA2_OUT 0x00B8 // Audio output 2 base #define P_RPSPAGE1 0x00C8 /* RPS1 page. */
// physical DMAbuf #define P_RPS0_TOUT 0x00D4 /* RPS0 time-out. */
// address. #define P_RPS1_TOUT 0x00D8 /* RPS1 time-out. */
#define P_PROTA2_OUT 0x00BC // Audio output 2 #define P_IER 0x00DC /* Interrupt enable. */
// physical DMAbuf #define P_GPIO 0x00E0 /* General-purpose I/O. */
// protection address. #define P_EC1SSR 0x00E4 /* Event counter set 1 source select. */
#define P_PAGEA2_OUT 0x00C0 // Audio output 2 #define P_ECT1R 0x00EC /* Event counter threshold set 1. */
// paging attributes. #define P_ACON1 0x00F4 /* Audio control 1. */
#define P_RPSPAGE0 0x00C4 // RPS0 page. #define P_ACON2 0x00F8 /* Audio control 2. */
#define P_RPSPAGE1 0x00C8 // RPS1 page. #define P_MC1 0x00FC /* Master control 1. */
#define P_RPS0_TOUT 0x00D4 // RPS0 time-out. #define P_MC2 0x0100 /* Master control 2. */
#define P_RPS1_TOUT 0x00D8 // RPS1 time-out. #define P_RPSADDR0 0x0104 /* RPS0 instruction pointer. */
#define P_IER 0x00DC // Interrupt enable. #define P_RPSADDR1 0x0108 /* RPS1 instruction pointer. */
#define P_GPIO 0x00E0 // General-purpose I/O. #define P_ISR 0x010C /* Interrupt status. */
#define P_EC1SSR 0x00E4 // Event counter set 1 #define P_PSR 0x0110 /* Primary status. */
// source select. #define P_SSR 0x0114 /* Secondary status. */
#define P_ECT1R 0x00EC // Event counter #define P_EC1R 0x0118 /* Event counter set 1. */
// threshold set 1. #define P_ADP4 0x0138 /* Logical audio DMA pointer of audio
#define P_ACON1 0x00F4 // Audio control 1. * input FIFO A2_IN. */
#define P_ACON2 0x00F8 // Audio control 2. #define P_FB_BUFFER1 0x0144 /* Audio feedback buffer 1. */
#define P_MC1 0x00FC // Master control 1. #define P_FB_BUFFER2 0x0148 /* Audio feedback buffer 2. */
#define P_MC2 0x0100 // Master control 2. #define P_TSL1 0x0180 /* Audio time slot list 1. */
#define P_RPSADDR0 0x0104 // RPS0 instruction pointer. #define P_TSL2 0x01C0 /* Audio time slot list 2. */
#define P_RPSADDR1 0x0108 // RPS1 instruction pointer.
#define P_ISR 0x010C // Interrupt status. /* LOCAL BUS (GATE ARRAY) REGISTER ADDRESS OFFSETS */
#define P_PSR 0x0110 // Primary status. /* Analog I/O registers: */
#define P_SSR 0x0114 // Secondary status. #define LP_DACPOL 0x0082 /* Write DAC polarity. */
#define P_EC1R 0x0118 // Event counter set 1. #define LP_GSEL 0x0084 /* Write ADC gain. */
#define P_ADP4 0x0138 // Logical audio DMA #define LP_ISEL 0x0086 /* Write ADC channel select. */
// pointer of audio /* Digital I/O (write only): */
// input FIFO A2_IN. #define LP_WRINTSELA 0x0042 /* Write A interrupt enable. */
#define P_FB_BUFFER1 0x0144 // Audio feedback buffer 1. #define LP_WREDGSELA 0x0044 /* Write A edge selection. */
#define P_FB_BUFFER2 0x0148 // Audio feedback buffer 2. #define LP_WRCAPSELA 0x0046 /* Write A capture enable. */
#define P_TSL1 0x0180 // Audio time slot list 1. #define LP_WRDOUTA 0x0048 /* Write A digital output. */
#define P_TSL2 0x01C0 // Audio time slot list 2. #define LP_WRINTSELB 0x0052 /* Write B interrupt enable. */
#define LP_WREDGSELB 0x0054 /* Write B edge selection. */
// LOCAL BUS (GATE ARRAY) REGISTER ADDRESS OFFSETS ///////////////// #define LP_WRCAPSELB 0x0056 /* Write B capture enable. */
// Analog I/O registers: #define LP_WRDOUTB 0x0058 /* Write B digital output. */
#define LP_DACPOL 0x0082 // Write DAC polarity. #define LP_WRINTSELC 0x0062 /* Write C interrupt enable. */
#define LP_GSEL 0x0084 // Write ADC gain. #define LP_WREDGSELC 0x0064 /* Write C edge selection. */
#define LP_ISEL 0x0086 // Write ADC channel select. #define LP_WRCAPSELC 0x0066 /* Write C capture enable. */
// Digital I/O (write only): #define LP_WRDOUTC 0x0068 /* Write C digital output. */
#define LP_WRINTSELA 0x0042 // Write A interrupt enable.
#define LP_WREDGSELA 0x0044 // Write A edge selection. /* Digital I/O (read only): */
#define LP_WRCAPSELA 0x0046 // Write A capture enable. #define LP_RDDINA 0x0040 /* Read digital input. */
#define LP_WRDOUTA 0x0048 // Write A digital output. #define LP_RDCAPFLGA 0x0048 /* Read edges captured. */
#define LP_WRINTSELB 0x0052 // Write B interrupt enable. #define LP_RDINTSELA 0x004A /* Read interrupt enable register. */
#define LP_WREDGSELB 0x0054 // Write B edge selection. #define LP_RDEDGSELA 0x004C /* Read edge selection register. */
#define LP_WRCAPSELB 0x0056 // Write B capture enable. #define LP_RDCAPSELA 0x004E /* Read capture enable register. */
#define LP_WRDOUTB 0x0058 // Write B digital output. #define LP_RDDINB 0x0050 /* Read digital input. */
#define LP_WRINTSELC 0x0062 // Write C interrupt enable. #define LP_RDCAPFLGB 0x0058 /* Read edges captured. */
#define LP_WREDGSELC 0x0064 // Write C edge selection. #define LP_RDINTSELB 0x005A /* Read interrupt enable register. */
#define LP_WRCAPSELC 0x0066 // Write C capture enable. #define LP_RDEDGSELB 0x005C /* Read edge selection register. */
#define LP_WRDOUTC 0x0068 // Write C digital output. #define LP_RDCAPSELB 0x005E /* Read capture enable register. */
#define LP_RDDINC 0x0060 /* Read digital input. */
// Digital I/O (read only): #define LP_RDCAPFLGC 0x0068 /* Read edges captured. */
#define LP_RDDINA 0x0040 // Read digital input. #define LP_RDINTSELC 0x006A /* Read interrupt enable register. */
#define LP_RDCAPFLGA 0x0048 // Read edges captured. #define LP_RDEDGSELC 0x006C /* Read edge selection register. */
#define LP_RDINTSELA 0x004A // Read interrupt #define LP_RDCAPSELC 0x006E /* Read capture enable register. */
// enable register.
#define LP_RDEDGSELA 0x004C // Read edge /* Counter Registers (read/write): */
// selection #define LP_CR0A 0x0000 /* 0A setup register. */
// register. #define LP_CR0B 0x0002 /* 0B setup register. */
#define LP_RDCAPSELA 0x004E // Read capture #define LP_CR1A 0x0004 /* 1A setup register. */
// enable register. #define LP_CR1B 0x0006 /* 1B setup register. */
#define LP_RDDINB 0x0050 // Read digital input. #define LP_CR2A 0x0008 /* 2A setup register. */
#define LP_RDCAPFLGB 0x0058 // Read edges captured. #define LP_CR2B 0x000A /* 2B setup register. */
#define LP_RDINTSELB 0x005A // Read interrupt
// enable register. /* Counter PreLoad (write) and Latch (read) Registers: */
#define LP_RDEDGSELB 0x005C // Read edge #define LP_CNTR0ALSW 0x000C /* 0A lsw. */
// selection #define LP_CNTR0AMSW 0x000E /* 0A msw. */
// register. #define LP_CNTR0BLSW 0x0010 /* 0B lsw. */
#define LP_RDCAPSELB 0x005E // Read capture #define LP_CNTR0BMSW 0x0012 /* 0B msw. */
// enable register. #define LP_CNTR1ALSW 0x0014 /* 1A lsw. */
#define LP_RDDINC 0x0060 // Read digital input. #define LP_CNTR1AMSW 0x0016 /* 1A msw. */
#define LP_RDCAPFLGC 0x0068 // Read edges captured. #define LP_CNTR1BLSW 0x0018 /* 1B lsw. */
#define LP_RDINTSELC 0x006A // Read interrupt #define LP_CNTR1BMSW 0x001A /* 1B msw. */
// enable register. #define LP_CNTR2ALSW 0x001C /* 2A lsw. */
#define LP_RDEDGSELC 0x006C // Read edge #define LP_CNTR2AMSW 0x001E /* 2A msw. */
// selection #define LP_CNTR2BLSW 0x0020 /* 2B lsw. */
// register. #define LP_CNTR2BMSW 0x0022 /* 2B msw. */
#define LP_RDCAPSELC 0x006E // Read capture
// enable register. /* Miscellaneous Registers (read/write): */
// Counter Registers (read/write): #define LP_MISC1 0x0088 /* Read/write Misc1. */
#define LP_CR0A 0x0000 // 0A setup register. #define LP_WRMISC2 0x0090 /* Write Misc2. */
#define LP_CR0B 0x0002 // 0B setup register. #define LP_RDMISC2 0x0082 /* Read Misc2. */
#define LP_CR1A 0x0004 // 1A setup register.
#define LP_CR1B 0x0006 // 1B setup register. /* Bit masks for MISC1 register that are the same for reads and writes. */
#define LP_CR2A 0x0008 // 2A setup register. #define MISC1_WENABLE 0x8000 /* enab writes to MISC2 (except Clear
#define LP_CR2B 0x000A // 2B setup register. * Watchdog bit). */
// Counter PreLoad (write) and Latch (read) Registers: #define MISC1_WDISABLE 0x0000 /* Disable writes to MISC2. */
#define LP_CNTR0ALSW 0x000C // 0A lsw. #define MISC1_EDCAP 0x1000 /* enab edge capture on DIO chans
#define LP_CNTR0AMSW 0x000E // 0A msw. * specified by LP_WRCAPSELx. */
#define LP_CNTR0BLSW 0x0010 // 0B lsw. #define MISC1_NOEDCAP 0x0000 /* Disable edge capture on specified
#define LP_CNTR0BMSW 0x0012 // 0B msw. * DIO chans. */
#define LP_CNTR1ALSW 0x0014 // 1A lsw.
#define LP_CNTR1AMSW 0x0016 // 1A msw. /* Bit masks for MISC1 register reads. */
#define LP_CNTR1BLSW 0x0018 // 1B lsw. #define RDMISC1_WDTIMEOUT 0x4000 /* Watchdog timer timed out. */
#define LP_CNTR1BMSW 0x001A // 1B msw.
#define LP_CNTR2ALSW 0x001C // 2A lsw. /* Bit masks for MISC2 register writes. */
#define LP_CNTR2AMSW 0x001E // 2A msw. #define WRMISC2_WDCLEAR 0x8000 /* Reset watchdog timer to zero. */
#define LP_CNTR2BLSW 0x0020 // 2B lsw. #define WRMISC2_CHARGE_ENABLE 0x4000 /* enab battery trickle charging. */
#define LP_CNTR2BMSW 0x0022 // 2B msw.
// Miscellaneous Registers (read/write): /* Bit masks for MISC2 register that are the same for reads and writes. */
#define LP_MISC1 0x0088 // Read/write Misc1. #define MISC2_BATT_ENABLE 0x0008 /* Backup battery enable. */
#define LP_WRMISC2 0x0090 // Write Misc2. #define MISC2_WDENABLE 0x0004 /* Watchdog timer enable. */
#define LP_RDMISC2 0x0082 // Read Misc2. #define MISC2_WDPERIOD_MASK 0x0003 /* Watchdog interval */
/* select mask. */
// Bit masks for MISC1 register that are the same for reads and writes.
#define MISC1_WENABLE 0x8000 // enab writes to /* Bit masks for ACON1 register. */
// MISC2 (except Clear #define A2_RUN 0x40000000 /* Run A2 based on TSL2. */
// Watchdog bit). #define A1_RUN 0x20000000 /* Run A1 based on TSL1. */
#define MISC1_WDISABLE 0x0000 // Disable writes to MISC2. #define A1_SWAP 0x00200000 /* Use big-endian for A1. */
#define MISC1_EDCAP 0x1000 // enab edge capture #define A2_SWAP 0x00100000 /* Use big-endian for A2. */
// on DIO chans #define WS_MODES 0x00019999 /* WS0 = TSL1 trigger */
// specified by /* input, WS1-WS4 = */
// LP_WRCAPSELx. /* CS* outputs. */
#define MISC1_NOEDCAP 0x0000 // Disable edge
// capture on #if PLATFORM == INTEL /* Base ACON1 config: always run A1 based
// specified DIO * on TSL1. */
// chans.
// Bit masks for MISC1 register reads.
#define RDMISC1_WDTIMEOUT 0x4000 // Watchdog timer timed out.
// Bit masks for MISC2 register writes.
#define WRMISC2_WDCLEAR 0x8000 // Reset watchdog
// timer to zero.
#define WRMISC2_CHARGE_ENABLE 0x4000 // enab battery
// trickle charging.
// Bit masks for MISC2 register that are the same for reads and writes.
#define MISC2_BATT_ENABLE 0x0008 // Backup battery enable.
#define MISC2_WDENABLE 0x0004 // Watchdog timer enable.
#define MISC2_WDPERIOD_MASK 0x0003 // Watchdog interval
// select mask.
// Bit masks for ACON1 register.
#define A2_RUN 0x40000000 // Run A2 based on TSL2.
#define A1_RUN 0x20000000 // Run A1 based on TSL1.
#define A1_SWAP 0x00200000 // Use big-endian for A1.
#define A2_SWAP 0x00100000 // Use big-endian for A2.
#define WS_MODES 0x00019999 // WS0 = TSL1 trigger
// input, WS1-WS4 =
// CS* outputs.
#if PLATFORM == INTEL // Base ACON1 config:
// always run A1 based
// on TSL1.
#define ACON1_BASE ( WS_MODES | A1_RUN ) #define ACON1_BASE ( WS_MODES | A1_RUN )
#elif PLATFORM == MOTOROLA #elif PLATFORM == MOTOROLA
#define ACON1_BASE ( WS_MODES | A1_RUN | A1_SWAP | A2_SWAP ) #define ACON1_BASE ( WS_MODES | A1_RUN | A1_SWAP | A2_SWAP )
#endif #endif
#define ACON1_ADCSTART ACON1_BASE // Start ADC: run A1 #define ACON1_ADCSTART ACON1_BASE /* Start ADC: run A1
// based on TSL1. * based on TSL1. */
#define ACON1_DACSTART ( ACON1_BASE | A2_RUN ) // Start #define ACON1_DACSTART ( ACON1_BASE | A2_RUN )
// transmit to /* Start transmit to DAC: run A2 based on TSL2. */
// DAC: run A2 #define ACON1_DACSTOP ACON1_BASE /* Halt A2. */
// based on
// TSL2. /* Bit masks for ACON2 register. */
#define ACON1_DACSTOP ACON1_BASE // Halt A2. #define A1_CLKSRC_BCLK1 0x00000000 /* A1 bit rate = BCLK1 (ADC). */
#define A2_CLKSRC_X1 0x00800000 /* A2 bit rate = ACLK/1 (DACs). */
// Bit masks for ACON2 register. #define A2_CLKSRC_X2 0x00C00000 /* A2 bit rate = ACLK/2 (DACs). */
#define A1_CLKSRC_BCLK1 0x00000000 // A1 bit rate = BCLK1 (ADC). #define A2_CLKSRC_X4 0x01400000 /* A2 bit rate = ACLK/4 (DACs). */
#define A2_CLKSRC_X1 0x00800000 // A2 bit rate = ACLK/1 (DACs). #define INVERT_BCLK2 0x00100000 /* Invert BCLK2 (DACs). */
#define A2_CLKSRC_X2 0x00C00000 // A2 bit rate = ACLK/2 (DACs). #define BCLK2_OE 0x00040000 /* enab BCLK2 (DACs). */
#define A2_CLKSRC_X4 0x01400000 // A2 bit rate = ACLK/4 (DACs). #define ACON2_XORMASK 0x000C0000 /* XOR mask for ACON2 */
#define INVERT_BCLK2 0x00100000 // Invert BCLK2 (DACs). /* active-low bits. */
#define BCLK2_OE 0x00040000 // enab BCLK2 (DACs).
#define ACON2_XORMASK 0x000C0000 // XOR mask for ACON2
// active-low bits.
#define ACON2_INIT ( ACON2_XORMASK ^ ( A1_CLKSRC_BCLK1 | A2_CLKSRC_X2 | INVERT_BCLK2 | BCLK2_OE ) ) #define ACON2_INIT ( ACON2_XORMASK ^ ( A1_CLKSRC_BCLK1 | A2_CLKSRC_X2 | INVERT_BCLK2 | BCLK2_OE ) )
// Bit masks for timeslot records. /* Bit masks for timeslot records. */
#define WS1 0x40000000 // WS output to assert. #define WS1 0x40000000 /* WS output to assert. */
#define WS2 0x20000000 #define WS2 0x20000000
#define WS3 0x10000000 #define WS3 0x10000000
#define WS4 0x08000000 #define WS4 0x08000000
#define RSD1 0x01000000 // Shift A1 data in on SD1. #define RSD1 0x01000000 /* Shift A1 data in on SD1. */
#define SDW_A1 0x00800000 // Store rcv'd char at #define SDW_A1 0x00800000 /* Store rcv'd char at next
// next char slot of * char slot of DWORD1 buffer. */
// DWORD1 buffer. #define SIB_A1 0x00400000 /* Store rcv'd char at next
#define SIB_A1 0x00400000 // Store rcv'd char at * char slot of FB1 buffer. */
// next char slot of #define SF_A1 0x00200000 /* Write unsigned long
// FB1 buffer. * buffer to input FIFO. */
#define SF_A1 0x00200000 // Write unsigned long
// buffer to input /* Select parallel-to-serial converter's data source: */
// FIFO. #define XFIFO_0 0x00000000 /* Data fifo byte 0. */
#define XFIFO_1 0x00000010 /* Data fifo byte 1. */
//Select parallel-to-serial converter's data source: #define XFIFO_2 0x00000020 /* Data fifo byte 2. */
#define XFIFO_0 0x00000000 // Data fifo byte 0. #define XFIFO_3 0x00000030 /* Data fifo byte 3. */
#define XFIFO_1 0x00000010 // Data fifo byte 1. #define XFB0 0x00000040 /* FB_BUFFER byte 0. */
#define XFIFO_2 0x00000020 // Data fifo byte 2. #define XFB1 0x00000050 /* FB_BUFFER byte 1. */
#define XFIFO_3 0x00000030 // Data fifo byte 3. #define XFB2 0x00000060 /* FB_BUFFER byte 2. */
#define XFB0 0x00000040 // FB_BUFFER byte 0. #define XFB3 0x00000070 /* FB_BUFFER byte 3. */
#define XFB1 0x00000050 // FB_BUFFER byte 1. #define SIB_A2 0x00000200 /* Store next dword from A2's
#define XFB2 0x00000060 // FB_BUFFER byte 2. * input shifter to FB2 buffer. */
#define XFB3 0x00000070 // FB_BUFFER byte 3. #define SF_A2 0x00000100 /* Store next dword from A2's
#define SIB_A2 0x00000200 // Store next dword * input shifter to its input
// from A2's input * fifo. */
// shifter to FB2 #define LF_A2 0x00000080 /* Load next dword from A2's
// buffer. * output fifo into its
#define SF_A2 0x00000100 // Store next dword * output dword buffer. */
// from A2's input #define XSD2 0x00000008 /* Shift data out on SD2. */
// shifter to its #define RSD3 0x00001800 /* Shift data in on SD3. */
// input fifo. #define RSD2 0x00001000 /* Shift data in on SD2. */
#define LF_A2 0x00000080 // Load next dword #define LOW_A2 0x00000002 /* Drive last SD low */
// from A2's output /* for 7 clks, then */
// fifo into its /* tri-state. */
// output dword #define EOS 0x00000001 /* End of superframe. */
// buffer.
#define XSD2 0x00000008 // Shift data out on SD2.
#define RSD3 0x00001800 // Shift data in on SD3. /* I2C configuration constants. */
#define RSD2 0x00001000 // Shift data in on SD2. #define I2C_CLKSEL 0x0400
#define LOW_A2 0x00000002 // Drive last SD low /* I2C bit rate = PCIclk/480 = 68.75 KHz. */
// for 7 clks, then
// tri-state. #define I2C_BITRATE 68.75
#define EOS 0x00000001 // End of superframe. /* I2C bus data bit rate (determined by I2C_CLKSEL) in KHz. */
////////////////////// #define I2C_WRTIME 15.0
/* Worst case time, in msec, for EEPROM internal write op. */
// I2C configuration constants.
#define I2C_CLKSEL 0x0400 // I2C bit rate = /* I2C manifest constants. */
// PCIclk/480 = 68.75
// KHz. /* Max retries to wait for EEPROM write. */
#define I2C_BITRATE 68.75 // I2C bus data bit
// rate (determined by
// I2C_CLKSEL) in KHz.
#define I2C_WRTIME 15.0 // Worst case time,in
// msec, for EEPROM
// internal write op.
// I2C manifest constants.
// Max retries to wait for EEPROM write.
#define I2C_RETRIES ( I2C_WRTIME * I2C_BITRATE / 9.0 ) #define I2C_RETRIES ( I2C_WRTIME * I2C_BITRATE / 9.0 )
#define I2C_ERR 0x0002 // I2C control/status #define I2C_ERR 0x0002 /* I2C control/status */
// flag ERROR. /* flag ERROR. */
#define I2C_BUSY 0x0001 // I2C control/status #define I2C_BUSY 0x0001 /* I2C control/status */
// flag BUSY. /* flag BUSY. */
#define I2C_ABORT 0x0080 // I2C status flag ABORT. #define I2C_ABORT 0x0080 /* I2C status flag ABORT. */
#define I2C_ATTRSTART 0x3 // I2C attribute START. #define I2C_ATTRSTART 0x3 /* I2C attribute START. */
#define I2C_ATTRCONT 0x2 // I2C attribute CONT. #define I2C_ATTRCONT 0x2 /* I2C attribute CONT. */
#define I2C_ATTRSTOP 0x1 // I2C attribute STOP. #define I2C_ATTRSTOP 0x1 /* I2C attribute STOP. */
#define I2C_ATTRNOP 0x0 // I2C attribute NOP. #define I2C_ATTRNOP 0x0 /* I2C attribute NOP. */
// I2C read command | EEPROM address. /* I2C read command | EEPROM address. */
#define I2CR ( devpriv->I2CAdrs | 1 ) #define I2CR ( devpriv->I2CAdrs | 1 )
// I2C write command | EEPROM address. /* I2C write command | EEPROM address. */
#define I2CW ( devpriv->I2CAdrs ) #define I2CW ( devpriv->I2CAdrs )
// Code macros used for constructing I2C command bytes. /* Code macros used for constructing I2C command bytes. */
#define I2C_B2(ATTR,VAL) ( ( (ATTR) << 6 ) | ( (VAL) << 24 ) ) #define I2C_B2(ATTR,VAL) ( ( (ATTR) << 6 ) | ( (VAL) << 24 ) )
#define I2C_B1(ATTR,VAL) ( ( (ATTR) << 4 ) | ( (VAL) << 16 ) ) #define I2C_B1(ATTR,VAL) ( ( (ATTR) << 4 ) | ( (VAL) << 16 ) )
#define I2C_B0(ATTR,VAL) ( ( (ATTR) << 2 ) | ( (VAL) << 8 ) ) #define I2C_B0(ATTR,VAL) ( ( (ATTR) << 2 ) | ( (VAL) << 8 ) )
//////////////////////////////////////////////////////// /* oldest */
//oldest #define P_DEBICFGq 0x007C /* DEBI configuration. */
#define P_DEBICFGq 0x007C // DEBI configuration. #define P_DEBICMDq 0x0080 /* DEBI command. */
#define P_DEBICMDq 0x0080 // DEBI command. #define P_DEBIPAGEq 0x0084 /* DEBI page. */
#define P_DEBIPAGEq 0x0084 // DEBI page. #define P_DEBIADq 0x0088 /* DEBI target address. */
#define P_DEBIADq 0x0088 // DEBI target address.
#define DEBI_CFG_TOQ 0x03C00000 /* timeout (15 PCI cycles) */
#define DEBI_CFG_TOQ 0x03C00000 // timeout (15 PCI cycles) #define DEBI_CFG_FASTQ 0x10000000 /* fast mode enable */
#define DEBI_CFG_FASTQ 0x10000000 // fast mode enable #define DEBI_CFG_16Q 0x00080000 /* 16-bit access enable */
#define DEBI_CFG_16Q 0x00080000 // 16-bit access enable #define DEBI_CFG_INCQ 0x00040000 /* enable address increment */
#define DEBI_CFG_INCQ 0x00040000 // enable address increment #define DEBI_CFG_TIMEROFFQ 0x00010000 /* disable timer */
#define DEBI_CFG_TIMEROFFQ 0x00010000 // disable timer #define DEBI_CMD_RDQ 0x00050000 /* read immediate 2 bytes */
#define DEBI_CMD_RDQ 0x00050000 // read immediate 2 bytes #define DEBI_CMD_WRQ 0x00040000 /* write immediate 2 bytes */
#define DEBI_CMD_WRQ 0x00040000 // write immediate 2 bytes #define DEBI_PAGE_DISABLEQ 0x00000000 /* paging disable */
#define DEBI_PAGE_DISABLEQ 0x00000000 // paging disable
/* DEBI command constants. */
/////////////////////////////////////////// #define DEBI_CMD_SIZE16 ( 2 << 17 ) /* Transfer size is */
// DEBI command constants. /* always 2 bytes. */
#define DEBI_CMD_SIZE16 ( 2 << 17 ) // Transfer size is #define DEBI_CMD_READ 0x00010000 /* Read operation. */
// always 2 bytes. #define DEBI_CMD_WRITE 0x00000000 /* Write operation. */
#define DEBI_CMD_READ 0x00010000 // Read operation.
#define DEBI_CMD_WRITE 0x00000000 // Write operation. /* Read immediate 2 bytes. */
// Read immediate 2 bytes.
#define DEBI_CMD_RDWORD ( DEBI_CMD_READ | DEBI_CMD_SIZE16 ) #define DEBI_CMD_RDWORD ( DEBI_CMD_READ | DEBI_CMD_SIZE16 )
// Write immediate 2 bytes. /* Write immediate 2 bytes. */
#define DEBI_CMD_WRWORD ( DEBI_CMD_WRITE | DEBI_CMD_SIZE16 ) #define DEBI_CMD_WRWORD ( DEBI_CMD_WRITE | DEBI_CMD_SIZE16 )
// DEBI configuration constants. /* DEBI configuration constants. */
#define DEBI_CFG_XIRQ_EN 0x80000000 // enab external #define DEBI_CFG_XIRQ_EN 0x80000000 /* enab external */
// interrupt on GPIO3. /* interrupt on GPIO3. */
#define DEBI_CFG_XRESUME 0x40000000 // Resume block #define DEBI_CFG_XRESUME 0x40000000 /* Resume block */
// transfer when XIRQ /* transfer when XIRQ */
// deasserted. /* deasserted. */
#define DEBI_CFG_FAST 0x10000000 // Fast mode enable. #define DEBI_CFG_FAST 0x10000000 /* Fast mode enable. */
// 4-bit field that specifies DEBI timeout value in PCI clock cycles: /* 4-bit field that specifies DEBI timeout value in PCI clock cycles: */
#define DEBI_CFG_TOUT_BIT 22 // Finish DEBI cycle after #define DEBI_CFG_TOUT_BIT 22 /* Finish DEBI cycle after */
// this many clocks. /* this many clocks. */
// 2-bit field that specifies Endian byte lane steering: /* 2-bit field that specifies Endian byte lane steering: */
#define DEBI_CFG_SWAP_NONE 0x00000000 // Straight - don't #define DEBI_CFG_SWAP_NONE 0x00000000 /* Straight - don't */
// swap any bytes /* swap any bytes */
// (Intel). /* (Intel). */
#define DEBI_CFG_SWAP_2 0x00100000 // 2-byte swap (Motorola). #define DEBI_CFG_SWAP_2 0x00100000 /* 2-byte swap (Motorola). */
#define DEBI_CFG_SWAP_4 0x00200000 // 4-byte swap. #define DEBI_CFG_SWAP_4 0x00200000 /* 4-byte swap. */
#define DEBI_CFG_16 0x00080000 // Slave is able to #define DEBI_CFG_16 0x00080000 /* Slave is able to */
// serve 16-bit /* serve 16-bit */
// cycles. /* cycles. */
#define DEBI_CFG_SLAVE16 0x00080000 // Slave is able to #define DEBI_CFG_SLAVE16 0x00080000 /* Slave is able to */
// serve 16-bit /* serve 16-bit */
// cycles. /* cycles. */
#define DEBI_CFG_INC 0x00040000 // enab address #define DEBI_CFG_INC 0x00040000 /* enab address */
// increment for block /* increment for block */
// transfers. /* transfers. */
#define DEBI_CFG_INTEL 0x00020000 // Intel style local bus. #define DEBI_CFG_INTEL 0x00020000 /* Intel style local bus. */
#define DEBI_CFG_TIMEROFF 0x00010000 // Disable timer. #define DEBI_CFG_TIMEROFF 0x00010000 /* Disable timer. */
#if PLATFORM == INTEL #if PLATFORM == INTEL
#define DEBI_TOUT 7 // Wait 7 PCI clocks #define DEBI_TOUT 7 /* Wait 7 PCI clocks */
// (212 ns) before /* (212 ns) before */
// polling RDY. /* polling RDY. */
// Intel byte lane steering (pass through all byte lanes). /* Intel byte lane steering (pass through all byte lanes). */
#define DEBI_SWAP DEBI_CFG_SWAP_NONE #define DEBI_SWAP DEBI_CFG_SWAP_NONE
#elif PLATFORM == MOTOROLA #elif PLATFORM == MOTOROLA
#define DEBI_TOUT 15 // Wait 15 PCI clocks (454 ns) #define DEBI_TOUT 15 /* Wait 15 PCI clocks (454 ns) */
// maximum before timing out. /* maximum before timing out. */
#define DEBI_SWAP DEBI_CFG_SWAP_2 // Motorola byte lane steering. #define DEBI_SWAP DEBI_CFG_SWAP_2 /* Motorola byte lane steering. */
#endif #endif
// DEBI page table constants. /* DEBI page table constants. */
#define DEBI_PAGE_DISABLE 0x00000000 // Paging disable. #define DEBI_PAGE_DISABLE 0x00000000 /* Paging disable. */
///////////////////EXTRA FROM OTHER SANSORAY * .h//////// /* ******* EXTRA FROM OTHER SANSORAY * .h ******* */
// LoadSrc values: /* LoadSrc values: */
#define LOADSRC_INDX 0 // Preload core in response to #define LOADSRC_INDX 0 /* Preload core in response to */
// Index. /* Index. */
#define LOADSRC_OVER 1 // Preload core in response to #define LOADSRC_OVER 1 /* Preload core in response to */
// Overflow. /* Overflow. */
#define LOADSRCB_OVERA 2 // Preload B core in response #define LOADSRCB_OVERA 2 /* Preload B core in response */
// to A Overflow. /* to A Overflow. */
#define LOADSRC_NONE 3 // Never preload core. #define LOADSRC_NONE 3 /* Never preload core. */
// IntSrc values: /* IntSrc values: */
#define INTSRC_NONE 0 // Interrupts disabled. #define INTSRC_NONE 0 /* Interrupts disabled. */
#define INTSRC_OVER 1 // Interrupt on Overflow. #define INTSRC_OVER 1 /* Interrupt on Overflow. */
#define INTSRC_INDX 2 // Interrupt on Index. #define INTSRC_INDX 2 /* Interrupt on Index. */
#define INTSRC_BOTH 3 // Interrupt on Index or Overflow. #define INTSRC_BOTH 3 /* Interrupt on Index or Overflow. */
// LatchSrc values: /* LatchSrc values: */
#define LATCHSRC_AB_READ 0 // Latch on read. #define LATCHSRC_AB_READ 0 /* Latch on read. */
#define LATCHSRC_A_INDXA 1 // Latch A on A Index. #define LATCHSRC_A_INDXA 1 /* Latch A on A Index. */
#define LATCHSRC_B_INDXB 2 // Latch B on B Index. #define LATCHSRC_B_INDXB 2 /* Latch B on B Index. */
#define LATCHSRC_B_OVERA 3 // Latch B on A Overflow. #define LATCHSRC_B_OVERA 3 /* Latch B on A Overflow. */
// IndxSrc values: /* IndxSrc values: */
#define INDXSRC_HARD 0 // Hardware or software index. #define INDXSRC_HARD 0 /* Hardware or software index. */
#define INDXSRC_SOFT 1 // Software index only. #define INDXSRC_SOFT 1 /* Software index only. */
// IndxPol values: /* IndxPol values: */
#define INDXPOL_POS 0 // Index input is active high. #define INDXPOL_POS 0 /* Index input is active high. */
#define INDXPOL_NEG 1 // Index input is active low. #define INDXPOL_NEG 1 /* Index input is active low. */
// ClkSrc values: /* ClkSrc values: */
#define CLKSRC_COUNTER 0 // Counter mode. #define CLKSRC_COUNTER 0 /* Counter mode. */
#define CLKSRC_TIMER 2 // Timer mode. #define CLKSRC_TIMER 2 /* Timer mode. */
#define CLKSRC_EXTENDER 3 // Extender mode. #define CLKSRC_EXTENDER 3 /* Extender mode. */
// ClkPol values: /* ClkPol values: */
#define CLKPOL_POS 0 // Counter/Extender clock is #define CLKPOL_POS 0 /* Counter/Extender clock is */
// active high. /* active high. */
#define CLKPOL_NEG 1 // Counter/Extender clock is #define CLKPOL_NEG 1 /* Counter/Extender clock is */
// active low. /* active low. */
#define CNTDIR_UP 0 // Timer counts up. #define CNTDIR_UP 0 /* Timer counts up. */
#define CNTDIR_DOWN 1 // Timer counts down. #define CNTDIR_DOWN 1 /* Timer counts down. */
// ClkEnab values: /* ClkEnab values: */
#define CLKENAB_ALWAYS 0 // Clock always enabled. #define CLKENAB_ALWAYS 0 /* Clock always enabled. */
#define CLKENAB_INDEX 1 // Clock is enabled by index. #define CLKENAB_INDEX 1 /* Clock is enabled by index. */
// ClkMult values: /* ClkMult values: */
#define CLKMULT_4X 0 // 4x clock multiplier. #define CLKMULT_4X 0 /* 4x clock multiplier. */
#define CLKMULT_2X 1 // 2x clock multiplier. #define CLKMULT_2X 1 /* 2x clock multiplier. */
#define CLKMULT_1X 2 // 1x clock multiplier. #define CLKMULT_1X 2 /* 1x clock multiplier. */
// Bit Field positions in COUNTER_SETUP structure: /* Bit Field positions in COUNTER_SETUP structure: */
#define BF_LOADSRC 9 // Preload trigger. #define BF_LOADSRC 9 /* Preload trigger. */
#define BF_INDXSRC 7 // Index source. #define BF_INDXSRC 7 /* Index source. */
#define BF_INDXPOL 6 // Index polarity. #define BF_INDXPOL 6 /* Index polarity. */
#define BF_CLKSRC 4 // Clock source. #define BF_CLKSRC 4 /* Clock source. */
#define BF_CLKPOL 3 // Clock polarity/count direction. #define BF_CLKPOL 3 /* Clock polarity/count direction. */
#define BF_CLKMULT 1 // Clock multiplier. #define BF_CLKMULT 1 /* Clock multiplier. */
#define BF_CLKENAB 0 // Clock enable. #define BF_CLKENAB 0 /* Clock enable. */
// Enumerated counter operating modes specified by ClkSrc bit field in /* Enumerated counter operating modes specified by ClkSrc bit field in */
// a COUNTER_SETUP. /* a COUNTER_SETUP. */
#define CLKSRC_COUNTER 0 // Counter: ENC_C clock, ENC_D #define CLKSRC_COUNTER 0 /* Counter: ENC_C clock, ENC_D */
// direction. /* direction. */
#define CLKSRC_TIMER 2 // Timer: SYS_C clock, #define CLKSRC_TIMER 2 /* Timer: SYS_C clock, */
// direction specified by /* direction specified by */
// ClkPol. /* ClkPol. */
#define CLKSRC_EXTENDER 3 // Extender: OVR_A clock, #define CLKSRC_EXTENDER 3 /* Extender: OVR_A clock, */
// ENC_D direction. /* ENC_D direction. */
// Enumerated counter clock multipliers. /* Enumerated counter clock multipliers. */
#define MULT_X0 0x0003 // Supports no multipliers; #define MULT_X0 0x0003 /* Supports no multipliers; */
// fixed physical multiplier = /* fixed physical multiplier = */
// 3. /* 3. */
#define MULT_X1 0x0002 // Supports multiplier x1; #define MULT_X1 0x0002 /* Supports multiplier x1; */
// fixed physical multiplier = /* fixed physical multiplier = */
// 2. /* 2. */
#define MULT_X2 0x0001 // Supports multipliers x1, #define MULT_X2 0x0001 /* Supports multipliers x1, */
// x2; physical multipliers = /* x2; physical multipliers = */
// 1 or 2. /* 1 or 2. */
#define MULT_X4 0x0000 // Supports multipliers x1, #define MULT_X4 0x0000 /* Supports multipliers x1, */
// x2, x4; physical /* x2, x4; physical */
// multipliers = 0, 1 or 2. /* multipliers = 0, 1 or 2. */
// Sanity-check limits for parameters. /* Sanity-check limits for parameters. */
#define NUM_COUNTERS 6 // Maximum valid counter #define NUM_COUNTERS 6 /* Maximum valid counter */
// logical channel number. /* logical channel number. */
#define NUM_INTSOURCES 4 #define NUM_INTSOURCES 4
#define NUM_LATCHSOURCES 4 #define NUM_LATCHSOURCES 4
#define NUM_CLKMULTS 4 #define NUM_CLKMULTS 4
...@@ -708,33 +653,33 @@ ...@@ -708,33 +653,33 @@
#define NUM_INDEXSOURCES 2 #define NUM_INDEXSOURCES 2
#define NUM_LOADTRIGS 4 #define NUM_LOADTRIGS 4
// Bit field positions in CRA and CRB counter control registers. /* Bit field positions in CRA and CRB counter control registers. */
// Bit field positions in CRA: /* Bit field positions in CRA: */
#define CRABIT_INDXSRC_B 14 // B index source. #define CRABIT_INDXSRC_B 14 /* B index source. */
#define CRABIT_CLKSRC_B 12 // B clock source. #define CRABIT_CLKSRC_B 12 /* B clock source. */
#define CRABIT_INDXPOL_A 11 // A index polarity. #define CRABIT_INDXPOL_A 11 /* A index polarity. */
#define CRABIT_LOADSRC_A 9 // A preload trigger. #define CRABIT_LOADSRC_A 9 /* A preload trigger. */
#define CRABIT_CLKMULT_A 7 // A clock multiplier. #define CRABIT_CLKMULT_A 7 /* A clock multiplier. */
#define CRABIT_INTSRC_A 5 // A interrupt source. #define CRABIT_INTSRC_A 5 /* A interrupt source. */
#define CRABIT_CLKPOL_A 4 // A clock polarity. #define CRABIT_CLKPOL_A 4 /* A clock polarity. */
#define CRABIT_INDXSRC_A 2 // A index source. #define CRABIT_INDXSRC_A 2 /* A index source. */
#define CRABIT_CLKSRC_A 0 // A clock source. #define CRABIT_CLKSRC_A 0 /* A clock source. */
// Bit field positions in CRB: /* Bit field positions in CRB: */
#define CRBBIT_INTRESETCMD 15 // Interrupt reset command. #define CRBBIT_INTRESETCMD 15 /* Interrupt reset command. */
#define CRBBIT_INTRESET_B 14 // B interrupt reset enable. #define CRBBIT_INTRESET_B 14 /* B interrupt reset enable. */
#define CRBBIT_INTRESET_A 13 // A interrupt reset enable. #define CRBBIT_INTRESET_A 13 /* A interrupt reset enable. */
#define CRBBIT_CLKENAB_A 12 // A clock enable. #define CRBBIT_CLKENAB_A 12 /* A clock enable. */
#define CRBBIT_INTSRC_B 10 // B interrupt source. #define CRBBIT_INTSRC_B 10 /* B interrupt source. */
#define CRBBIT_LATCHSRC 8 // A/B latch source. #define CRBBIT_LATCHSRC 8 /* A/B latch source. */
#define CRBBIT_LOADSRC_B 6 // B preload trigger. #define CRBBIT_LOADSRC_B 6 /* B preload trigger. */
#define CRBBIT_CLKMULT_B 3 // B clock multiplier. #define CRBBIT_CLKMULT_B 3 /* B clock multiplier. */
#define CRBBIT_CLKENAB_B 2 // B clock enable. #define CRBBIT_CLKENAB_B 2 /* B clock enable. */
#define CRBBIT_INDXPOL_B 1 // B index polarity. #define CRBBIT_INDXPOL_B 1 /* B index polarity. */
#define CRBBIT_CLKPOL_B 0 // B clock polarity. #define CRBBIT_CLKPOL_B 0 /* B clock polarity. */
// Bit field masks for CRA and CRB. /* Bit field masks for CRA and CRB. */
#define CRAMSK_INDXSRC_B ( (uint16_t)( 3 << CRABIT_INDXSRC_B) ) #define CRAMSK_INDXSRC_B ( (uint16_t)( 3 << CRABIT_INDXSRC_B) )
#define CRAMSK_CLKSRC_B ( (uint16_t)( 3 << CRABIT_CLKSRC_B) ) #define CRAMSK_CLKSRC_B ( (uint16_t)( 3 << CRABIT_CLKSRC_B) )
...@@ -758,9 +703,9 @@ ...@@ -758,9 +703,9 @@
#define CRBMSK_INDXPOL_B ( (uint16_t)( 1 << CRBBIT_INDXPOL_B) ) #define CRBMSK_INDXPOL_B ( (uint16_t)( 1 << CRBBIT_INDXPOL_B) )
#define CRBMSK_CLKPOL_B ( (uint16_t)( 1 << CRBBIT_CLKPOL_B) ) #define CRBMSK_CLKPOL_B ( (uint16_t)( 1 << CRBBIT_CLKPOL_B) )
#define CRBMSK_INTCTRL ( CRBMSK_INTRESETCMD | CRBMSK_INTRESET_A | CRBMSK_INTRESET_B ) // Interrupt reset control bits. #define CRBMSK_INTCTRL ( CRBMSK_INTRESETCMD | CRBMSK_INTRESET_A | CRBMSK_INTRESET_B ) /* Interrupt reset control bits. */
// Bit field positions for standardized SETUP structure. /* Bit field positions for standardized SETUP structure. */
#define STDBIT_INTSRC 13 #define STDBIT_INTSRC 13
#define STDBIT_LATCHSRC 11 #define STDBIT_LATCHSRC 11
...@@ -772,7 +717,7 @@ ...@@ -772,7 +717,7 @@
#define STDBIT_CLKMULT 1 #define STDBIT_CLKMULT 1
#define STDBIT_CLKENAB 0 #define STDBIT_CLKENAB 0
// Bit field masks for standardized SETUP structure. /* Bit field masks for standardized SETUP structure. */
#define STDMSK_INTSRC ( (uint16_t)( 3 << STDBIT_INTSRC ) ) #define STDMSK_INTSRC ( (uint16_t)( 3 << STDBIT_INTSRC ) )
#define STDMSK_LATCHSRC ( (uint16_t)( 3 << STDBIT_LATCHSRC ) ) #define STDMSK_LATCHSRC ( (uint16_t)( 3 << STDBIT_LATCHSRC ) )
...@@ -784,7 +729,6 @@ ...@@ -784,7 +729,6 @@
#define STDMSK_CLKMULT ( (uint16_t)( 3 << STDBIT_CLKMULT ) ) #define STDMSK_CLKMULT ( (uint16_t)( 3 << STDBIT_CLKMULT ) )
#define STDMSK_CLKENAB ( (uint16_t)( 1 << STDBIT_CLKENAB ) ) #define STDMSK_CLKENAB ( (uint16_t)( 1 << STDBIT_CLKENAB ) )
//////////////////////////////////////////////////////////
/* typedef struct indexCounter */ /* typedef struct indexCounter */
/* { */ /* { */
......
drivers/staging/comedi/pci_ids.h
View file @ b6c77757
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
#define PCI_DEVICE_ID_QUANCOM_GPIB 0x3302 #define PCI_DEVICE_ID_QUANCOM_GPIB 0x3302
#endif #endif
#endif // __COMPAT_LINUX_PCI_IDS_H #endif /* __COMPAT_LINUX_PCI_IDS_H */
drivers/staging/comedi/proc.c
View file @ b6c77757
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#define __NO_VERSION__ #define __NO_VERSION__
#include "comedidev.h" #include "comedidev.h"
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
//#include <linux/string.h> /* #include <linux/string.h> */
int comedi_read_procmem(char *buf, char **start, off_t offset, int len, int comedi_read_procmem(char *buf, char **start, off_t offset, int len,
int *eof, void *data); int *eof, void *data);
......
drivers/staging/comedi/range.c
View file @ b6c77757
...@@ -88,7 +88,7 @@ static int aref_invalid(comedi_subdevice * s, unsigned int chanspec) ...@@ -88,7 +88,7 @@ static int aref_invalid(comedi_subdevice * s, unsigned int chanspec)
{ {
unsigned int aref; unsigned int aref;
// disable reporting invalid arefs... maybe someday /* disable reporting invalid arefs... maybe someday */
return 0; return 0;
aref = CR_AREF(chanspec); aref = CR_AREF(chanspec);
......
drivers/staging/comedi/rt.c
View file @ b6c77757
...@@ -78,7 +78,7 @@ int comedi_request_irq(unsigned irq, irqreturn_t(*handler) (int, ...@@ -78,7 +78,7 @@ int comedi_request_irq(unsigned irq, irqreturn_t(*handler) (int,
ret = request_irq(irq, handler, unshared_flags, device, dev_id); ret = request_irq(irq, handler, unshared_flags, device, dev_id);
if (ret < 0) { if (ret < 0) {
// we failed, so fall back on allowing shared interrupt (which we won't ever make RT) /* we failed, so fall back on allowing shared interrupt (which we won't ever make RT) */
if (flags & IRQF_SHARED) { if (flags & IRQF_SHARED) {
rt_printk rt_printk
("comedi: cannot get unshared interrupt, will not use RT interrupts.\n"); ("comedi: cannot get unshared interrupt, will not use RT interrupts.\n");
...@@ -192,7 +192,7 @@ static void handle_void_irq(int irq) ...@@ -192,7 +192,7 @@ static void handle_void_irq(int irq)
return; return;
} }
it->handler(irq, it->dev_id PT_REGS_NULL); it->handler(irq, it->dev_id PT_REGS_NULL);
rt_enable_irq(irq); //needed by rtai-adeos, seems like it shouldn't hurt earlier versions rt_enable_irq(irq); /* needed by rtai-adeos, seems like it shouldn't hurt earlier versions */
} }
DECLARE_VOID_IRQ(0); DECLARE_VOID_IRQ(0);
...@@ -402,11 +402,11 @@ static int comedi_rt_release_irq(struct comedi_irq_struct *it) ...@@ -402,11 +402,11 @@ static int comedi_rt_release_irq(struct comedi_irq_struct *it)
void comedi_rt_init(void) void comedi_rt_init(void)
{ {
//rt_pend_tq_init(); /* rt_pend_tq_init(); */
} }
void comedi_rt_cleanup(void) void comedi_rt_cleanup(void)
{ {
//rt_pend_tq_cleanup(); /* rt_pend_tq_cleanup(); */
} }
#endif #endif
drivers/staging/comedi/rt_pend_tq.c
View file @ b6c77757
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/sched.h> #include <linux/sched.h>
#include "comedidev.h" // for rt spinlocks #include "comedidev.h" /* for rt spinlocks */
#include "rt_pend_tq.h" #include "rt_pend_tq.h"
#ifdef CONFIG_COMEDI_RTAI #ifdef CONFIG_COMEDI_RTAI
#include <rtai.h> #include <rtai.h>
...@@ -27,7 +27,7 @@ volatile static struct rt_pend_tq *volatile rt_pend_head = rt_pend_tq, ...@@ -27,7 +27,7 @@ volatile static struct rt_pend_tq *volatile rt_pend_head = rt_pend_tq,
int rt_pend_tq_irq = 0; int rt_pend_tq_irq = 0;
DEFINE_SPINLOCK(rt_pend_tq_lock); DEFINE_SPINLOCK(rt_pend_tq_lock);
// WARNING: following code not checked against race conditions yet. /* WARNING: following code not checked against race conditions yet. */
#define INC_CIRCULAR_PTR(ptr,begin,size) do {if(++(ptr)>=(begin)+(size)) (ptr)=(begin); } while(0) #define INC_CIRCULAR_PTR(ptr,begin,size) do {if(++(ptr)>=(begin)+(size)) (ptr)=(begin); } while(0)
#define DEC_CIRCULAR_PTR(ptr,begin,size) do {if(--(ptr)<(begin)) (ptr)=(begin)+(size)-1; } while(0) #define DEC_CIRCULAR_PTR(ptr,begin,size) do {if(--(ptr)<(begin)) (ptr)=(begin)+(size)-1; } while(0)
...@@ -42,7 +42,7 @@ int rt_pend_call(void (*func) (int arg1, void *arg2), int arg1, void *arg2) ...@@ -42,7 +42,7 @@ int rt_pend_call(void (*func) (int arg1, void *arg2), int arg1, void *arg2)
comedi_spin_lock_irqsave(&rt_pend_tq_lock, flags); comedi_spin_lock_irqsave(&rt_pend_tq_lock, flags);
INC_CIRCULAR_PTR(rt_pend_head, rt_pend_tq, RT_PEND_TQ_SIZE); INC_CIRCULAR_PTR(rt_pend_head, rt_pend_tq, RT_PEND_TQ_SIZE);
if (rt_pend_head == rt_pend_tail) { if (rt_pend_head == rt_pend_tail) {
// overflow, we just refuse to take this request /* overflow, we just refuse to take this request */
DEC_CIRCULAR_PTR(rt_pend_head, rt_pend_tq, RT_PEND_TQ_SIZE); DEC_CIRCULAR_PTR(rt_pend_head, rt_pend_tq, RT_PEND_TQ_SIZE);
comedi_spin_unlock_irqrestore(&rt_pend_tq_lock, flags); comedi_spin_unlock_irqrestore(&rt_pend_tq_lock, flags);
return -EAGAIN; return -EAGAIN;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7