Skip to content

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

Staging: comedi: more remove C99 comments 

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 68c3dbff
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 39 deletions
drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
View file @ 56e9e166
...@@ -811,35 +811,35 @@ int i_EepromReadMainHeader(unsigned short w_PCIBoardEepromAddress, ...@@ -811,35 +811,35 @@ int i_EepromReadMainHeader(unsigned short w_PCIBoardEepromAddress,
struct str_MainHeader s_MainHeader; struct str_MainHeader s_MainHeader;
struct str_DigitalInputHeader s_DigitalInputHeader; struct str_DigitalInputHeader s_DigitalInputHeader;
struct str_DigitalOutputHeader s_DigitalOutputHeader; struct str_DigitalOutputHeader s_DigitalOutputHeader;
//struct str_TimerMainHeader s_TimerMainHeader,s_WatchdogMainHeader; /* struct str_TimerMainHeader s_TimerMainHeader,s_WatchdogMainHeader; */
str_AnalogOutputHeader s_AnalogOutputHeader; str_AnalogOutputHeader s_AnalogOutputHeader;
struct str_AnalogInputHeader s_AnalogInputHeader; struct str_AnalogInputHeader s_AnalogInputHeader;
// Read size /* Read size */
s_MainHeader.w_HeaderSize = s_MainHeader.w_HeaderSize =
w_EepromReadWord(w_PCIBoardEepromAddress, pc_PCIChipInformation, w_EepromReadWord(w_PCIBoardEepromAddress, pc_PCIChipInformation,
0x100 + 8); 0x100 + 8);
// Read nbr of functionality /* Read nbr of functionality */
w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress, w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress,
pc_PCIChipInformation, 0x100 + 10); pc_PCIChipInformation, 0x100 + 10);
s_MainHeader.b_Nfunctions = (unsigned char) w_Temp & 0x00FF; s_MainHeader.b_Nfunctions = (unsigned char) w_Temp & 0x00FF;
// Read functionality details /* Read functionality details */
for (i = 0; i < s_MainHeader.b_Nfunctions; i++) { for (i = 0; i < s_MainHeader.b_Nfunctions; i++) {
// Read Type /* Read Type */
w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress, w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress,
pc_PCIChipInformation, 0x100 + 12 + w_Count); pc_PCIChipInformation, 0x100 + 12 + w_Count);
s_MainHeader.s_Functions[i].b_Type = (unsigned char) w_Temp & 0x3F; s_MainHeader.s_Functions[i].b_Type = (unsigned char) w_Temp & 0x3F;
w_Count = w_Count + 2; w_Count = w_Count + 2;
//Read Address /* Read Address */
s_MainHeader.s_Functions[i].w_Address = s_MainHeader.s_Functions[i].w_Address =
w_EepromReadWord(w_PCIBoardEepromAddress, w_EepromReadWord(w_PCIBoardEepromAddress,
pc_PCIChipInformation, 0x100 + 12 + w_Count); pc_PCIChipInformation, 0x100 + 12 + w_Count);
w_Count = w_Count + 2; w_Count = w_Count + 2;
} }
// Display main header info /* Display main header info */
for (i = 0; i < s_MainHeader.b_Nfunctions; i++) { for (i = 0; i < s_MainHeader.b_Nfunctions; i++) {
switch (s_MainHeader.s_Functions[i].b_Type) { switch (s_MainHeader.s_Functions[i].b_Type) {
......
drivers/staging/comedi/drivers/adq12b.c
View file @ 56e9e166
...@@ -81,7 +81,7 @@ If you do not specify any options, they will default to ...@@ -81,7 +81,7 @@ If you do not specify any options, they will default to
#include "../comedidev.h" #include "../comedidev.h"
// address scheme (page 2.17 of the manual) /* address scheme (page 2.17 of the manual) */
#define ADQ12B_SIZE 16 #define ADQ12B_SIZE 16
#define ADQ12B_CTREG 0x00 #define ADQ12B_CTREG 0x00
...@@ -94,12 +94,12 @@ If you do not specify any options, they will default to ...@@ -94,12 +94,12 @@ If you do not specify any options, they will default to
#define ADQ12B_CONT2 0x0e #define ADQ12B_CONT2 0x0e
#define ADQ12B_COWORD 0x0f #define ADQ12B_COWORD 0x0f
// mask of the bit at STINR to check end of conversion /* mask of the bit at STINR to check end of conversion */
#define ADQ12B_EOC 0x20 #define ADQ12B_EOC 0x20
#define TIMEOUT 20 #define TIMEOUT 20
// available ranges through the PGA gains /* available ranges through the PGA gains */
static const struct comedi_lrange range_adq12b_ai_bipolar = { 4, { static const struct comedi_lrange range_adq12b_ai_bipolar = { 4, {
BIP_RANGE(5), BIP_RANGE(5),
BIP_RANGE(2), BIP_RANGE(2),
...@@ -134,7 +134,7 @@ static const struct adq12b_board adq12b_boards[] = { ...@@ -134,7 +134,7 @@ static const struct adq12b_board adq12b_boards[] = {
.di_chans = 5, .di_chans = 5,
.do_chans = 8 .do_chans = 8
} }
// potentially, more adq-based deviced will be added /* potentially, more adq-based deviced will be added */
/*, /*,
.name = "adq12b", .name = "adq12b",
.ai_chans = 16, // this is just for reference, hardcoded again later .ai_chans = 16, // this is just for reference, hardcoded again later
...@@ -337,17 +337,17 @@ static int adq12b_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s ...@@ -337,17 +337,17 @@ static int adq12b_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s
/* wait for end of convertion */ /* wait for end of convertion */
i = 0; i = 0;
do { do {
// comedi_udelay(1); /* comedi_udelay(1); */
status = inb(dev->iobase + ADQ12B_STINR); status = inb(dev->iobase + ADQ12B_STINR);
status = status & ADQ12B_EOC; status = status & ADQ12B_EOC;
} while (status == 0 && ++i < TIMEOUT); } while (status == 0 && ++i < TIMEOUT);
// } while (++i < 10); /* } while (++i < 10); */
/* read data */ /* read data */
hi = inb(dev->iobase + ADQ12B_ADHIG); hi = inb(dev->iobase + ADQ12B_ADHIG);
lo = inb(dev->iobase + ADQ12B_ADLOW); lo = inb(dev->iobase + ADQ12B_ADLOW);
//rt_printk("debug: chan=%d range=%d status=%d hi=%d lo=%d\n", channel, range, status, hi, lo); /* rt_printk("debug: chan=%d range=%d status=%d hi=%d lo=%d\n", channel, range, status, hi, lo); */
data[n] = (hi << 8) | lo; data[n] = (hi << 8) | lo;
} }
......
drivers/staging/comedi/drivers/ni_pcidio.c
View file @ 56e9e166
...@@ -66,8 +66,8 @@ comedi_nonfree_firmware tarball available from http://www.comedi.org ...@@ -66,8 +66,8 @@ comedi_nonfree_firmware tarball available from http://www.comedi.org
*/ */
#define USE_DMA #define USE_DMA
//#define DEBUG 1 /* #define DEBUG 1 */
//#define DEBUG_FLAGS /* #define DEBUG_FLAGS */
#include "../comedidev.h" #include "../comedidev.h"
...@@ -117,9 +117,9 @@ comedi_nonfree_firmware tarball available from http://www.comedi.org ...@@ -117,9 +117,9 @@ comedi_nonfree_firmware tarball available from http://www.comedi.org
#define Waited (1<<5) #define Waited (1<<5)
#define PrimaryTC (1<<6) #define PrimaryTC (1<<6)
#define SecondaryTC (1<<7) #define SecondaryTC (1<<7)
//#define SerialRose /* #define SerialRose */
//#define ReqRose /* #define ReqRose */
//#define Paused /* #define Paused */
#define Group_1_First_Clear 6 /* W */ #define Group_1_First_Clear 6 /* W */
#define Group_2_First_Clear 7 /* W */ #define Group_2_First_Clear 7 /* W */
...@@ -206,7 +206,7 @@ comedi_nonfree_firmware tarball available from http://www.comedi.org ...@@ -206,7 +206,7 @@ comedi_nonfree_firmware tarball available from http://www.comedi.org
#define DMA_Line_Control_Group1 76 #define DMA_Line_Control_Group1 76
#define DMA_Line_Control_Group2 108 #define DMA_Line_Control_Group2 108
// channel zero is none /* channel zero is none */
static inline unsigned primary_DMAChannel_bits(unsigned channel) static inline unsigned primary_DMAChannel_bits(unsigned channel)
{ {
return channel & 0x3; return channel & 0x3;
...@@ -486,7 +486,7 @@ static irqreturn_t nidio_interrupt(int irq, void *d) ...@@ -486,7 +486,7 @@ static irqreturn_t nidio_interrupt(int irq, void *d)
struct comedi_async *async = s->async; struct comedi_async *async = s->async;
struct mite_struct *mite = devpriv->mite; struct mite_struct *mite = devpriv->mite;
//int i, j; /* int i, j; */
long int AuxData = 0; long int AuxData = 0;
short data1 = 0; short data1 = 0;
short data2 = 0; short data2 = 0;
...@@ -496,9 +496,9 @@ static irqreturn_t nidio_interrupt(int irq, void *d) ...@@ -496,9 +496,9 @@ static irqreturn_t nidio_interrupt(int irq, void *d)
unsigned int m_status = 0; unsigned int m_status = 0;
unsigned long irq_flags; unsigned long irq_flags;
//interrupcions parasites /* interrupcions parasites */
if (dev->attached == 0) { if (dev->attached == 0) {
// assume it's from another card /* assume it's from another card */
return IRQ_NONE; return IRQ_NONE;
} }
...@@ -511,8 +511,8 @@ static irqreturn_t nidio_interrupt(int irq, void *d) ...@@ -511,8 +511,8 @@ static irqreturn_t nidio_interrupt(int irq, void *d)
ni_pcidio_print_flags(flags); ni_pcidio_print_flags(flags);
ni_pcidio_print_status(status); ni_pcidio_print_status(status);
//printk("buf[0]=%08x\n",*(unsigned int *)async->prealloc_buf); /* printk("buf[0]=%08x\n",*(unsigned int *)async->prealloc_buf); */
//printk("buf[4096]=%08x\n",*(unsigned int *)(async->prealloc_buf+4096)); /* printk("buf[4096]=%08x\n",*(unsigned int *)(async->prealloc_buf+4096)); */
comedi_spin_lock_irqsave(&devpriv->mite_channel_lock, irq_flags); comedi_spin_lock_irqsave(&devpriv->mite_channel_lock, irq_flags);
if (devpriv->di_mite_chan) if (devpriv->di_mite_chan)
...@@ -520,8 +520,8 @@ static irqreturn_t nidio_interrupt(int irq, void *d) ...@@ -520,8 +520,8 @@ static irqreturn_t nidio_interrupt(int irq, void *d)
#ifdef MITE_DEBUG #ifdef MITE_DEBUG
mite_print_chsr(m_status); mite_print_chsr(m_status);
#endif #endif
//printk("mite_bytes_transferred: %d\n",mite_bytes_transferred(mite,DI_DMA_CHAN)); /* printk("mite_bytes_transferred: %d\n",mite_bytes_transferred(mite,DI_DMA_CHAN)); */
//mite_dump_regs(mite); /* mite_dump_regs(mite); */
if (m_status & CHSR_INT) { if (m_status & CHSR_INT) {
if (m_status & CHSR_LINKC) { if (m_status & CHSR_LINKC) {
writel(CHOR_CLRLC, writel(CHOR_CLRLC,
...@@ -552,7 +552,7 @@ static irqreturn_t nidio_interrupt(int irq, void *d) ...@@ -552,7 +552,7 @@ static irqreturn_t nidio_interrupt(int irq, void *d)
flags &= IntEn; flags &= IntEn;
if (flags & TransferReady) { if (flags & TransferReady) {
//DPRINTK("TransferReady\n"); /* DPRINTK("TransferReady\n"); */
while (flags & TransferReady) { while (flags & TransferReady) {
work++; work++;
if (work > 100) { if (work > 100) {
...@@ -569,14 +569,14 @@ static irqreturn_t nidio_interrupt(int irq, void *d) ...@@ -569,14 +569,14 @@ static irqreturn_t nidio_interrupt(int irq, void *d)
data2 = (AuxData & 0xffff0000) >> 16; data2 = (AuxData & 0xffff0000) >> 16;
comedi_buf_put(async, data1); comedi_buf_put(async, data1);
comedi_buf_put(async, data2); comedi_buf_put(async, data2);
//DPRINTK("read:%d, %d\n",data1,data2); /* DPRINTK("read:%d, %d\n",data1,data2); */
flags = readb(devpriv->mite->daq_io_addr + flags = readb(devpriv->mite->daq_io_addr +
Group_1_Flags); Group_1_Flags);
} }
//DPRINTK("buf_int_count: %d\n",async->buf_int_count); /* DPRINTK("buf_int_count: %d\n",async->buf_int_count); */
//DPRINTK("1) IntEn=%d,flags=%d,status=%d\n",IntEn,flags,status); /* DPRINTK("1) IntEn=%d,flags=%d,status=%d\n",IntEn,flags,status); */
//ni_pcidio_print_flags(flags); /* ni_pcidio_print_flags(flags); */
//ni_pcidio_print_status(status); /* ni_pcidio_print_status(status); */
async->events |= COMEDI_CB_BLOCK; async->events |= COMEDI_CB_BLOCK;
} }
...@@ -621,10 +621,10 @@ static irqreturn_t nidio_interrupt(int irq, void *d) ...@@ -621,10 +621,10 @@ static irqreturn_t nidio_interrupt(int irq, void *d)
flags = readb(devpriv->mite->daq_io_addr + Group_1_Flags); flags = readb(devpriv->mite->daq_io_addr + Group_1_Flags);
status = readb(devpriv->mite->daq_io_addr + status = readb(devpriv->mite->daq_io_addr +
Interrupt_And_Window_Status); Interrupt_And_Window_Status);
//DPRINTK("loop end: IntEn=0x%02x,flags=0x%02x,status=0x%02x\n", /* DPRINTK("loop end: IntEn=0x%02x,flags=0x%02x,status=0x%02x\n", */
// IntEn,flags,status); /* IntEn,flags,status); */
//ni_pcidio_print_flags(flags); /* ni_pcidio_print_flags(flags); */
//ni_pcidio_print_status(status); /* ni_pcidio_print_status(status); */
} }
out: out:
...@@ -963,7 +963,7 @@ static int ni_pcidio_cmd(struct comedi_device * dev, struct comedi_subdevice * s ...@@ -963,7 +963,7 @@ static int ni_pcidio_cmd(struct comedi_device * dev, struct comedi_subdevice * s
/* clear and enable interrupts */ /* clear and enable interrupts */
writeb(0xff, devpriv->mite->daq_io_addr + Group_1_First_Clear); writeb(0xff, devpriv->mite->daq_io_addr + Group_1_First_Clear);
//writeb(ClearExpired,devpriv->mite->daq_io_addr+Group_1_Second_Clear); /* writeb(ClearExpired,devpriv->mite->daq_io_addr+Group_1_Second_Clear); */
writeb(IntEn, devpriv->mite->daq_io_addr + Interrupt_Control); writeb(IntEn, devpriv->mite->daq_io_addr + Interrupt_Control);
writeb(0x03, writeb(0x03,
...@@ -971,7 +971,7 @@ static int ni_pcidio_cmd(struct comedi_device * dev, struct comedi_subdevice * s ...@@ -971,7 +971,7 @@ static int ni_pcidio_cmd(struct comedi_device * dev, struct comedi_subdevice * s
if (cmd->stop_src == TRIG_NONE) { if (cmd->stop_src == TRIG_NONE) {
devpriv->OpModeBits = DataLatching(0) | RunMode(7); devpriv->OpModeBits = DataLatching(0) | RunMode(7);
} else { // TRIG_TIMER } else { /* TRIG_TIMER */
devpriv->OpModeBits = Numbered | RunMode(7); devpriv->OpModeBits = Numbered | RunMode(7);
} }
if (cmd->start_src == TRIG_NOW) { if (cmd->start_src == TRIG_NOW) {
......
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