* [PATCH 1/5] Staging: comedi: fix line-length coding style issue in usbduxfast.c
@ 2011-01-09 23:03 ahern.michael.t
2011-01-09 23:03 ` [PATCH 2/5] Staging: comedi: whitespace ahern.michael.t
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: ahern.michael.t @ 2011-01-09 23:03 UTC (permalink / raw)
To: gregkh, u.kleine-koenig, julia, nikai, morgan.gatti
Cc: devel, linux-kernel, mah
From: mah <ahern.michael.t@gmail.com>
This patch to usbduxfast.c file that fixes warnings found by checkpatch.pl tool
Signed-off-by: Michael Ahern <ahern.michael.t@gmail.com>
---
drivers/staging/comedi/drivers/usbduxfast.c | 54 +++++++++++++++-----------
1 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index 5b15e6d..be4f5ec 100644
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -453,14 +453,16 @@ static int usbduxfastsub_start(struct usbduxfastsub_s *udfs)
/* 7f92 to zero */
local_transfer_buffer[0] = 0;
/* bRequest, "Firmware" */
- ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0), USBDUXFASTSUB_FIRMWARE,
- VENDOR_DIR_OUT, /* bmRequestType */
- USBDUXFASTSUB_CPUCS, /* Value */
- 0x0000, /* Index */
- /* address of the transfer buffer */
- local_transfer_buffer,
- 1, /* Length */
- EZTIMEOUT); /* Timeout */
+ ret = usb_control_msg(udfs->usbdev,
+ usb_sndctrlpipe(udfs->usbdev, 0),
+ USBDUXFASTSUB_FIRMWARE,
+ VENDOR_DIR_OUT, /* bmRequestType */
+ USBDUXFASTSUB_CPUCS, /* Value */
+ 0x0000, /* Index */
+ /* address of the transfer buffer */
+ local_transfer_buffer,
+ 1, /* Length */
+ EZTIMEOUT); /* Timeout */
if (ret < 0) {
printk("comedi_: usbduxfast_: control msg failed (start)\n");
return ret;
@@ -477,12 +479,16 @@ static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs)
/* 7f92 to one */
local_transfer_buffer[0] = 1;
/* bRequest, "Firmware" */
- ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0), USBDUXFASTSUB_FIRMWARE,
- VENDOR_DIR_OUT, /* bmRequestType */
+ ret = usb_control_msg(udfs->usbdev,
+ usb_sndctrlpipe(udfs->usbdev, 0),
+ USBDUXFASTSUB_FIRMWARE,
+ VENDOR_DIR_OUT, /* bmRequestType */
USBDUXFASTSUB_CPUCS, /* Value */
- 0x0000, /* Index */
- local_transfer_buffer, 1, /* Length */
- EZTIMEOUT); /* Timeout */
+ 0x0000, /* Index */
+ local_transfer_buffer,
+ 1, /* Length */
+ EZTIMEOUT); /* Timeout */
+
if (ret < 0) {
printk(KERN_ERR "comedi_: usbduxfast: control msg failed "
"(stop)\n");
@@ -504,14 +510,16 @@ static int usbduxfastsub_upload(struct usbduxfastsub_s *udfs,
startAddr, local_transfer_buffer[0]);
#endif
/* brequest, firmware */
- ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0), USBDUXFASTSUB_FIRMWARE,
- VENDOR_DIR_OUT, /* bmRequestType */
- startAddr, /* value */
- 0x0000, /* index */
- /* our local safe buffer */
- local_transfer_buffer,
- len, /* length */
- EZTIMEOUT); /* timeout */
+ ret = usb_control_msg(udfs->usbdev,
+ usb_sndctrlpipe(udfs->usbdev, 0),
+ USBDUXFASTSUB_FIRMWARE,
+ VENDOR_DIR_OUT, /* bmRequestType */
+ startAddr, /* value */
+ 0x0000, /* index */
+ /* our local safe buffer */
+ local_transfer_buffer,
+ len, /* length */
+ EZTIMEOUT); /* timeout */
#ifdef CONFIG_COMEDI_DEBUG
printk(KERN_DEBUG "comedi_: usbduxfast: result=%d\n", ret);
@@ -1436,7 +1444,7 @@ static void tidy_up(struct usbduxfastsub_s *udfs)
udfs->ai_cmd_running = 0;
}
-static void usbduxfast_firmware_request_complete_handler(const struct firmware
+static void usbduxfast_firmware_req_complete_handler(const struct firmware
*fw, void *context)
{
struct usbduxfastsub_s *usbduxfastsub_tmp = context;
@@ -1577,7 +1585,7 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf,
&udev->dev,
GFP_KERNEL,
usbduxfastsub + index,
- usbduxfast_firmware_request_complete_handler);
+ usbduxfast_firmware_req_complete_handler);
if (ret) {
dev_err(&udev->dev, "could not load firmware (err=%d)\n", ret);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/5] Staging: comedi: whitespace
2011-01-09 23:03 [PATCH 1/5] Staging: comedi: fix line-length coding style issue in usbduxfast.c ahern.michael.t
@ 2011-01-09 23:03 ` ahern.michael.t
2011-01-09 23:03 ` [PATCH 3/5] Coding style in unioxx5.c KERN_ facility level and coding style warnings as reported by checkpatch.pl Signed-off-by: Michael Ahern <ahern.michael.t@gmail.com> ahern.michael.t
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: ahern.michael.t @ 2011-01-09 23:03 UTC (permalink / raw)
To: gregkh, u.kleine-koenig, julia, nikai, morgan.gatti
Cc: devel, linux-kernel, mah
From: mah <ahern.michael.t@gmail.com>
whitespace warning found by checkpatch.pl tool
Signed-off-by: Michael Ahern <ahern.michael.t@gmail.com>
---
drivers/staging/comedi/drivers/usbdux.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index de784ff..60b2159 100644
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -2447,7 +2447,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
usbduxsub[index].numOfInBuffers = NUMOFINBUFFERSFULL;
usbduxsub[index].urbIn =
- kzalloc(sizeof(struct urb *) * usbduxsub[index].numOfInBuffers,
+ kzalloc(sizeof(struct urb *) *usbduxsub[index].numOfInBuffers,
GFP_KERNEL);
if (!(usbduxsub[index].urbIn)) {
dev_err(dev, "comedi_: usbdux: Could not alloc. urbIn array\n");
@@ -2495,7 +2495,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
usbduxsub[index].numOfOutBuffers = NUMOFOUTBUFFERSFULL;
usbduxsub[index].urbOut =
- kzalloc(sizeof(struct urb *) * usbduxsub[index].numOfOutBuffers,
+ kzalloc(sizeof(struct urb *) *usbduxsub[index].numOfOutBuffers,
GFP_KERNEL);
if (!(usbduxsub[index].urbOut)) {
dev_err(dev, "comedi_: usbdux: "
--
1.7.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/5] Coding style in unioxx5.c KERN_ facility level and coding style warnings as reported by checkpatch.pl Signed-off-by: Michael Ahern <ahern.michael.t@gmail.com>
2011-01-09 23:03 [PATCH 1/5] Staging: comedi: fix line-length coding style issue in usbduxfast.c ahern.michael.t
2011-01-09 23:03 ` [PATCH 2/5] Staging: comedi: whitespace ahern.michael.t
@ 2011-01-09 23:03 ` ahern.michael.t
2011-01-10 6:39 ` Greg KH
2011-01-09 23:03 ` [PATCH 4/5] Coding style in serial2002 Patch that resolves braces and KERN_ warnings by checkpatch.pl Signed-off-by: Michael Ahern ahern.michael.t
` (2 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: ahern.michael.t @ 2011-01-09 23:03 UTC (permalink / raw)
To: gregkh, u.kleine-koenig, julia, nikai, morgan.gatti
Cc: devel, linux-kernel, mah
From: mah <ahern.michael.t@gmail.com>
---
drivers/staging/comedi/drivers/unioxx5.c | 65 +++++++++++++++++++----------
1 files changed, 42 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/comedi/drivers/unioxx5.c b/drivers/staging/comedi/drivers/unioxx5.c
index 598884e..334f036 100644
--- a/drivers/staging/comedi/drivers/unioxx5.c
+++ b/drivers/staging/comedi/drivers/unioxx5.c
@@ -72,13 +72,17 @@ Devices: [Fastwel] UNIOxx-5 (unioxx5),
#define ALL_2_INPUT 0 /* config all digital channels to input */
#define ALL_2_OUTPUT 1 /* config all digital channels to output */
-/* 'private' structure for each subdevice */
+/* 'private' unioxx5 structure for each subdevice
+ usp_module_type - 12 modules. each can be 70L or 73L
+ usp_extra_data - for saving previous written value for analog modules
+ usp_prev_wr_val - previous written value
+ usp_prev_cn_val - previous channel value */
struct unioxx5_subd_priv {
int usp_iobase;
- unsigned char usp_module_type[12]; /* 12 modules. each can be 70L or 73L */
- unsigned char usp_extra_data[12][4]; /* for saving previous written value for analog modules */
- unsigned char usp_prev_wr_val[3]; /* previous written value */
- unsigned char usp_prev_cn_val[3]; /* previous channel value */
+ unsigned char usp_module_type[12]; /* see comment above */
+ unsigned char usp_extra_data[12][4]; /* see comment above */
+ unsigned char usp_prev_wr_val[3]; /* see comment above */
+ unsigned char usp_prev_cn_val[3]; /* see comment above */
};
static int unioxx5_attach(struct comedi_device *dev,
@@ -99,7 +103,8 @@ static int __unioxx5_digital_write(struct unioxx5_subd_priv *usp,
unsigned int *data, int channel, int minor);
static int __unioxx5_digital_read(struct unioxx5_subd_priv *usp,
unsigned int *data, int channel, int minor);
-/* static void __unioxx5_digital_config(struct unioxx5_subd_priv* usp, int mode); */
+/* static void __unioxx5_digital_config(struct unioxx5_subd_priv* usp,
+ int mode); */
static int __unioxx5_analog_write(struct unioxx5_subd_priv *usp,
unsigned int *data, int channel, int minor);
static int __unioxx5_analog_read(struct unioxx5_subd_priv *usp,
@@ -139,8 +144,10 @@ static int unioxx5_attach(struct comedi_device *dev,
dev->iobase = iobase;
iobase += UNIOXX5_SUBDEV_BASE;
- /* defining number of subdevices and getting they types (it must be 'g01') */
- for (i = n_subd = 0, ba = iobase; i < 4; i++, ba += UNIOXX5_SUBDEV_ODDS) {
+ /* defining number of subdevices and getting types (it must be 'g01') */
+ for (i = n_subd = 0, ba = iobase; i < 4;
+ i++, ba += UNIOXX5_SUBDEV_ODDS) {
+
id = inb(ba + 0xE);
num = inb(ba + 0xF);
@@ -169,7 +176,7 @@ static int unioxx5_attach(struct comedi_device *dev,
return -1;
}
- printk("attached\n");
+ printk(KERN_INFO "attached\n");
return 0;
}
@@ -181,7 +188,8 @@ static int unioxx5_subdev_read(struct comedi_device *dev,
int channel, type;
channel = CR_CHAN(insn->chanspec);
- type = usp->usp_module_type[channel / 2]; /* defining module type(analog or digital) */
+ /* defining module type(analog or digital) */
+ type = usp->usp_module_type[channel / 2];
if (type == MODULE_DIGITAL) {
if (!__unioxx5_digital_read(usp, data, channel, dev->minor))
@@ -202,7 +210,8 @@ static int unioxx5_subdev_write(struct comedi_device *dev,
int channel, type;
channel = CR_CHAN(insn->chanspec);
- type = usp->usp_module_type[channel / 2]; /* defining module type(analog or digital) */
+ /* defining module type(analog or digital) */
+ type = usp->usp_module_type[channel / 2];
if (type == MODULE_DIGITAL) {
if (!__unioxx5_digital_write(usp, data, channel, dev->minor))
@@ -259,11 +268,16 @@ static int unioxx5_insn_config(struct comedi_device *dev,
/* *\
* sets channels buffer to 1(after this we are allowed to *
* change channel type on input or output) *
+ *
+ outb(flags, ...) - changes type of _one_ channel
+ outb(0, ...) - sets channels bank to 0(allows directly input/output)
+ usp-> ... flags - saves written value
+ *
\* */
outb(1, usp->usp_iobase + 0);
- outb(flags, usp->usp_iobase + channel_offset); /* changes type of _one_ channel */
- outb(0, usp->usp_iobase + 0); /* sets channels bank to 0(allows directly input/output) */
- usp->usp_prev_cn_val[channel_offset - 1] = flags; /* saves written value */
+ outb(flags, usp->usp_iobase + channel_offset); /* see comment above */
+ outb(0, usp->usp_iobase + 0); /* see above */
+ usp->usp_prev_cn_val[channel_offset - 1] = flags; /* see above */
return 0;
}
@@ -304,14 +318,14 @@ static int __unioxx5_subdev_init(struct comedi_subdevice *subdev,
}
usp->usp_iobase = subdev_iobase;
- printk("comedi%d: |", minor);
+ printk(KERN_ERR "comedi%d: |", minor);
/* defining modules types */
for (i = 0; i < 12; i++) {
to = 10000;
__unioxx5_analog_config(usp, i * 2);
- outb(i + 1, subdev_iobase + 5); /* sends channel number to card */
+ outb(i + 1, subdev_iobase + 5); /* sends channel num to card */
outb('H', subdev_iobase + 6); /* requests EEPROM world */
while (!(inb(subdev_iobase + 0) & TxBE))
; /* waits while writting will be allowed */
@@ -346,9 +360,9 @@ static int __unioxx5_subdev_init(struct comedi_subdevice *subdev,
subdev->range_table = &range_digital;
subdev->insn_read = unioxx5_subdev_read;
subdev->insn_write = unioxx5_subdev_write;
- subdev->insn_config = unioxx5_insn_config; /* for digital modules only!!! */
+ subdev->insn_config = unioxx5_insn_config; /* 4 digital modules only */
- printk("subdevice configured\n");
+ printk(KERN_INFO "subdevice configured\n");
return 0;
}
@@ -367,7 +381,8 @@ static int __unioxx5_digital_write(struct unioxx5_subd_priv *usp,
return 0;
}
- val = usp->usp_prev_wr_val[channel_offset - 1]; /* getting previous written value */
+ /* getting previous written value */
+ val = usp->usp_prev_wr_val[channel_offset - 1];
if (*data)
val |= mask;
@@ -375,7 +390,7 @@ static int __unioxx5_digital_write(struct unioxx5_subd_priv *usp,
val &= ~mask;
outb(val, usp->usp_iobase + channel_offset);
- usp->usp_prev_wr_val[channel_offset - 1] = val; /* saving new written value */
+ usp->usp_prev_wr_val[channel_offset - 1] = val; /* save new value */
return 1;
}
@@ -397,8 +412,9 @@ static int __unioxx5_digital_read(struct unioxx5_subd_priv *usp,
*data = inb(usp->usp_iobase + channel_offset);
*data &= mask;
+ /* this operation is created for correct readed value to 0 or 1 */
if (channel_offset > 1)
- channel -= 2 << channel_offset; /* this operation is created for correct readed value to 0 or 1 */
+ channel -= 2 << channel_offset;
*data >>= channel;
return 1;
@@ -444,7 +460,9 @@ static int __unioxx5_analog_write(struct unioxx5_subd_priv *usp,
usp->usp_extra_data[module][i] = (unsigned char)((*data & 0xFF00) >> 8);
/* while(!((inb(usp->usp_iobase + 0)) & TxBE)); */
- outb(module + 1, usp->usp_iobase + 5); /* sending module number to card(1 .. 12) */
+
+ /* sends module number to card(1 .. 12) */
+ outb(module + 1, usp->usp_iobase + 5);
outb('W', usp->usp_iobase + 6); /* sends (W)rite command to module */
/* sending for bytes to module(one byte per cycle iteration) */
@@ -475,7 +493,8 @@ static int __unioxx5_analog_read(struct unioxx5_subd_priv *usp,
}
__unioxx5_analog_config(usp, channel);
- outb(module_no + 1, usp->usp_iobase + 5); /* sends module number to card(1 .. 12) */
+ /* sends module number to card(1 .. 12) */
+ outb(module_no + 1, usp->usp_iobase + 5);
outb('V', usp->usp_iobase + 6); /* sends to module (V)erify command */
control = inb(usp->usp_iobase); /* get control register byte */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/5] Coding style in serial2002 Patch that resolves braces and KERN_ warnings by checkpatch.pl Signed-off-by: Michael Ahern
2011-01-09 23:03 [PATCH 1/5] Staging: comedi: fix line-length coding style issue in usbduxfast.c ahern.michael.t
2011-01-09 23:03 ` [PATCH 2/5] Staging: comedi: whitespace ahern.michael.t
2011-01-09 23:03 ` [PATCH 3/5] Coding style in unioxx5.c KERN_ facility level and coding style warnings as reported by checkpatch.pl Signed-off-by: Michael Ahern <ahern.michael.t@gmail.com> ahern.michael.t
@ 2011-01-09 23:03 ` ahern.michael.t
2011-01-09 23:56 ` Joe Perches
2011-01-09 23:03 ` [PATCH 5/5] Coding style in s626 Patch that resolves line length warnings by checkpatch.pl Signed-off-by: Michael Ahern <ahern.michael.t@gmail.com> ahern.michael.t
2011-01-10 6:36 ` [PATCH 1/5] Staging: comedi: fix line-length coding style issue in usbduxfast.c Greg KH
4 siblings, 1 reply; 9+ messages in thread
From: ahern.michael.t @ 2011-01-09 23:03 UTC (permalink / raw)
To: gregkh, u.kleine-koenig, julia, nikai, morgan.gatti
Cc: devel, linux-kernel, mah
From: mah <ahern.michael.t@gmail.com>
---
drivers/staging/comedi/drivers/serial2002.c | 206 ++++++++++++---------------
1 files changed, 93 insertions(+), 113 deletions(-)
diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
index c9be9e0..6949086 100644
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -192,9 +192,10 @@ static int tty_read(struct file *f, int timeout)
elapsed =
(1000000 * (now.tv_sec - start.tv_sec) +
now.tv_usec - start.tv_usec);
- if (elapsed > timeout) {
+
+ if (elapsed > timeout)
break;
- }
+
set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout(((timeout -
elapsed) * HZ) / 10000);
@@ -204,9 +205,10 @@ static int tty_read(struct file *f, int timeout)
unsigned char ch;
f->f_pos = 0;
- if (f->f_op->read(f, &ch, 1, &f->f_pos) == 1) {
+
+ if (f->f_op->read(f, &ch, 1, &f->f_pos) == 1)
result = ch;
- }
+
}
} else {
/* Device does not support poll, busy wait */
@@ -215,9 +217,10 @@ static int tty_read(struct file *f, int timeout)
unsigned char ch;
retries++;
- if (retries >= timeout) {
+
+ if (retries >= timeout)
break;
- }
+
f->f_pos = 0;
if (f->f_op->read(f, &ch, 1, &f->f_pos) == 1) {
@@ -329,7 +332,7 @@ static struct serial_data serial_read(struct file *f, int timeout)
length++;
if (data < 0) {
- printk("serial2002 error\n");
+ printk(KERN_ERR "serial2002 error\n");
break;
} else if (data & 0x80) {
result.value = (result.value << 7) | (data & 0x7f);
@@ -402,7 +405,7 @@ static int serial_2002_open(struct comedi_device *dev)
devpriv->tty = filp_open(port, O_RDWR, 0);
if (IS_ERR(devpriv->tty)) {
result = (int)PTR_ERR(devpriv->tty);
- printk("serial_2002: file open error = %d\n", result);
+ printk(KERN_ERR "serial_2002: file open error = %d\n", result);
} else {
struct config_t {
@@ -434,7 +437,7 @@ static int serial_2002_open(struct comedi_device *dev)
}
tty_setspeed(devpriv->tty, devpriv->speed);
- poll_channel(devpriv->tty, 31); /* Start reading configuration */
+ poll_channel(devpriv->tty, 31); /* Start reading config */
while (1) {
struct serial_data data;
@@ -451,23 +454,23 @@ static int serial_2002_open(struct comedi_device *dev)
command = (data.value >> 8) & 0x3;
switch (kind) {
case 1:{
- cur_config = dig_in_config;
+ cur_config = dig_in_config;
}
break;
case 2:{
- cur_config = dig_out_config;
+ cur_config = dig_out_config;
}
break;
case 3:{
- cur_config = chan_in_config;
+ cur_config = chan_in_config;
}
break;
case 4:{
- cur_config = chan_out_config;
+ cur_config = chan_out_config;
}
break;
case 5:{
- cur_config = chan_in_config;
+ cur_config = chan_in_config;
}
break;
}
@@ -476,92 +479,69 @@ static int serial_2002_open(struct comedi_device *dev)
cur_config[channel].kind = kind;
switch (command) {
case 0:{
- cur_config[channel].bits
- =
- (data.value >> 10) &
- 0x3f;
+ cur_config[channel].bits
+ = (data.value >> 10) &
+ 0x3f;
}
break;
case 1:{
- int unit, sign, min;
- unit =
- (data.value >> 10) &
- 0x7;
- sign =
- (data.value >> 13) &
- 0x1;
- min =
- (data.value >> 14) &
- 0xfffff;
-
- switch (unit) {
- case 0:{
- min =
- min
- *
- 1000000;
- }
- break;
- case 1:{
- min =
- min
- *
- 1000;
- }
- break;
- case 2:{
- min =
- min
- * 1;
- }
- break;
+ int unit, sign, min;
+ unit = (data.value >> 10) &
+ 0x7;
+ sign = (data.value >> 13) &
+ 0x1;
+ min = (data.value >> 14) &
+ 0xfffff;
+
+ switch (unit) {
+ case 0:{
+ min = min * 1000000;
}
- if (sign) {
- min = -min;
+ break;
+ case 1:{
+ min = min * 1000;
}
- cur_config[channel].min
- = min;
+ break;
+ case 2:{
+ min = min * 1;
+ }
+ break;
+ }
+
+ if (sign)
+ min = -min;
+
+ cur_config[channel].min = min;
}
break;
case 2:{
- int unit, sign, max;
- unit =
- (data.value >> 10) &
- 0x7;
- sign =
- (data.value >> 13) &
- 0x1;
- max =
- (data.value >> 14) &
- 0xfffff;
-
- switch (unit) {
- case 0:{
- max =
- max
- *
- 1000000;
- }
- break;
- case 1:{
- max =
- max
- *
- 1000;
- }
- break;
- case 2:{
- max =
- max
- * 1;
- }
- break;
+ int unit, sign, max;
+ unit = (data.value >> 10) &
+ 0x7;
+ sign = (data.value >> 13) &
+ 0x1;
+ max = (data.value >> 14) &
+ 0xfffff;
+
+ switch (unit) {
+ case 0:{
+ max = max * 1000000;
+ }
+ break;
+ case 1:{
+ max = max * 1000;
}
- if (sign) {
- max = -max;
+ break;
+ case 2:{
+ max = max * 1;
}
- cur_config[channel].max
- = max;
+ break;
+ }
+
+ if (sign)
+ max = -max;
+
+ cur_config[channel].max = max;
}
break;
}
@@ -622,9 +602,9 @@ static int serial_2002_open(struct comedi_device *dev)
int j, chan;
for (chan = 0, j = 0; j < 32; j++) {
- if (c[j].kind == kind) {
+ if (c[j].kind == kind)
chan++;
- }
+
}
s = &dev->subdevices[i];
s->n_chan = chan;
@@ -649,9 +629,9 @@ static int serial_2002_open(struct comedi_device *dev)
}
for (chan = 0, j = 0; j < 32; j++) {
if (c[j].kind == kind) {
- if (mapping) {
+ if (mapping)
mapping[chan] = j;
- }
+
if (range) {
range[j].length = 1;
range[j].range.min =
@@ -704,9 +684,9 @@ err_alloc_configs:
static void serial_2002_close(struct comedi_device *dev)
{
- if (!IS_ERR(devpriv->tty) && (devpriv->tty != 0)) {
+ if (!IS_ERR(devpriv->tty) && (devpriv->tty != 0))
filp_close(devpriv->tty, 0);
- }
+
}
static int serial2002_di_rinsn(struct comedi_device *dev,
@@ -723,9 +703,9 @@ static int serial2002_di_rinsn(struct comedi_device *dev,
poll_digital(devpriv->tty, chan);
while (1) {
read = serial_read(devpriv->tty, 1000);
- if (read.kind != is_digital || read.index == chan) {
+ if (read.kind != is_digital || read.index == chan)
break;
- }
+
}
data[n] = read.value;
}
@@ -765,9 +745,9 @@ static int serial2002_ai_rinsn(struct comedi_device *dev,
poll_channel(devpriv->tty, chan);
while (1) {
read = serial_read(devpriv->tty, 1000);
- if (read.kind != is_channel || read.index == chan) {
+ if (read.kind != is_channel || read.index == chan)
break;
- }
+
}
data[n] = read.value;
}
@@ -801,9 +781,9 @@ static int serial2002_ao_rinsn(struct comedi_device *dev,
int n;
int chan = CR_CHAN(insn->chanspec);
- for (n = 0; n < insn->n; n++) {
+ for (n = 0; n < insn->n; n++)
data[n] = devpriv->ao_readback[chan];
- }
+
return n;
}
@@ -822,9 +802,9 @@ static int serial2002_ei_rinsn(struct comedi_device *dev,
poll_channel(devpriv->tty, chan);
while (1) {
read = serial_read(devpriv->tty, 1000);
- if (read.kind != is_channel || read.index == chan) {
+ if (read.kind != is_channel || read.index == chan)
break;
- }
+
}
data[n] = read.value;
}
@@ -836,16 +816,16 @@ static int serial2002_attach(struct comedi_device *dev,
{
struct comedi_subdevice *s;
- printk("comedi%d: serial2002: ", dev->minor);
+ printk(KERN_INFO "comedi%d: serial2002: ", dev->minor);
dev->board_name = thisboard->name;
- if (alloc_private(dev, sizeof(struct serial2002_private)) < 0) {
+ if (alloc_private(dev, sizeof(struct serial2002_private)) < 0)
return -ENOMEM;
- }
+
dev->open = serial_2002_open;
dev->close = serial_2002_close;
devpriv->port = it->options[0];
devpriv->speed = it->options[1];
- printk("/dev/ttyS%d @ %d\n", devpriv->port, devpriv->speed);
+ printk(KERN_INFO "/dev/ttyS%d @ %d\n", devpriv->port, devpriv->speed);
if (alloc_subdevices(dev, 5) < 0)
return -ENOMEM;
@@ -904,15 +884,15 @@ static int serial2002_detach(struct comedi_device *dev)
struct comedi_subdevice *s;
int i;
- printk("comedi%d: serial2002: remove\n", dev->minor);
+ printk(KERN_ERR "comedi%d: serial2002: remove\n", dev->minor);
for (i = 0; i < 5; i++) {
s = &dev->subdevices[i];
- if (s->maxdata_list) {
+ if (s->maxdata_list)
kfree(s->maxdata_list);
- }
- if (s->range_table_list) {
+
+ if (s->range_table_list)
kfree(s->range_table_list);
- }
+
}
return 0;
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/5] Coding style in s626 Patch that resolves line length warnings by checkpatch.pl Signed-off-by: Michael Ahern <ahern.michael.t@gmail.com>
2011-01-09 23:03 [PATCH 1/5] Staging: comedi: fix line-length coding style issue in usbduxfast.c ahern.michael.t
` (2 preceding siblings ...)
2011-01-09 23:03 ` [PATCH 4/5] Coding style in serial2002 Patch that resolves braces and KERN_ warnings by checkpatch.pl Signed-off-by: Michael Ahern ahern.michael.t
@ 2011-01-09 23:03 ` ahern.michael.t
2011-01-10 6:39 ` Greg KH
2011-01-10 6:36 ` [PATCH 1/5] Staging: comedi: fix line-length coding style issue in usbduxfast.c Greg KH
4 siblings, 1 reply; 9+ messages in thread
From: ahern.michael.t @ 2011-01-09 23:03 UTC (permalink / raw)
To: gregkh, u.kleine-koenig, julia, nikai, morgan.gatti
Cc: devel, linux-kernel, mah
From: mah <ahern.michael.t@gmail.com>
---
drivers/staging/comedi/drivers/s626.c | 782 +++++++++++++++++++++------------
1 files changed, 499 insertions(+), 283 deletions(-)
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index d5ba3ab..0812a53 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -149,7 +149,7 @@ struct s626_private {
uint16_t CounterIntEnabs;
/* Counter interrupt enable mask for MISC2 register. */
uint8_t AdcItems; /* Number of items in ADC poll list. */
- struct bufferDMA RPSBuf; /* DMA buffer used to hold ADC (RPS1) program. */
+ struct bufferDMA RPSBuf; /* DMA buffer to hold ADC (RPS1) program. */
struct bufferDMA ANABuf;
/* DMA buffer used to receive ADC data and hold DAC data. */
uint32_t *pDacWBuf;
@@ -158,7 +158,7 @@ struct s626_private {
uint8_t TrimSetpoint[12]; /* Images of TrimDAC setpoints */
uint16_t ChargeEnabled; /* Image of MISC2 Battery */
/* Charge Enabled (0 or WRMISC2_CHARGE_ENABLE). */
- uint16_t WDInterval; /* Image of MISC2 watchdog interval control bits. */
+ uint16_t WDInterval; /* Image of MISC2 watchdog interval control bits */
uint32_t I2CAdrs;
/* I2C device address for onboard EEPROM (board rev dependent). */
/* short I2Cards; */
@@ -266,7 +266,11 @@ module_exit(driver_s626_cleanup_module);
static int s626_ai_insn_config(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data);
-/* static int s626_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data); */
+/* static int s626_ai_rinsn(struct comedi_device *dev,
+ * struct comedi_subdevice *s,
+ * struct comedi_insn *insn,
+ * unsigned int *data);
+ */
static int s626_ai_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data);
@@ -304,7 +308,9 @@ static int s626_ai_inttrig(struct comedi_device *dev,
struct comedi_subdevice *s, unsigned int trignum);
static irqreturn_t s626_irq_handler(int irq, void *d);
static unsigned int s626_ai_reg_to_uint(int data);
-/* static unsigned int s626_uint_to_reg(struct comedi_subdevice *s, int data); */
+/* static unsigned int s626_uint_to_reg(struct comedi_subdevice *s,
+ * int data);
+ */
/* end ioctl routines */
@@ -330,22 +336,54 @@ static void CloseDMAB(struct comedi_device *dev, struct bufferDMA *pdma,
/* COUNTER OBJECT ------------------------------------------------ */
struct enc_private {
/* Pointers to functions that differ for A and B counters: */
- uint16_t(*GetEnable) (struct comedi_device *dev, struct enc_private *); /* Return clock enable. */
- uint16_t(*GetIntSrc) (struct comedi_device *dev, struct enc_private *); /* Return interrupt source. */
- uint16_t(*GetLoadTrig) (struct comedi_device *dev, struct enc_private *); /* Return preload trigger source. */
- uint16_t(*GetMode) (struct comedi_device *dev, struct enc_private *); /* Return standardized operating mode. */
- void (*PulseIndex) (struct comedi_device *dev, struct enc_private *); /* Generate soft index strobe. */
- void (*SetEnable) (struct comedi_device *dev, struct enc_private *, uint16_t enab); /* Program clock enable. */
- void (*SetIntSrc) (struct comedi_device *dev, struct enc_private *, uint16_t IntSource); /* Program interrupt source. */
- void (*SetLoadTrig) (struct comedi_device *dev, struct enc_private *, uint16_t Trig); /* Program preload trigger source. */
- void (*SetMode) (struct comedi_device *dev, struct enc_private *, uint16_t Setup, uint16_t DisableIntSrc); /* Program standardized operating mode. */
- void (*ResetCapFlags) (struct comedi_device *dev, struct enc_private *); /* Reset event capture flags. */
-
- uint16_t MyCRA; /* Address of CRA register. */
- uint16_t MyCRB; /* Address of CRB register. */
- uint16_t MyLatchLsw; /* Address of Latch least-significant-word */
+
+ /* Return clock enable. */
+ uint16_t(*GetEnable) (struct comedi_device *dev,
+ struct enc_private *);
+
+ /* Return interrupt source */
+ uint16_t(*GetIntSrc) (struct comedi_device *dev,
+ struct enc_private *);
+
+ /* Return preload trigger source. */
+ uint16_t(*GetLoadTrig) (struct comedi_device *dev,
+ struct enc_private *);
+ /* Return standardized operating mode. */
+ uint16_t(*GetMode) (struct comedi_device *dev, struct enc_private *);
+
+ /* Generate soft index strobe. */
+ void (*PulseIndex) (struct comedi_device *dev, struct enc_private *);
+
+ /* Program clock enable. */
+ void (*SetEnable) (struct comedi_device *dev,
+ struct enc_private *,
+ uint16_t enab);
+
+ /* Program interrupt source. */
+ void (*SetIntSrc) (struct comedi_device *dev,
+ struct enc_private *,
+ uint16_t IntSource);
+
+ /* Program preload trigger source. */
+ void (*SetLoadTrig) (struct comedi_device *dev,
+ struct enc_private *,
+ uint16_t Trig);
+
+ /* Program standardized operating mode. */
+ void (*SetMode) (struct comedi_device *dev,
+ struct enc_private *,
+ uint16_t Setup,
+ uint16_t DisableIntSrc);
+
+ /* Reset event capture flags. */
+ void (*ResetCapFlags) (struct comedi_device *dev,
+ struct enc_private *);
+
+ uint16_t MyCRA; /* Address of CRA register. */
+ uint16_t MyCRB; /* Address of CRB register. */
+ uint16_t MyLatchLsw; /* Address of Latch least-significant-word */
/* register. */
- uint16_t MyEventBits[4]; /* Bit translations for IntSrc -->RDMISC2. */
+ uint16_t MyEventBits[4]; /* Bit translations for IntSrc -->RDMISC2. */
};
#define encpriv ((struct enc_private *)(dev->subdevices+5)->private)
@@ -370,7 +408,9 @@ static uint16_t GetEnable_A(struct comedi_device *dev, struct enc_private *k);
static uint16_t GetEnable_B(struct comedi_device *dev, struct enc_private *k);
static void SetLatchSource(struct comedi_device *dev, struct enc_private *k,
uint16_t value);
-/* static uint16_t GetLatchSource(struct comedi_device *dev, struct enc_private *k ); */
+/* static uint16_t GetLatchSource(struct comedi_device *dev,
+ * struct enc_private *k );
+ */
static void SetLoadTrig_A(struct comedi_device *dev, struct enc_private *k,
uint16_t Trig);
static void SetLoadTrig_B(struct comedi_device *dev, struct enc_private *k,
@@ -383,14 +423,23 @@ static void SetIntSrc_A(struct comedi_device *dev, struct enc_private *k,
uint16_t IntSource);
static uint16_t GetIntSrc_A(struct comedi_device *dev, struct enc_private *k);
static uint16_t GetIntSrc_B(struct comedi_device *dev, struct enc_private *k);
-/* static void SetClkMult(struct comedi_device *dev, struct enc_private *k, uint16_t value ) ; */
-/* static uint16_t GetClkMult(struct comedi_device *dev, struct enc_private *k ) ; */
-/* static void SetIndexPol(struct comedi_device *dev, struct enc_private *k, uint16_t value ); */
-/* static uint16_t GetClkPol(struct comedi_device *dev, struct enc_private *k ) ; */
-/* static void SetIndexSrc( struct comedi_device *dev,struct enc_private *k, uint16_t value ); */
-/* static uint16_t GetClkSrc( struct comedi_device *dev,struct enc_private *k ); */
-/* static void SetIndexSrc( struct comedi_device *dev,struct enc_private *k, uint16_t value ); */
-/* static uint16_t GetIndexSrc( struct comedi_device *dev,struct enc_private *k ); */
+/* static void SetClkMult(struct comedi_device *dev, struct enc_private *k,
+ * uint16_t value );
+ * static uint16_t GetClkMult(struct comedi_device *dev,
+ * struct enc_private *k );
+ * static void SetIndexPol(struct comedi_device *dev,
+ * struct enc_private *k, uint16_t value );
+ * static uint16_t GetClkPol(struct comedi_device *dev,
+ * struct enc_private *k );
+ * static void SetIndexSrc(struct comedi_device *dev,
+ * struct enc_private *k, uint16_t value );
+ * static uint16_t GetClkSrc(struct comedi_device *dev,
+ * struct enc_private *k );
+ * static void SetIndexSrc(struct comedi_device *dev,
+ * struct enc_private *k, uint16_t value );
+ * static uint16_t GetIndexSrc(struct comedi_device *dev,
+ * struct enc_private *k );
+ */
static void PulseIndex_A(struct comedi_device *dev, struct enc_private *k);
static void PulseIndex_B(struct comedi_device *dev, struct enc_private *k);
static void Preload(struct comedi_device *dev, struct enc_private *k,
@@ -401,12 +450,14 @@ static void CountersInit(struct comedi_device *dev);
/* Counter objects constructor. */
/* Counter overflow/index event flag masks for RDMISC2. */
-#define INDXMASK(C) (1 << (((C) > 2) ? ((C) * 2 - 1) : ((C) * 2 + 4)))
-#define OVERMASK(C) (1 << (((C) > 2) ? ((C) * 2 + 5) : ((C) * 2 + 10)))
-#define EVBITS(C) { 0, OVERMASK(C), INDXMASK(C), OVERMASK(C) | INDXMASK(C) }
+#define INDXMASK(C) (1 << (((C) > 2) ? ((C) * 2 - 1) : ((C) * 2 + 4)))
+#define OVERMASK(C) (1 << (((C) > 2) ? ((C) * 2 + 5) : ((C) * 2 + 10)))
+#define EVBITS(C) { 0, OVERMASK(C), INDXMASK(C), OVERMASK(C) | INDXMASK(C) }
-/* Translation table to map IntSrc into equivalent RDMISC2 event flag bits. */
-/* static const uint16_t EventBits[][4] = { EVBITS(0), EVBITS(1), EVBITS(2), EVBITS(3), EVBITS(4), EVBITS(5) }; */
+/* Translation table to map IntSrc into equivalent RDMISC2 event flag bits
+ * static const uint16_t EventBits[][4] = { EVBITS(0), EVBITS(1), EVBITS(2),
+ * EVBITS(3), EVBITS(4), EVBITS(5) };
+ */
/* struct enc_private; */
static struct enc_private enc_private_data[] = {
@@ -622,7 +673,8 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)
devpriv->ANABuf.PhysicalBase = appdma;
DEBUG
- ("s626_attach: AllocDMAB ADC Logical=%p, bsize=%d, Physical=0x%x\n",
+ ("s626_attach: AllocDMAB ADC Logical=%p, "
+ "bsize=%d, Physical=0x%x\n",
devpriv->ANABuf.LogicalBase, DMABUF_SIZE,
(uint32_t) devpriv->ANABuf.PhysicalBase);
@@ -632,14 +684,16 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)
pci_alloc_consistent(devpriv->pdev, DMABUF_SIZE, &appdma);
if (devpriv->RPSBuf.LogicalBase == NULL) {
- printk(KERN_ERR "s626_attach: DMA Memory mapping error\n");
+ printk(KERN_ERR
+ "s626_attach: DMA Memory mapping error\n");
return -ENOMEM;
}
devpriv->RPSBuf.PhysicalBase = appdma;
DEBUG
- ("s626_attach: AllocDMAB RPS Logical=%p, bsize=%d, Physical=0x%x\n",
+ ("s626_attach: AllocDMAB RPS Logical=%p, "
+ "bsize=%d, Physical=0x%x\n",
devpriv->RPSBuf.LogicalBase, DMABUF_SIZE,
(uint32_t) devpriv->RPSBuf.PhysicalBase);
@@ -776,37 +830,44 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)
DEBI_CFG_INTEL | DEBI_CFG_TOQ | DEBI_CFG_INCQ |
DEBI_CFG_16Q);
- /* DEBI INIT S626 WR7146( P_DEBICFG, DEBI_CFG_INTEL | DEBI_CFG_TOQ */
- /* | DEBI_CFG_INCQ| DEBI_CFG_16Q); //end */
+ /* DEBI INIT S626 WR7146( P_DEBICFG, DEBI_CFG_INTEL |
+ * DEBI_CFG_TOQ | DEBI_CFG_INCQ| DEBI_CFG_16Q);
+ */
/* Paging is disabled. */
- WR7146(P_DEBIPAGE, DEBI_PAGE_DISABLE); /* Disable MMU paging. */
+ WR7146(P_DEBIPAGE, DEBI_PAGE_DISABLE); /* Disable MMU paging */
/* Init GPIO so that ADC Start* is negated. */
WR7146(P_GPIO, GPIO_BASE | GPIO1_HI);
- /* IsBoardRevA is a boolean that indicates whether the board is RevA.
+ /* IsBoardRevA is a boolean that indicates
+ * whether the board is RevA.
*
- * VERSION 2.01 CHANGE: REV A & B BOARDS NOW SUPPORTED BY DYNAMIC
- * EEPROM ADDRESS SELECTION. Initialize the I2C interface, which
- * is used to access the onboard serial EEPROM. The EEPROM's I2C
- * DeviceAddress is hardwired to a value that is dependent on the
- * 626 board revision. On all board revisions, the EEPROM stores
- * TrimDAC calibration constants for analog I/O. On RevB and
- * higher boards, the DeviceAddress is hardwired to 0 to enable
- * the EEPROM to also store the PCI SubVendorID and SubDeviceID;
+ * VERSION 2.01 CHANGE: REV A & B BOARDS NOW SUPPORTED
+ * BY DYNAMIC EEPROM ADDRESS SELECTION. Initialize
+ * the I2C interface, which is used to access
+ * the onboard serial EEPROM. The EEPROM's I2C
+ * DeviceAddress is hardwired to a value that is
+ * dependent on the 626 board revision. On all
+ * board revisions, the EEPROM stores TrimDAC
+ * calibration constants for analog I/O. On RevB and
+ * higher boards, the DeviceAddress is hardwired to 0
+ * to enable the EEPROM to also store the PCI
+ * SubVendorID and SubDeviceID;
* this is the address at which the SAA7146 expects a
* configuration EEPROM to reside. On RevA boards, the EEPROM
- * device address, which is hardwired to 4, prevents the SAA7146
- * from retrieving PCI sub-IDs, so the SAA7146 uses its built-in
+ * device address, which is hardwired to 4, prevents
+ * the SAA7146 from retrieving PCI sub-IDs,
+ * so the SAA7146 uses its built-in
* default values, instead.
*/
- /* devpriv->I2Cards= IsBoardRevA ? 0xA8 : 0xA0; // Set I2C EEPROM */
- /* DeviceType (0xA0) */
- /* and DeviceAddress<<1. */
+ /* devpriv->I2Cards= IsBoardRevA ? 0xA8 : 0xA0;
+ * Set I2C EEPROM
+ * DeviceType (0xA0) and DeviceAddress<<1.
+ */
- devpriv->I2CAdrs = 0xA0; /* I2C device address for onboard */
+ devpriv->I2CAdrs = 0xA0; /* I2C device address for onboard */
/* eeprom(revb) */
/* Issue an I2C ABORT command to halt any I2C operation in */
@@ -824,7 +885,9 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)
for (i = 0; i < 2; i++) {
WR7146(P_I2CSTAT, I2C_CLKSEL);
/* Write I2C control: reset error flags. */
- MC_ENABLE(P_MC2, MC2_UPLD_IIC); /* Invoke command upload */
+
+ /* Invoke command upload */
+ MC_ENABLE(P_MC2, MC2_UPLD_IIC);
while (!MC_TEST(P_MC2, MC2_UPLD_IIC))
;
/* and wait for upload to complete. */
@@ -910,8 +973,11 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)
devpriv->ANABuf.PhysicalBase +
(DAC_WDMABUF_OS * sizeof(uint32_t));
- WR7146(P_BASEA2_OUT, (uint32_t) pPhysBuf); /* Buffer base adrs. */
- WR7146(P_PROTA2_OUT, (uint32_t) (pPhysBuf + sizeof(uint32_t))); /* Protection address. */
+ /* Buffer base adrs */
+ WR7146(P_BASEA2_OUT, (uint32_t) pPhysBuf);
+
+ /* Protection address. */
+ WR7146(P_PROTA2_OUT, (uint32_t) (pPhysBuf + sizeof(uint32_t)));
/* Cache Audio2's output DMA buffer logical address. This is
* where DAC data is buffered for A2 output DMA transfers. */
@@ -930,8 +996,8 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)
* to the DAC devices. Slot 0 is a NOP that is used to trap TSL
* execution; this permits other slots to be safely modified
* without first turning off the TSL sequencer (which is
- * apparently impossible to do). Also, SD3 (which is driven by a
- * pull-up resistor) is shifted in and stored to the MSB of
+ * apparently impossible to do). Also, SD3 (which is driven by
+ * a pull-up resistor) is shifted in and stored to the MSB of
* FB_BUFFER2 to be used as evidence that the slot sequence has
* not yet finished executing.
*/
@@ -962,11 +1028,13 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)
LoadTrimDACs(dev);
LoadTrimDACs(dev); /* Insurance. */
- /* Manually init all gate array hardware in case this is a soft
- * reset (we have no way of determining whether this is a warm
- * or cold start). This is necessary because the gate array will
- * reset only in response to a PCI hard reset; there is no soft
- * reset function. */
+ /* Manually init all gate array hardware in case
+ * this is a soft reset (we have no way of determining
+ * whether this is a warm or cold start).
+ * This is necessary because the gate array will
+ * reset only in response to a PCI hard reset;
+ * there is no soft reset function.
+ */
/* Init all DAC outputs to 0V and init all DAC setpoint and
* polarity images.
@@ -980,9 +1048,10 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)
*/
devpriv->ChargeEnabled = 0;
- /* Init image of watchdog timer interval in WRMISC2. This image
- * maintains the value of the control bits of MISC2 are
- * continuously reset to zero as long as the WD timer is disabled.
+ /* Init image of watchdog timer interval in WRMISC2.
+ * This image maintains the value of the control bits
+ * of MISC2 are continuously reset to zero as long as
+ * the WD timer is disabled.
*/
devpriv->WDInterval = 0;
@@ -995,9 +1064,10 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* Init counters. */
CountersInit(dev);
- /* Without modifying the state of the Battery Backup enab, disable
- * the watchdog timer, set DIO channels 0-5 to operate in the
- * standard DIO (vs. counter overflow) mode, disable the battery
+ /* Without modifying the state of the Battery Backup enab,
+ * disable the watchdog timer, set DIO channels 0-5
+ * to operate in the standard DIO (vs. counter overflow)
+ * mode, disable the battery
* charger, and reset the watchdog interval selector to zero.
*/
WriteMISC2(dev, (uint16_t) (DEBIread(dev,
@@ -1030,9 +1100,10 @@ static unsigned int s626_ai_reg_to_uint(int data)
return tempdata;
}
-/* static unsigned int s626_uint_to_reg(struct comedi_subdevice *s, int data){ */
-/* return 0; */
-/* } */
+/* static unsigned int s626_uint_to_reg(struct comedi_subdevice *s, int data) {
+ * return 0;
+ * }
+ */
static irqreturn_t s626_irq_handler(int irq, void *d)
{
@@ -1080,15 +1151,15 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
cmd = &(s->async->cmd);
/* Init ptr to DMA buffer that holds new ADC data. We skip the
- * first uint16_t in the buffer because it contains junk data from
- * the final ADC of the previous poll list scan.
+ * first uint16_t in the buffer because it contains junk
+ * data from the final ADC of the previous poll list scan.
*/
readaddr = (int32_t *) devpriv->ANABuf.LogicalBase + 1;
/* get the data and hand it over to comedi */
for (i = 0; i < (s->async->cmd.chanlist_len); i++) {
- /* Convert ADC data to 16-bit integer values and copy to application */
- /* buffer. */
+ /* Convert ADC data to 16-bit integer values
+ * and copy to application buffer. */
tempdata = s626_ai_reg_to_uint((int)*readaddr);
readaddr++;
@@ -1096,7 +1167,8 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
/* comedi_buf_put(s->async, tempdata); */
if (cfc_write_to_buffer(s, tempdata) == 0)
printk
- ("s626_irq_handler: cfc_write_to_buffer error!\n");
+ ("s626_irq_handler: "
+ "cfc_write_to_buffer error!\n");
DEBUG("s626_irq_handler: ai channel %d acquired: %d\n",
i, tempdata);
@@ -1120,10 +1192,11 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
irqstatus = 0;
}
- if (devpriv->ai_cmd_running && cmd->scan_begin_src == TRIG_EXT) {
+ if (devpriv->ai_cmd_running &&
+ cmd->scan_begin_src == TRIG_EXT) {
DEBUG
- ("s626_irq_handler: enable interrupt on dio channel %d\n",
- cmd->scan_begin_arg);
+ ("s626_irq_handler: enable interrupt "
+ "on dio channel %d\n", cmd->scan_begin_arg);
s626_dio_set_irq(dev, cmd->scan_begin_arg);
@@ -1157,10 +1230,11 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
if (irqbit) {
s626_dio_reset_irq(dev, group, irqbit);
DEBUG
- ("s626_irq_handler: check interrupt on dio group %d %d\n",
- group, i);
+ ("s626_irq_handler: check interrupt "
+ "on dio group %d %d\n", group, i);
if (devpriv->ai_cmd_running) {
- /* check if interrupt is an ai acquisition start trigger */
+ /* check if interrupt is an ai
+ * acquisition start trigger */
if ((irqbit >> (cmd->start_arg -
(16 * group)))
== 1 && cmd->start_src == TRIG_EXT) {
@@ -1277,7 +1351,8 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
if (irqbit & IRQ_COINT1A) {
DEBUG
- ("s626_irq_handler: interrupt on counter 1A overflow\n");
+ ("s626_irq_handler: interrupt on counter "
+ "1A overflow\n");
k = &encpriv[0];
/* clear interrupt capture flag */
@@ -1285,7 +1360,8 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
}
if (irqbit & IRQ_COINT2A) {
DEBUG
- ("s626_irq_handler: interrupt on counter 2A overflow\n");
+ ("s626_irq_handler: interrupt on counter "
+ "2A overflow\n");
k = &encpriv[1];
/* clear interrupt capture flag */
@@ -1293,7 +1369,8 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
}
if (irqbit & IRQ_COINT3A) {
DEBUG
- ("s626_irq_handler: interrupt on counter 3A overflow\n");
+ ("s626_irq_handler: interrupt on counter "
+ "3A overflow\n");
k = &encpriv[2];
/* clear interrupt capture flag */
@@ -1301,7 +1378,8 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
}
if (irqbit & IRQ_COINT1B) {
DEBUG
- ("s626_irq_handler: interrupt on counter 1B overflow\n");
+ ("s626_irq_handler: interrupt on counter "
+ "1B overflow\n");
k = &encpriv[3];
/* clear interrupt capture flag */
@@ -1309,7 +1387,8 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
}
if (irqbit & IRQ_COINT2B) {
DEBUG
- ("s626_irq_handler: interrupt on counter 2B overflow\n");
+ ("s626_irq_handler: interrupt on "
+ "counter 2B overflow\n");
k = &encpriv[4];
/* clear interrupt capture flag */
@@ -1322,17 +1401,20 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
if (cmd->convert_src == TRIG_TIMER) {
DEBUG
- ("s626_irq_handler: conver timer trigger!!! %d\n",
+ ("s626_irq_handler: conver "
+ "timer trigger!!! %d\n",
devpriv->ai_convert_count);
- /* Trigger ADC scan loop start by setting RPS Signal 0. */
+ /* Trigger ADC scan loop start by
+ * setting RPS Signal 0. */
MC_ENABLE(P_MC2, MC2_ADC_RPS);
}
}
}
if (irqbit & IRQ_COINT3B) {
DEBUG
- ("s626_irq_handler: interrupt on counter 3B overflow\n");
+ ("s626_irq_handler: interrupt on "
+ "counter 3B overflow\n");
k = &encpriv[5];
/* clear interrupt capture flag */
@@ -1340,15 +1422,18 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
if (cmd->scan_begin_src == TRIG_TIMER) {
DEBUG
- ("s626_irq_handler: scan timer trigger!!!\n");
+ ("s626_irq_handler: scan "
+ "timer trigger!!!\n");
- /* Trigger ADC scan loop start by setting RPS Signal 0. */
+ /* Trigger ADC scan loop start by
+ * setting RPS Signal 0. */
MC_ENABLE(P_MC2, MC2_ADC_RPS);
}
if (cmd->convert_src == TRIG_TIMER) {
DEBUG
- ("s626_irq_handler: convert timer trigger is set\n");
+ ("s626_irq_handler: convert "
+ "timer trigger is set\n");
k = &encpriv[4];
devpriv->ai_convert_count = cmd->chanlist_len;
k->SetEnable(dev, k, CLKENAB_ALWAYS);
@@ -1373,8 +1458,9 @@ static int s626_detach(struct comedi_device *dev)
if (devpriv->base_addr) {
/* interrupt mask */
- WR7146(P_IER, 0); /* Disable master interrupt. */
- WR7146(P_ISR, IRQ_GPIO3 | IRQ_RPS1); /* Clear board's IRQ status flag. */
+ WR7146(P_IER, 0); /* Disable master interrupt. */
+ /* Clear board's IRQ status flag. */
+ WR7146(P_ISR, IRQ_GPIO3 | IRQ_RPS1);
/* Disable the watchdog timer and battery charger. */
WriteMISC2(dev, 0);
@@ -1461,7 +1547,8 @@ void ResetADC(struct comedi_device *dev, uint8_t * ppl)
* for loop to limit the slot count to 16 in case the application
* forgot to set the EOPL flag in the final slot.
*/
- for (devpriv->AdcItems = 0; devpriv->AdcItems < 16; devpriv->AdcItems++) {
+ for (devpriv->AdcItems = 0; devpriv->AdcItems < 16;
+ devpriv->AdcItems++) {
/* Convert application's poll list item to private board class
* format. Each app poll list item is an uint8_t with form
* (EOPL,x,x,RANGE,CHAN<3:0>), where RANGE code indicates 0 =
@@ -1472,7 +1559,7 @@ void ResetADC(struct comedi_device *dev, uint8_t * ppl)
GSEL_BIPOLAR10V);
/* Switch ADC analog gain. */
- *pRPS++ = RPS_LDREG | (P_DEBICMD >> 2); /* Write DEBI command */
+ *pRPS++ = RPS_LDREG | (P_DEBICMD >> 2); /* Write DEBI command */
/* and address to */
/* shadow RAM. */
*pRPS++ = DEBI_CMD_WRWORD | LP_GSEL;
@@ -1480,9 +1567,10 @@ void ResetADC(struct comedi_device *dev, uint8_t * ppl)
/* immediate data to */
/* shadow RAM. */
*pRPS++ = LocalPPL;
- *pRPS++ = RPS_CLRSIGNAL | RPS_DEBI; /* Reset "shadow RAM uploaded" */
+ /* Reset "shadow RAM uploaded" */
+ *pRPS++ = RPS_CLRSIGNAL | RPS_DEBI;
/* flag. */
- *pRPS++ = RPS_UPLOAD | RPS_DEBI; /* Invoke shadow RAM upload. */
+ *pRPS++ = RPS_UPLOAD | RPS_DEBI; /* Invoke shadow RAM upload */
*pRPS++ = RPS_PAUSE | RPS_DEBI; /* Wait for shadow upload to */
/* finish. */
@@ -1514,7 +1602,7 @@ void ResetADC(struct comedi_device *dev, uint8_t * ppl)
(unsigned long)devpriv->RPSBuf.LogicalBase);
for (i = 0; i < (10 * RPSCLK_PER_US / 2); i++) {
JmpAdrs += 8; /* Repeat to implement time delay: */
- *pRPS++ = RPS_JUMP; /* Jump to next RPS instruction. */
+ *pRPS++ = RPS_JUMP; /* Jump to next RPS instruction. */
*pRPS++ = JmpAdrs;
}
@@ -1525,29 +1613,29 @@ void ResetADC(struct comedi_device *dev, uint8_t * ppl)
*pRPS++ = RPS_CLRSIGNAL | RPS_SIGADC;
}
/* Start ADC by pulsing GPIO1. */
- *pRPS++ = RPS_LDREG | (P_GPIO >> 2); /* Begin ADC Start pulse. */
+ *pRPS++ = RPS_LDREG | (P_GPIO >> 2); /* Begin ADC Start pulse */
*pRPS++ = GPIO_BASE | GPIO1_LO;
*pRPS++ = RPS_NOP;
/* VERSION 2.03 CHANGE: STRETCH OUT ADC START PULSE. */
- *pRPS++ = RPS_LDREG | (P_GPIO >> 2); /* End ADC Start pulse. */
+ *pRPS++ = RPS_LDREG | (P_GPIO >> 2); /* End ADC Start pulse */
*pRPS++ = GPIO_BASE | GPIO1_HI;
- /* Wait for ADC to complete (GPIO2 is asserted high when ADC not
- * busy) and for data from previous conversion to shift into FB
- * BUFFER 1 register.
+ /* Wait for ADC to complete (GPIO2 is asserted high
+ * when ADC not busy) and for data from previous
+ * conversion to shift into FB BUFFER 1 register.
*/
- *pRPS++ = RPS_PAUSE | RPS_GPIO2; /* Wait for ADC done. */
+ *pRPS++ = RPS_PAUSE | RPS_GPIO2; /* Wait for ADC done. */
- /* Transfer ADC data from FB BUFFER 1 register to DMA buffer. */
+ /* Transfer ADC data from FB BUFFER 1 register to DMA buffer */
*pRPS++ = RPS_STREG | (BUGFIX_STREG(P_FB_BUFFER1) >> 2);
*pRPS++ =
(uint32_t) devpriv->ANABuf.PhysicalBase +
(devpriv->AdcItems << 2);
- /* If this slot's EndOfPollList flag is set, all channels have */
- /* now been processed. */
+ /* If this slot's EndOfPollList flag is set,
+ * all channels have now been processed. */
if (*ppl++ & EOPL) {
- devpriv->AdcItems++; /* Adjust poll list item count. */
+ devpriv->AdcItems++; /* Adjust poll list item count. */
break; /* Exit poll list processing loop. */
}
}
@@ -1583,8 +1671,9 @@ void ResetADC(struct comedi_device *dev, uint8_t * ppl)
*pRPS++ =
(uint32_t) devpriv->ANABuf.PhysicalBase + (devpriv->AdcItems << 2);
- /* Indicate ADC scan loop is finished. */
- /* *pRPS++= RPS_CLRSIGNAL | RPS_SIGADC ; // Signal ReadADC() that scan is done. */
+ /* Indicate ADC scan loop is finished.
+ * *pRPS++= RPS_CLRSIGNAL | RPS_SIGADC;
+ * Signal ReadADC() that scan is done. */
/* invoke interrupt */
if (devpriv->ai_cmd_running == 1) {
@@ -1607,35 +1696,38 @@ static int s626_ai_insn_config(struct comedi_device *dev,
return -EINVAL;
}
-/* static int s626_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) */
-/* { */
-/* register uint8_t i; */
-/* register int32_t *readaddr; */
-
-/* DEBUG("as626_ai_rinsn: ai_rinsn enter\n"); */
-
-/* Trigger ADC scan loop start by setting RPS Signal 0. */
-/* MC_ENABLE( P_MC2, MC2_ADC_RPS ); */
-
-/* Wait until ADC scan loop is finished (RPS Signal 0 reset). */
-/* while ( MC_TEST( P_MC2, MC2_ADC_RPS ) ); */
-
-/* Init ptr to DMA buffer that holds new ADC data. We skip the
+/* static int s626_ai_rinsn(struct comedi_device *dev,
+ * struct comedi_subdevice *s,
+ * struct comedi_insn *insn,unsigned int *data)
+ * {
+ * register uint8_t i;
+ * register int32_t *readaddr;
+ *
+ * DEBUG("as626_ai_rinsn: ai_rinsn enter\n");
+ *
+ * Trigger ADC scan loop start by setting RPS Signal 0.
+ * MC_ENABLE( P_MC2, MC2_ADC_RPS );
+ *
+ * Wait until ADC scan loop is finished (RPS Signal 0 reset).
+ * while ( MC_TEST( P_MC2, MC2_ADC_RPS ) );
+ *
+ * Init ptr to DMA buffer that holds new ADC data. We skip the
* first uint16_t in the buffer because it contains junk data from
* the final ADC of the previous poll list scan.
+ *
+ * readaddr = (uint32_t *)devpriv->ANABuf.LogicalBase + 1;
+ *
+ * Convert ADC data to 16-bit integer values and copy to application buffer.
+ * for ( i = 0; i < devpriv->AdcItems; i++ ) {
+ * *data = s626_ai_reg_to_uint( *readaddr++ );
+ * DEBUG("s626_ai_rinsn: data %d\n",*data);
+ * data++;
+ * }
+ *
+ * DEBUG("s626_ai_rinsn: ai_rinsn escape\n");
+ * return i;
+ * }
*/
-/* readaddr = (uint32_t *)devpriv->ANABuf.LogicalBase + 1; */
-
-/* Convert ADC data to 16-bit integer values and copy to application buffer. */
-/* for ( i = 0; i < devpriv->AdcItems; i++ ) { */
-/* *data = s626_ai_reg_to_uint( *readaddr++ ); */
-/* DEBUG("s626_ai_rinsn: data %d\n",*data); */
-/* data++; */
-/* } */
-
-/* DEBUG("s626_ai_rinsn: ai_rinsn escape\n"); */
-/* return i; */
-/* } */
static int s626_ai_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s,
@@ -1822,7 +1914,8 @@ static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
case TRIG_FOLLOW:
break;
case TRIG_TIMER:
- /* set a conter to generate adc trigger at scan_begin_arg interval */
+ /* set a counter to generate adc trigger at
+ * scan_begin_arg interval */
k = &encpriv[5];
tick = s626_ns_to_timer((int *)&cmd->scan_begin_arg,
cmd->flags & TRIG_ROUND_MASK);
@@ -1849,7 +1942,8 @@ static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
case TRIG_NOW:
break;
case TRIG_TIMER:
- /* set a conter to generate adc trigger at convert_arg interval */
+ /* set a counter to generate adc trigger
+ * at convert_arg interval */
k = &encpriv[4];
tick = s626_ns_to_timer((int *)&cmd->convert_arg,
cmd->flags & TRIG_ROUND_MASK);
@@ -1859,8 +1953,8 @@ static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
k->SetEnable(dev, k, CLKENAB_INDEX);
DEBUG
- ("s626_ai_cmd: convert trigger timer is set with value %d\n",
- tick);
+ ("s626_ai_cmd: convert trigger timer "
+ "is set with value %d\n", tick);
break;
case TRIG_EXT:
/* set the digital line and interrupt for convert trigger */
@@ -2178,13 +2272,15 @@ static void s626_dio_init(struct comedi_device *dev)
/* For each group of sixteen channels ... */
for (group = 0; group < S626_DIO_BANKS; group++) {
s = dev->subdevices + 2 + group;
- DEBIwrite(dev, diopriv->WRIntSel, 0); /* Disable all interrupts. */
- DEBIwrite(dev, diopriv->WRCapSel, 0xFFFF); /* Disable all event */
+ /* Disable all interrupts */
+ DEBIwrite(dev, diopriv->WRIntSel, 0);
+ /* Disable all event */
+ DEBIwrite(dev, diopriv->WRCapSel, 0xFFFF);
/* captures. */
DEBIwrite(dev, diopriv->WREdgSel, 0); /* Init all DIOs to */
/* default edge */
/* polarity. */
- DEBIwrite(dev, diopriv->WRDOut, 0); /* Program all outputs */
+ DEBIwrite(dev, diopriv->WRDOut, 0); /* Program all outputs */
/* to inactive state. */
}
DEBUG("s626_dio_init: DIO initialized\n");
@@ -2207,8 +2303,8 @@ static int s626_dio_insn_bits(struct comedi_device *dev,
if (insn->n != 2) {
printk
- ("comedi%d: s626: s626_dio_insn_bits(): Invalid instruction length\n",
- dev->minor);
+ ("comedi%d: s626: s626_dio_insn_bits(): "
+ "Invalid instruction length\n", dev->minor);
return -EINVAL;
}
@@ -2311,9 +2407,8 @@ static int s626_dio_set_irq(struct comedi_device *dev, unsigned int chan)
static int s626_dio_reset_irq(struct comedi_device *dev, unsigned int group,
unsigned int mask)
{
- DEBUG
- ("s626_dio_reset_irq: disable interrupt on dio channel %d group %d\n",
- mask, group);
+ DEBUG("s626_dio_reset_irq: disable interrupt "
+ "on dio channel %d group %d\n", mask, group);
/* disable edge capture write command */
DEBIwrite(dev, LP_MISC1, MISC1_NOEDCAP);
@@ -2353,9 +2448,9 @@ static int s626_enc_insn_config(struct comedi_device *dev,
{
uint16_t Setup = (LOADSRC_INDX << BF_LOADSRC) | /* Preload upon */
/* index. */
- (INDXSRC_SOFT << BF_INDXSRC) | /* Disable hardware index. */
- (CLKSRC_COUNTER << BF_CLKSRC) | /* Operating mode is Counter. */
- (CLKPOL_POS << BF_CLKPOL) | /* Active high clock. */
+ (INDXSRC_SOFT << BF_INDXSRC) | /* Disable hardware index. */
+ (CLKSRC_COUNTER << BF_CLKSRC) | /* Operating mode is Counter */
+ (CLKPOL_POS << BF_CLKPOL) | /* Active high clock. */
/* ( CNTDIR_UP << BF_CLKPOL ) | // Count direction is Down. */
(CLKMULT_1X << BF_CLKMULT) | /* Clock multiplier is 1x. */
(CLKENAB_INDEX << BF_CLKENAB);
@@ -2465,7 +2560,8 @@ static void s626_timer_load(struct comedi_device *dev, struct enc_private *k,
static uint8_t trimchan[] = { 10, 9, 8, 3, 2, 7, 6, 1, 0, 5, 4 };
/* TrimDac LogicalChan-to-EepromAdrs mapping table. */
-static uint8_t trimadrs[] = { 0x40, 0x41, 0x42, 0x50, 0x51, 0x52, 0x53, 0x60, 0x61, 0x62, 0x63 };
+static uint8_t trimadrs[] = { 0x40, 0x41, 0x42, 0x50, 0x51, 0x52,
+ 0x53, 0x60, 0x61, 0x62, 0x63 };
static void LoadTrimDACs(struct comedi_device *dev)
{
@@ -2481,7 +2577,8 @@ static void WriteTrimDAC(struct comedi_device *dev, uint8_t LogicalChan,
{
uint32_t chan;
- /* Save the new setpoint in case the application needs to read it back later. */
+ /* Save the new setpoint in case the application
+ * needs to read it back later. */
devpriv->TrimSetpoint[LogicalChan] = (uint8_t) DacData;
/* Map logical channel number to physical channel number. */
@@ -2543,7 +2640,7 @@ static uint8_t I2Cread(struct comedi_device *dev, uint8_t addr)
/* Byte1 receives */
/* uint8_t from */
/* EEPROM. */
- |I2C_B0(I2C_ATTRNOP, 0))) { /* Byte0 = Not sent. */
+ |I2C_B0(I2C_ATTRNOP, 0))) { /* Byte0 = Not sent. */
/* Abort function and declare error if handshake failed. */
DEBUG("I2Cread: error handshake I2Cread b\n");
@@ -2623,10 +2720,11 @@ static void SetDAC(struct comedi_device *dev, uint16_t chan, short dacdata)
* running after the packet has been sent to the target DAC.
*/
SendDAC(dev, 0x0F000000
- /* Continue clock after target DAC data (write to non-existent trimdac). */
+ /* Continue clock after target DAC data
+ * (write to non-existent trimdac). */
| 0x00004000
- /* Address the two main dual-DAC devices (TSL's chip select enables
- * target device). */
+ /* Address the two main dual-DAC devices (TSL's chip
+ * select enables target device). */
| ((uint32_t) (chan & 1) << 15)
/* Address the DAC channel within the device. */
| (uint32_t) dacdata); /* Include DAC setpoint data. */
@@ -2762,8 +2860,8 @@ static void WriteMISC2(struct comedi_device *dev, uint16_t NewImage)
{
DEBIwrite(dev, LP_MISC1, MISC1_WENABLE); /* enab writes to */
/* MISC2 register. */
- DEBIwrite(dev, LP_WRMISC2, NewImage); /* Write new image to MISC2. */
- DEBIwrite(dev, LP_MISC1, MISC1_WDISABLE); /* Disable writes to MISC2. */
+ DEBIwrite(dev, LP_WRMISC2, NewImage); /* Write new image to MISC2. */
+ DEBIwrite(dev, LP_MISC1, MISC1_WDISABLE); /* Disable writes to MISC2.*/
}
/* Initialize the DEBI interface for all transfers. */
@@ -2866,7 +2964,8 @@ static void CloseDMAB(struct comedi_device *dev, struct bufferDMA *pdma,
* 2=2A, 3=0B, 4=1B, 5=2B.
*/
-/* Forward declarations for functions that are common to both A and B counters: */
+/* Forward declarations for functions that are
+ * common to both A and B counters: */
/* ****** PRIVATE COUNTER FUNCTIONS ****** */
@@ -2919,22 +3018,41 @@ static uint16_t GetMode_A(struct comedi_device *dev, struct enc_private *k)
/* Populate the standardized counter setup bit fields. Note: */
/* IndexSrc is restricted to ENC_X or IndxPol. */
setup = ((cra & STDMSK_LOADSRC) /* LoadSrc = LoadSrcA. */
- |((crb << (STDBIT_LATCHSRC - CRBBIT_LATCHSRC)) & STDMSK_LATCHSRC) /* LatchSrc = LatchSrcA. */
- |((cra << (STDBIT_INTSRC - CRABIT_INTSRC_A)) & STDMSK_INTSRC) /* IntSrc = IntSrcA. */
- |((cra << (STDBIT_INDXSRC - (CRABIT_INDXSRC_A + 1))) & STDMSK_INDXSRC) /* IndxSrc = IndxSrcA<1>. */
- |((cra >> (CRABIT_INDXPOL_A - STDBIT_INDXPOL)) & STDMSK_INDXPOL) /* IndxPol = IndxPolA. */
- |((crb >> (CRBBIT_CLKENAB_A - STDBIT_CLKENAB)) & STDMSK_CLKENAB)); /* ClkEnab = ClkEnabA. */
+ |((crb << (STDBIT_LATCHSRC - CRBBIT_LATCHSRC)) &
+ STDMSK_LATCHSRC) /* LatchSrc = LatchSrcA. */
+ |((cra << (STDBIT_INTSRC - CRABIT_INTSRC_A)) &
+ STDMSK_INTSRC) /* IntSrc = IntSrcA. */
+ |((cra << (STDBIT_INDXSRC - (CRABIT_INDXSRC_A + 1))) &
+ STDMSK_INDXSRC) /* IndxSrc = IndxSrcA<1>. */
+ |((cra >> (CRABIT_INDXPOL_A - STDBIT_INDXPOL)) &
+ STDMSK_INDXPOL) /* IndxPol = IndxPolA. */
+ |((crb >> (CRBBIT_CLKENAB_A - STDBIT_CLKENAB)) &
+ STDMSK_CLKENAB)); /* ClkEnab = ClkEnabA. */
/* Adjust mode-dependent parameters. */
- if (cra & (2 << CRABIT_CLKSRC_A)) /* If Timer mode (ClkSrcA<1> == 1): */
- setup |= ((CLKSRC_TIMER << STDBIT_CLKSRC) /* Indicate Timer mode. */
- |((cra << (STDBIT_CLKPOL - CRABIT_CLKSRC_A)) & STDMSK_CLKPOL) /* Set ClkPol to indicate count direction (ClkSrcA<0>). */
- |(MULT_X1 << STDBIT_CLKMULT)); /* ClkMult must be 1x in Timer mode. */
+ if (cra & (2 << CRABIT_CLKSRC_A)) /* If Timer mode (ClkSrcA<1> == 1): */
+
+ /* Comment 1: Indicate Timer mode.
+ * Comment 2: Set ClkPol to indicate count
+ * direction (ClkSrcA<0>).
+ * Comment 3: ClkMult must be 1x in Timer mode. */
+ setup |= ((CLKSRC_TIMER << STDBIT_CLKSRC) /* Comment 1 */
+ |((cra << (STDBIT_CLKPOL - CRABIT_CLKSRC_A)) &
+ STDMSK_CLKPOL) /* Comment 2 */
+ |(MULT_X1 << STDBIT_CLKMULT)); /* Comment 3 */
else /* If Counter mode (ClkSrcA<1> == 0): */
- setup |= ((CLKSRC_COUNTER << STDBIT_CLKSRC) /* Indicate Counter mode. */
- |((cra >> (CRABIT_CLKPOL_A - STDBIT_CLKPOL)) & STDMSK_CLKPOL) /* Pass through ClkPol. */
- |(((cra & CRAMSK_CLKMULT_A) == (MULT_X0 << CRABIT_CLKMULT_A)) ? /* Force ClkMult to 1x if not legal, else pass through. */
+
+ /* Comment 1: Indicate Counter mode.
+ * Comment 2: Pass thru ClkPol.
+ * Com 3: Force ClkMult to 1x if not legal, else pass thru
+ */
+ setup |= ((CLKSRC_COUNTER << STDBIT_CLKSRC) /* Comment 1 */
+ |((cra >> (CRABIT_CLKPOL_A - STDBIT_CLKPOL)) &
+ STDMSK_CLKPOL) /* Comment 2 */
+ |(((cra & CRAMSK_CLKMULT_A) ==
+ (MULT_X0 <<
+ CRABIT_CLKMULT_A)) ? /* Com 3 */
(MULT_X1 << STDBIT_CLKMULT) :
((cra >> (CRABIT_CLKMULT_A -
STDBIT_CLKMULT)) & STDMSK_CLKMULT)));
@@ -2955,28 +3073,53 @@ static uint16_t GetMode_B(struct comedi_device *dev, struct enc_private *k)
/* Populate the standardized counter setup bit fields. Note: */
/* IndexSrc is restricted to ENC_X or IndxPol. */
- setup = (((crb << (STDBIT_INTSRC - CRBBIT_INTSRC_B)) & STDMSK_INTSRC) /* IntSrc = IntSrcB. */
- |((crb << (STDBIT_LATCHSRC - CRBBIT_LATCHSRC)) & STDMSK_LATCHSRC) /* LatchSrc = LatchSrcB. */
- |((crb << (STDBIT_LOADSRC - CRBBIT_LOADSRC_B)) & STDMSK_LOADSRC) /* LoadSrc = LoadSrcB. */
- |((crb << (STDBIT_INDXPOL - CRBBIT_INDXPOL_B)) & STDMSK_INDXPOL) /* IndxPol = IndxPolB. */
- |((crb >> (CRBBIT_CLKENAB_B - STDBIT_CLKENAB)) & STDMSK_CLKENAB) /* ClkEnab = ClkEnabB. */
- |((cra >> ((CRABIT_INDXSRC_B + 1) - STDBIT_INDXSRC)) & STDMSK_INDXSRC)); /* IndxSrc = IndxSrcB<1>. */
-
- /* Adjust mode-dependent parameters. */
- if ((crb & CRBMSK_CLKMULT_B) == (MULT_X0 << CRBBIT_CLKMULT_B)) /* If Extender mode (ClkMultB == MULT_X0): */
- setup |= ((CLKSRC_EXTENDER << STDBIT_CLKSRC) /* Indicate Extender mode. */
- |(MULT_X1 << STDBIT_CLKMULT) /* Indicate multiplier is 1x. */
- |((cra >> (CRABIT_CLKSRC_B - STDBIT_CLKPOL)) & STDMSK_CLKPOL)); /* Set ClkPol equal to Timer count direction (ClkSrcB<0>). */
-
- else if (cra & (2 << CRABIT_CLKSRC_B)) /* If Timer mode (ClkSrcB<1> == 1): */
- setup |= ((CLKSRC_TIMER << STDBIT_CLKSRC) /* Indicate Timer mode. */
- |(MULT_X1 << STDBIT_CLKMULT) /* Indicate multiplier is 1x. */
- |((cra >> (CRABIT_CLKSRC_B - STDBIT_CLKPOL)) & STDMSK_CLKPOL)); /* Set ClkPol equal to Timer count direction (ClkSrcB<0>). */
-
- else /* If Counter mode (ClkSrcB<1> == 0): */
- setup |= ((CLKSRC_COUNTER << STDBIT_CLKSRC) /* Indicate Timer mode. */
- |((crb >> (CRBBIT_CLKMULT_B - STDBIT_CLKMULT)) & STDMSK_CLKMULT) /* Clock multiplier is passed through. */
- |((crb << (STDBIT_CLKPOL - CRBBIT_CLKPOL_B)) & STDMSK_CLKPOL)); /* Clock polarity is passed through. */
+ setup = (((crb << (STDBIT_INTSRC - CRBBIT_INTSRC_B)) &
+ STDMSK_INTSRC) /* IntSrc = IntSrcB. */
+ |((crb << (STDBIT_LATCHSRC - CRBBIT_LATCHSRC)) &
+ STDMSK_LATCHSRC)/* LatchSrc = LatchSrcB. */
+ |((crb << (STDBIT_LOADSRC - CRBBIT_LOADSRC_B)) &
+ STDMSK_LOADSRC) /* LoadSrc = LoadSrcB. */
+ |((crb << (STDBIT_INDXPOL - CRBBIT_INDXPOL_B)) &
+ STDMSK_INDXPOL) /* IndxPol = IndxPolB. */
+ |((crb >> (CRBBIT_CLKENAB_B - STDBIT_CLKENAB)) &
+ STDMSK_CLKENAB) /* ClkEnab = ClkEnabB. */
+ |((cra >> ((CRABIT_INDXSRC_B + 1) - STDBIT_INDXSRC)) &
+ STDMSK_INDXSRC)); /* IndxSrc = IndxSrcB<1>. */
+
+ /* Adjust mode-dependent parameters.
+ * Comment 1: Indicate Extender mode.
+ * Comment 2: Indicate multiplier is 1x.
+ * Comment 3: Set ClkPol equal to Timer count direction (ClkSrcB<0>). */
+ if ((crb & CRBMSK_CLKMULT_B) == (MULT_X0 << CRBBIT_CLKMULT_B))
+ /* If Extender mode (ClkMultB == MULT_X0): */
+
+ setup |= ((CLKSRC_EXTENDER << STDBIT_CLKSRC) /* Comment 1 */
+ |(MULT_X1 << STDBIT_CLKMULT) /* Comment 2 */
+ |((cra >> (CRABIT_CLKSRC_B - STDBIT_CLKPOL)) &
+ STDMSK_CLKPOL)); /* Comment 3 */
+
+ else if (cra & (2 << CRABIT_CLKSRC_B)) /* If Timer
+ * mode (ClkSrcB<1> == 1): */
+
+ /* Comment 1: Indicate Timer mode.
+ * Comment 2: Indicate multiplier is 1x.
+ * Comment 3: Set ClkPol equal to Timer count
+ * direction (ClkSrcB<0>). */
+ setup |= ((CLKSRC_TIMER << STDBIT_CLKSRC) /* Comment 1 above */
+ | (MULT_X1 << STDBIT_CLKMULT) /* Comment 2 */
+ | ((cra >> (CRABIT_CLKSRC_B - STDBIT_CLKPOL)) &
+ STDMSK_CLKPOL)); /* Comment 3 */
+
+ else /* If Counter mode (ClkSrcB<1> == 0): */
+
+ /* Comm 1: Indicate Timer mode.
+ * Comment 2: Clock multiplier is passed through.
+ * Comment 3: Clock polarity is passed through. */
+ setup |= ((CLKSRC_COUNTER << STDBIT_CLKSRC) /* Comm 1 above */
+ | ((crb >> (CRBBIT_CLKMULT_B - STDBIT_CLKMULT)) &
+ STDMSK_CLKMULT) /* Comment 2 */
+ | ((crb << (STDBIT_CLKPOL - CRBBIT_CLKPOL_B)) &
+ STDMSK_CLKPOL)); /* Comment 3 */
/* Return adjusted counter setup. */
return setup;
@@ -2994,14 +3137,19 @@ static void SetMode_A(struct comedi_device *dev, struct enc_private *k,
{
register uint16_t cra;
register uint16_t crb;
- register uint16_t setup = Setup; /* Cache the Standard Setup. */
+ register uint16_t setup = Setup; /* Cache the Standard Setup. */
/* Initialize CRA and CRB images. */
- cra = ((setup & CRAMSK_LOADSRC_A) /* Preload trigger is passed through. */
- |((setup & STDMSK_INDXSRC) >> (STDBIT_INDXSRC - (CRABIT_INDXSRC_A + 1)))); /* IndexSrc is restricted to ENC_X or IndxPol. */
+ cra = ((setup & CRAMSK_LOADSRC_A) /* Preload trigger is passed thru. */
+ | ((setup & STDMSK_INDXSRC) >>
+ (STDBIT_INDXSRC - (CRABIT_INDXSRC_A + 1))));
+ /* IndexSrc is restricted to ENC_X or IndxPol */
- crb = (CRBMSK_INTRESETCMD | CRBMSK_INTRESET_A /* Reset any pending CounterA event captures. */
- | ((setup & STDMSK_CLKENAB) << (CRBBIT_CLKENAB_A - STDBIT_CLKENAB))); /* Clock enable is passed through. */
+ /* Comment 1: Reset any pending CounterA event captures.
+ * Comment 2: Clock enable is passed through. */
+ crb = (CRBMSK_INTRESETCMD | CRBMSK_INTRESET_A /* Comment 1 above */
+ | ((setup & STDMSK_CLKENAB) <<
+ (CRBBIT_CLKENAB_A - STDBIT_CLKENAB))); /* Comment 2 */
/* Force IntSrc to Disabled if DisableIntSrc is asserted. */
if (!DisableIntSrc)
@@ -3014,16 +3162,28 @@ static void SetMode_A(struct comedi_device *dev, struct enc_private *k,
/* (Extender valid only for B counters). */
case CLKSRC_TIMER: /* Timer Mode: */
- cra |= ((2 << CRABIT_CLKSRC_A) /* ClkSrcA<1> selects system clock */
- |((setup & STDMSK_CLKPOL) >> (STDBIT_CLKPOL - CRABIT_CLKSRC_A)) /* with count direction (ClkSrcA<0>) obtained from ClkPol. */
- |(1 << CRABIT_CLKPOL_A) /* ClkPolA behaves as always-on clock enable. */
- |(MULT_X1 << CRABIT_CLKMULT_A)); /* ClkMult must be 1x. */
+ /* Comment 1: ClkSrcA<1> selects system clock
+ * Comm 2: with count direction (ClkSrcA<0>)
+ * obtained from ClkPol.
+ * Comment 3: ClkPolA behaves as always-on clock enable.
+ * Comment 4: ClkMult must be 1x. */
+ cra |= ((2 << CRABIT_CLKSRC_A) /* Comment 1 above */
+ | ((setup & STDMSK_CLKPOL) >>
+ (STDBIT_CLKPOL - CRABIT_CLKSRC_A)) /* Comm 2 */
+ | (1 << CRABIT_CLKPOL_A) /* Comment 3 */
+ |(MULT_X1 << CRABIT_CLKMULT_A)); /* Comment 4 */
break;
default: /* Counter Mode: */
- cra |= (CLKSRC_COUNTER /* Select ENC_C and ENC_D as clock/direction inputs. */
- | ((setup & STDMSK_CLKPOL) << (CRABIT_CLKPOL_A - STDBIT_CLKPOL)) /* Clock polarity is passed through. */
- |(((setup & STDMSK_CLKMULT) == (MULT_X0 << STDBIT_CLKMULT)) ? /* Force multiplier to x1 if not legal, otherwise pass through. */
+ /* Comment 1: Select ENC_C and ENC_D as clock/direction inputs.
+ * Comm 2: Clock polarity is passed through.
+ * Comm 3: Force multiplier to x1 if not legal,
+ otherwise pass through. */
+ cra |= (CLKSRC_COUNTER /* Comment 1 above */
+ | ((setup & STDMSK_CLKPOL) <<
+ (CRABIT_CLKPOL_A - STDBIT_CLKPOL)) /* Comm 2 */
+ |(((setup & STDMSK_CLKMULT) ==
+ (MULT_X0 << STDBIT_CLKMULT)) ? /* Comm 3 */
(MULT_X1 << CRABIT_CLKMULT_A) :
((setup & STDMSK_CLKMULT) << (CRABIT_CLKMULT_A -
STDBIT_CLKMULT))));
@@ -3054,12 +3214,19 @@ static void SetMode_B(struct comedi_device *dev, struct enc_private *k,
register uint16_t crb;
register uint16_t setup = Setup; /* Cache the Standard Setup. */
- /* Initialize CRA and CRB images. */
- cra = ((setup & STDMSK_INDXSRC) << ((CRABIT_INDXSRC_B + 1) - STDBIT_INDXSRC)); /* IndexSrc field is restricted to ENC_X or IndxPol. */
+ /* Initialize CRA and CRB images.
+ * IndexSrc field is restricted to ENC_X or IndxPol. */
+ cra = ((setup & STDMSK_INDXSRC) <<
+ ((CRABIT_INDXSRC_B + 1) - STDBIT_INDXSRC));
- crb = (CRBMSK_INTRESETCMD | CRBMSK_INTRESET_B /* Reset event captures and disable interrupts. */
- | ((setup & STDMSK_CLKENAB) << (CRBBIT_CLKENAB_B - STDBIT_CLKENAB)) /* Clock enable is passed through. */
- |((setup & STDMSK_LOADSRC) >> (STDBIT_LOADSRC - CRBBIT_LOADSRC_B))); /* Preload trigger source is passed through. */
+ /* Comment 1: Reset event captures and disable interrupts.
+ * Comment 2: Clock enable is passed through.
+ * Comment 3: Preload trigger source is passed through. */
+ crb = (CRBMSK_INTRESETCMD | CRBMSK_INTRESET_B /* Comment 1 above */
+ | ((setup & STDMSK_CLKENAB) <<
+ (CRBBIT_CLKENAB_B - STDBIT_CLKENAB)) /* Comment 2 */
+ |((setup & STDMSK_LOADSRC) >>
+ (STDBIT_LOADSRC - CRBBIT_LOADSRC_B))); /* Comment 3 */
/* Force IntSrc to Disabled if DisableIntSrc is asserted. */
if (!DisableIntSrc)
@@ -3069,23 +3236,42 @@ static void SetMode_B(struct comedi_device *dev, struct enc_private *k,
/* Populate all mode-dependent attributes of CRA & CRB images. */
switch ((setup & STDMSK_CLKSRC) >> STDBIT_CLKSRC) {
case CLKSRC_TIMER: /* Timer Mode: */
- cra |= ((2 << CRABIT_CLKSRC_B) /* ClkSrcB<1> selects system clock */
- |((setup & STDMSK_CLKPOL) << (CRABIT_CLKSRC_B - STDBIT_CLKPOL))); /* with direction (ClkSrcB<0>) obtained from ClkPol. */
- crb |= ((1 << CRBBIT_CLKPOL_B) /* ClkPolB behaves as always-on clock enable. */
- |(MULT_X1 << CRBBIT_CLKMULT_B)); /* ClkMultB must be 1x. */
+ /* ClkSrcB<1> selects system clock
+ * with direction (ClkSrcB<0>) obtained from ClkPol. */
+ cra |= ((2 << CRABIT_CLKSRC_B)
+ |((setup & STDMSK_CLKPOL) <<
+ (CRABIT_CLKSRC_B - STDBIT_CLKPOL)));
+
+ /* ClkPolB behaves as always-on clock enable.
+ * ClkMultB must be 1x. */
+ crb |= ((1 << CRBBIT_CLKPOL_B)
+ |(MULT_X1 << CRBBIT_CLKMULT_B));
break;
case CLKSRC_EXTENDER: /* Extender Mode: */
- cra |= ((2 << CRABIT_CLKSRC_B) /* ClkSrcB source is OverflowA (same as "timer") */
- |((setup & STDMSK_CLKPOL) << (CRABIT_CLKSRC_B - STDBIT_CLKPOL))); /* with direction obtained from ClkPol. */
- crb |= ((1 << CRBBIT_CLKPOL_B) /* ClkPolB controls IndexB -- always set to active. */
- |(MULT_X0 << CRBBIT_CLKMULT_B)); /* ClkMultB selects OverflowA as the clock source. */
+ cra |= ((2 << CRABIT_CLKSRC_B) /* ClkSrcB source is OverflowA
+ * (same as "timer") */
+ |((setup & STDMSK_CLKPOL) <<
+ (CRABIT_CLKSRC_B - STDBIT_CLKPOL)));
+ /* with direction obtained from ClkPol. */
+
+ /* ClkPolB controls IndexB -- always set to active.
+ * ClkMultB selects OverflowA as the clock source. */
+ crb |= ((1 << CRBBIT_CLKPOL_B) |
+ (MULT_X0 << CRBBIT_CLKMULT_B));
break;
default: /* Counter Mode: */
- cra |= (CLKSRC_COUNTER << CRABIT_CLKSRC_B); /* Select ENC_C and ENC_D as clock/direction inputs. */
- crb |= (((setup & STDMSK_CLKPOL) >> (STDBIT_CLKPOL - CRBBIT_CLKPOL_B)) /* ClkPol is passed through. */
- |(((setup & STDMSK_CLKMULT) == (MULT_X0 << STDBIT_CLKMULT)) ? /* Force ClkMult to x1 if not legal, otherwise pass through. */
+ /* Select ENC_C and ENC_D as clock/direction inputs. */
+ cra |= (CLKSRC_COUNTER << CRABIT_CLKSRC_B);
+
+ crb |= (((setup & STDMSK_CLKPOL) >>
+ (STDBIT_CLKPOL - CRBBIT_CLKPOL_B))
+ /* ClkPol is passed through. */
+ |(((setup & STDMSK_CLKMULT) ==
+ (MULT_X0 << STDBIT_CLKMULT)) ?
+ /* Force ClkMult to x1 if not legal,
+ * otherwise pass through. */
(MULT_X1 << CRBBIT_CLKMULT_B) :
((setup & STDMSK_CLKMULT) << (CRBBIT_CLKMULT_B -
STDBIT_CLKMULT))));
@@ -3097,19 +3283,23 @@ static void SetMode_B(struct comedi_device *dev, struct enc_private *k,
crb |= ((setup & STDMSK_INDXPOL) >> (STDBIT_INDXPOL -
CRBBIT_INDXPOL_B));
- /* If IntSrc has been forced to Disabled, update the MISC2 interrupt */
- /* enable mask to indicate the counter interrupt is disabled. */
+ /* If IntSrc has been forced to Disabled, update the MISC2
+ * interrupt enable mask to indicate the counter interrupt
+ * is disabled.
+ */
if (DisableIntSrc)
devpriv->CounterIntEnabs &= ~k->MyEventBits[3];
- /* While retaining CounterA and LatchSrc configurations, program the */
- /* new counter operating mode. */
+ /* While retaining CounterA and LatchSrc configurations, */
+ /* program the new counter operating mode. */
DEBIreplace(dev, k->MyCRA,
(uint16_t) (~(CRAMSK_INDXSRC_B | CRAMSK_CLKSRC_B)), cra);
DEBIreplace(dev, k->MyCRB, CRBMSK_CLKENAB_A | CRBMSK_LATCHSRC, crb);
}
-/* Return/set a counter's enable. enab: 0=always enabled, 1=enabled by index. */
+/* Return/set a counter's enable.
+ * enab: 0=always enabled, 1=enabled by index.
+ */
static void SetEnable_A(struct comedi_device *dev, struct enc_private *k,
uint16_t enab)
@@ -3155,7 +3345,8 @@ static void SetLatchSource(struct comedi_device *dev, struct enc_private *k,
}
/*
- * static uint16_t GetLatchSource(struct comedi_device *dev, struct enc_private *k )
+ * static uint16_t GetLatchSource(struct comedi_device *dev,
+ * struct enc_private *k )
* {
* return ( DEBIread( dev, k->MyCRB) >> CRBBIT_LATCHSRC ) & 3;
* }
@@ -3249,64 +3440,87 @@ static uint16_t GetIntSrc_B(struct comedi_device *dev, struct enc_private *k)
/* Return/set the clock multiplier. */
-/* static void SetClkMult(struct comedi_device *dev, struct enc_private *k, uint16_t value ) */
-/* { */
-/* k->SetMode(dev, k, (uint16_t)( ( k->GetMode(dev, k ) & ~STDMSK_CLKMULT ) | ( value << STDBIT_CLKMULT ) ), FALSE ); */
-/* } */
+/* static void SetClkMult(struct comedi_device *dev,
+ * struct enc_private *k, uint16_t value )
+ * {
+ * k->SetMode(dev, k, (uint16_t)( ( k->GetMode(dev, k ) & ~STDMSK_CLKMULT ) |
+ * ( value << STDBIT_CLKMULT ) ), FALSE );
+ * }
+ */
-/* static uint16_t GetClkMult(struct comedi_device *dev, struct enc_private *k ) */
-/* { */
-/* return ( k->GetMode(dev, k ) >> STDBIT_CLKMULT ) & 3; */
-/* } */
+/* static uint16_t GetClkMult(struct comedi_device *dev,
+ * struct enc_private *k )
+ * {
+ * return ( k->GetMode(dev, k ) >> STDBIT_CLKMULT ) & 3;
+ * }
+ */
/* Return/set the clock polarity. */
-/* static void SetClkPol( struct comedi_device *dev,struct enc_private *k, uint16_t value ) */
-/* { */
-/* k->SetMode(dev, k, (uint16_t)( ( k->GetMode(dev, k ) & ~STDMSK_CLKPOL ) | ( value << STDBIT_CLKPOL ) ), FALSE ); */
-/* } */
+/* static void SetClkPol( struct comedi_device *dev,struct enc_private *k,
+ * uint16_t value )
+ * {
+ * k->SetMode(dev, k, (uint16_t)( ( k->GetMode(dev, k ) & ~STDMSK_CLKPOL ) |
+ * ( value << STDBIT_CLKPOL ) ), FALSE );
+ * }
+ */
-/* static uint16_t GetClkPol(struct comedi_device *dev, struct enc_private *k ) */
-/* { */
-/* return ( k->GetMode(dev, k ) >> STDBIT_CLKPOL ) & 1; */
-/* } */
+/* static uint16_t GetClkPol(struct comedi_device *dev, struct enc_private *k )
+ * {
+ * return ( k->GetMode(dev, k ) >> STDBIT_CLKPOL ) & 1;
+ * }
+ */
/* Return/set the clock source. */
-/* static void SetClkSrc( struct comedi_device *dev,struct enc_private *k, uint16_t value ) */
-/* { */
-/* k->SetMode(dev, k, (uint16_t)( ( k->GetMode(dev, k ) & ~STDMSK_CLKSRC ) | ( value << STDBIT_CLKSRC ) ), FALSE ); */
-/* } */
+/* static void SetClkSrc( struct comedi_device *dev, struct enc_private *k,
+ * uint16_t value )
+ * {
+ * k->SetMode(dev, k, (uint16_t)( ( k->GetMode(dev, k ) & ~STDMSK_CLKSRC ) |
+ * ( value << STDBIT_CLKSRC ) ), FALSE );
+ * }
+ */
-/* static uint16_t GetClkSrc( struct comedi_device *dev,struct enc_private *k ) */
-/* { */
-/* return ( k->GetMode(dev, k ) >> STDBIT_CLKSRC ) & 3; */
-/* } */
+/* static uint16_t GetClkSrc( struct comedi_device *dev,struct enc_private *k )
+ * {
+ * return ( k->GetMode(dev, k ) >> STDBIT_CLKSRC ) & 3;
+ * }
+ */
/* Return/set the index polarity. */
-/* static void SetIndexPol(struct comedi_device *dev, struct enc_private *k, uint16_t value ) */
-/* { */
-/* k->SetMode(dev, k, (uint16_t)( ( k->GetMode(dev, k ) & ~STDMSK_INDXPOL ) | ( (value != 0) << STDBIT_INDXPOL ) ), FALSE ); */
-/* } */
+/* static void SetIndexPol(struct comedi_device *dev,
+ * struct enc_private *k, uint16_t value )
+ * {
+ * k->SetMode(dev, k, (uint16_t)( ( k->GetMode(dev, k ) & ~STDMSK_INDXPOL ) |
+ * ( (value != 0) << STDBIT_INDXPOL ) ), FALSE );
+ * }
+ */
-/* static uint16_t GetIndexPol(struct comedi_device *dev, struct enc_private *k ) */
-/* { */
-/* return ( k->GetMode(dev, k ) >> STDBIT_INDXPOL ) & 1; */
-/* } */
+/* static uint16_t GetIndexPol(struct comedi_device *dev,
+ * struct enc_private *k )
+ * {
+ * return ( k->GetMode(dev, k ) >> STDBIT_INDXPOL ) & 1;
+ * }
+ */
/* Return/set the index source. */
-/* static void SetIndexSrc(struct comedi_device *dev, struct enc_private *k, uint16_t value ) */
-/* { */
-/* DEBUG("SetIndexSrc: set index src enter 3700\n"); */
-/* k->SetMode(dev, k, (uint16_t)( ( k->GetMode(dev, k ) & ~STDMSK_INDXSRC ) | ( (value != 0) << STDBIT_INDXSRC ) ), FALSE ); */
-/* } */
+/* static void SetIndexSrc(struct comedi_device *dev,
+ * struct enc_private *k, uint16_t value )
+ * {
+ * DEBUG("SetIndexSrc: set index src enter 3700\n");
+ * k->SetMode(dev, k, (uint16_t)( ( k->GetMode(dev, k ) & ~STDMSK_INDXSRC ) |
+ * ( (value != 0) << STDBIT_INDXSRC ) ), FALSE );
+ * }
+ */
-/* static uint16_t GetIndexSrc(struct comedi_device *dev, struct enc_private *k ) */
-/* { */
-/* return ( k->GetMode(dev, k ) >> STDBIT_INDXSRC ) & 1; */
-/* } */
+/* static uint16_t GetIndexSrc(struct comedi_device *dev,
+ * struct enc_private *k )
+ * {
+ * return ( k->GetMode(dev, k ) >> STDBIT_INDXSRC ) & 1;
+ * }
+ */
/* Generate an index pulse. */
@@ -3326,7 +3540,7 @@ static void PulseIndex_B(struct comedi_device *dev, struct enc_private *k)
{
register uint16_t crb;
- crb = DEBIread(dev, k->MyCRB) & ~CRBMSK_INTCTRL; /* Pulse index. */
+ crb = DEBIread(dev, k->MyCRB) & ~CRBMSK_INTCTRL; /* Pulse index. */
DEBIwrite(dev, k->MyCRB, (uint16_t) (crb ^ CRBMSK_INDXPOL_B));
DEBIwrite(dev, k->MyCRB, crb);
}
@@ -3337,7 +3551,8 @@ static void Preload(struct comedi_device *dev, struct enc_private *k,
uint32_t value)
{
DEBUG("Preload: preload enter\n");
- DEBIwrite(dev, (uint16_t) (k->MyLatchLsw), (uint16_t) value); /* Write value to preload register. */
+ /* Write value to preload register. */
+ DEBIwrite(dev, (uint16_t) (k->MyLatchLsw), (uint16_t) value);
DEBUG("Preload: preload step 1\n");
DEBIwrite(dev, (uint16_t) (k->MyLatchLsw + 2),
(uint16_t) (value >> 16));
@@ -3349,14 +3564,15 @@ static void CountersInit(struct comedi_device *dev)
struct enc_private *k;
uint16_t Setup = (LOADSRC_INDX << BF_LOADSRC) | /* Preload upon */
/* index. */
- (INDXSRC_SOFT << BF_INDXSRC) | /* Disable hardware index. */
- (CLKSRC_COUNTER << BF_CLKSRC) | /* Operating mode is counter. */
- (CLKPOL_POS << BF_CLKPOL) | /* Active high clock. */
- (CNTDIR_UP << BF_CLKPOL) | /* Count direction is up. */
- (CLKMULT_1X << BF_CLKMULT) | /* Clock multiplier is 1x. */
- (CLKENAB_INDEX << BF_CLKENAB); /* Enabled by index */
-
- /* Disable all counter interrupts and clear any captured counter events. */
+ (INDXSRC_SOFT << BF_INDXSRC) | /* Disable hardware index. */
+ (CLKSRC_COUNTER << BF_CLKSRC) | /* Operating mode is counter. */
+ (CLKPOL_POS << BF_CLKPOL) | /* Active high clock. */
+ (CNTDIR_UP << BF_CLKPOL) | /* Count direction is up. */
+ (CLKMULT_1X << BF_CLKMULT) | /* Clock multiplier is 1x. */
+ (CLKENAB_INDEX << BF_CLKENAB); /* Enabled by index */
+
+ /* Disable all counter interrupts and
+ * clear any captured counter events. */
for (chan = 0; chan < S626_ENCODER_CHANNELS; chan++) {
k = &encpriv[chan];
k->SetMode(dev, k, Setup, TRUE);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 4/5] Coding style in serial2002 Patch that resolves braces and KERN_ warnings by checkpatch.pl Signed-off-by: Michael Ahern
2011-01-09 23:03 ` [PATCH 4/5] Coding style in serial2002 Patch that resolves braces and KERN_ warnings by checkpatch.pl Signed-off-by: Michael Ahern ahern.michael.t
@ 2011-01-09 23:56 ` Joe Perches
0 siblings, 0 replies; 9+ messages in thread
From: Joe Perches @ 2011-01-09 23:56 UTC (permalink / raw)
To: ahern.michael.t
Cc: gregkh, u.kleine-koenig, julia, nikai, morgan.gatti, devel, linux-kernel
On Mon, 2011-01-10 at 10:03 +1100, ahern.michael.t@gmail.com wrote:
> From: mah <ahern.michael.t@gmail.com>
Hi Michael, just trivia.
> drivers/staging/comedi/drivers/serial2002.c | 206 ++++++++++++---------------
> @@ -451,23 +454,23 @@ static int serial_2002_open(struct comedi_device *dev)
> command = (data.value >> 8) & 0x3;
> switch (kind) {
> case 1:{
> - cur_config = dig_in_config;
> + cur_config = dig_in_config;
> }
> break;
> case 2:{
You could remove the braces from all the case labels as well.
[]
> + switch (unit) {
> + case 0:{
> + min = min * 1000000;
Perhaps *= 1000000 and *= 1000
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/5] Staging: comedi: fix line-length coding style issue in usbduxfast.c
2011-01-09 23:03 [PATCH 1/5] Staging: comedi: fix line-length coding style issue in usbduxfast.c ahern.michael.t
` (3 preceding siblings ...)
2011-01-09 23:03 ` [PATCH 5/5] Coding style in s626 Patch that resolves line length warnings by checkpatch.pl Signed-off-by: Michael Ahern <ahern.michael.t@gmail.com> ahern.michael.t
@ 2011-01-10 6:36 ` Greg KH
4 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2011-01-10 6:36 UTC (permalink / raw)
To: ahern.michael.t
Cc: u.kleine-koenig, julia, nikai, morgan.gatti, devel, linux-kernel
On Mon, Jan 10, 2011 at 10:03:12AM +1100, ahern.michael.t@gmail.com wrote:
> From: mah <ahern.michael.t@gmail.com>
Please put your "real" name here, the same one you put down below in the
Signed-off-by: line.
> This patch to usbduxfast.c file that fixes warnings found by checkpatch.pl tool
Which warnings?
> -static void usbduxfast_firmware_request_complete_handler(const struct firmware
> +static void usbduxfast_firmware_req_complete_handler(const struct firmware
> *fw, void *context)
> {
> struct usbduxfastsub_s *usbduxfastsub_tmp = context;
> @@ -1577,7 +1585,7 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf,
> &udev->dev,
> GFP_KERNEL,
> usbduxfastsub + index,
> - usbduxfast_firmware_request_complete_handler);
> + usbduxfast_firmware_req_complete_handler);
Renaming the function name just to make the line-length work isn't ok.
Just don't make this change.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/5] Coding style in unioxx5.c KERN_ facility level and coding style warnings as reported by checkpatch.pl Signed-off-by: Michael Ahern <ahern.michael.t@gmail.com>
2011-01-09 23:03 ` [PATCH 3/5] Coding style in unioxx5.c KERN_ facility level and coding style warnings as reported by checkpatch.pl Signed-off-by: Michael Ahern <ahern.michael.t@gmail.com> ahern.michael.t
@ 2011-01-10 6:39 ` Greg KH
0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2011-01-10 6:39 UTC (permalink / raw)
To: ahern.michael.t
Cc: u.kleine-koenig, julia, nikai, morgan.gatti, devel, linux-kernel
On Mon, Jan 10, 2011 at 10:03:14AM +1100, ahern.michael.t@gmail.com wrote:
> From: mah <ahern.michael.t@gmail.com>
>
> ---
You put the description and signed-off-by line on the subject: You need
to put a blank line after the first line in your git commit to keep git
send-email from messing this up.
> drivers/staging/comedi/drivers/unioxx5.c | 65 +++++++++++++++++++----------
> 1 files changed, 42 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/unioxx5.c b/drivers/staging/comedi/drivers/unioxx5.c
> index 598884e..334f036 100644
> --- a/drivers/staging/comedi/drivers/unioxx5.c
> +++ b/drivers/staging/comedi/drivers/unioxx5.c
> @@ -72,13 +72,17 @@ Devices: [Fastwel] UNIOxx-5 (unioxx5),
> #define ALL_2_INPUT 0 /* config all digital channels to input */
> #define ALL_2_OUTPUT 1 /* config all digital channels to output */
>
> -/* 'private' structure for each subdevice */
> +/* 'private' unioxx5 structure for each subdevice
> + usp_module_type - 12 modules. each can be 70L or 73L
> + usp_extra_data - for saving previous written value for analog modules
> + usp_prev_wr_val - previous written value
> + usp_prev_cn_val - previous channel value */
> struct unioxx5_subd_priv {
> int usp_iobase;
> - unsigned char usp_module_type[12]; /* 12 modules. each can be 70L or 73L */
> - unsigned char usp_extra_data[12][4]; /* for saving previous written value for analog modules */
> - unsigned char usp_prev_wr_val[3]; /* previous written value */
> - unsigned char usp_prev_cn_val[3]; /* previous channel value */
> + unsigned char usp_module_type[12]; /* see comment above */
> + unsigned char usp_extra_data[12][4]; /* see comment above */
> + unsigned char usp_prev_wr_val[3]; /* see comment above */
> + unsigned char usp_prev_cn_val[3]; /* see comment above */
No need for the "comment above" just put all of the comments in the
comment. And if you do that, use the proper kernel-doc format for this,
so it works properly.
> static int unioxx5_attach(struct comedi_device *dev,
> @@ -99,7 +103,8 @@ static int __unioxx5_digital_write(struct unioxx5_subd_priv *usp,
> unsigned int *data, int channel, int minor);
> static int __unioxx5_digital_read(struct unioxx5_subd_priv *usp,
> unsigned int *data, int channel, int minor);
> -/* static void __unioxx5_digital_config(struct unioxx5_subd_priv* usp, int mode); */
> +/* static void __unioxx5_digital_config(struct unioxx5_subd_priv* usp,
> + int mode); */
> static int __unioxx5_analog_write(struct unioxx5_subd_priv *usp,
> unsigned int *data, int channel, int minor);
> static int __unioxx5_analog_read(struct unioxx5_subd_priv *usp,
> @@ -139,8 +144,10 @@ static int unioxx5_attach(struct comedi_device *dev,
> dev->iobase = iobase;
> iobase += UNIOXX5_SUBDEV_BASE;
>
> - /* defining number of subdevices and getting they types (it must be 'g01') */
> - for (i = n_subd = 0, ba = iobase; i < 4; i++, ba += UNIOXX5_SUBDEV_ODDS) {
> + /* defining number of subdevices and getting types (it must be 'g01') */
> + for (i = n_subd = 0, ba = iobase; i < 4;
> + i++, ba += UNIOXX5_SUBDEV_ODDS) {
> +
> id = inb(ba + 0xE);
> num = inb(ba + 0xF);
>
> @@ -169,7 +176,7 @@ static int unioxx5_attach(struct comedi_device *dev,
> return -1;
> }
>
> - printk("attached\n");
> + printk(KERN_INFO "attached\n");
> return 0;
> }
>
> @@ -181,7 +188,8 @@ static int unioxx5_subdev_read(struct comedi_device *dev,
> int channel, type;
>
> channel = CR_CHAN(insn->chanspec);
> - type = usp->usp_module_type[channel / 2]; /* defining module type(analog or digital) */
> + /* defining module type(analog or digital) */
> + type = usp->usp_module_type[channel / 2];
>
> if (type == MODULE_DIGITAL) {
> if (!__unioxx5_digital_read(usp, data, channel, dev->minor))
> @@ -202,7 +210,8 @@ static int unioxx5_subdev_write(struct comedi_device *dev,
> int channel, type;
>
> channel = CR_CHAN(insn->chanspec);
> - type = usp->usp_module_type[channel / 2]; /* defining module type(analog or digital) */
> + /* defining module type(analog or digital) */
> + type = usp->usp_module_type[channel / 2];
>
> if (type == MODULE_DIGITAL) {
> if (!__unioxx5_digital_write(usp, data, channel, dev->minor))
> @@ -259,11 +268,16 @@ static int unioxx5_insn_config(struct comedi_device *dev,
> /* *\
> * sets channels buffer to 1(after this we are allowed to *
> * change channel type on input or output) *
> + *
> + outb(flags, ...) - changes type of _one_ channel
> + outb(0, ...) - sets channels bank to 0(allows directly input/output)
> + usp-> ... flags - saves written value
> + *
> \* */
> outb(1, usp->usp_iobase + 0);
> - outb(flags, usp->usp_iobase + channel_offset); /* changes type of _one_ channel */
> - outb(0, usp->usp_iobase + 0); /* sets channels bank to 0(allows directly input/output) */
> - usp->usp_prev_cn_val[channel_offset - 1] = flags; /* saves written value */
> + outb(flags, usp->usp_iobase + channel_offset); /* see comment above */
> + outb(0, usp->usp_iobase + 0); /* see above */
> + usp->usp_prev_cn_val[channel_offset - 1] = flags; /* see above */
No need to put the "see above".
thanks,
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 5/5] Coding style in s626 Patch that resolves line length warnings by checkpatch.pl Signed-off-by: Michael Ahern <ahern.michael.t@gmail.com>
2011-01-09 23:03 ` [PATCH 5/5] Coding style in s626 Patch that resolves line length warnings by checkpatch.pl Signed-off-by: Michael Ahern <ahern.michael.t@gmail.com> ahern.michael.t
@ 2011-01-10 6:39 ` Greg KH
0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2011-01-10 6:39 UTC (permalink / raw)
To: ahern.michael.t
Cc: u.kleine-koenig, julia, nikai, morgan.gatti, devel, linux-kernel
On Mon, Jan 10, 2011 at 10:03:16AM +1100, ahern.michael.t@gmail.com wrote:
> From: mah <ahern.michael.t@gmail.com>
>
> ---
Same From: and subject issue as others.
Care to fix all of these up and resend?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-01-10 6:39 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-09 23:03 [PATCH 1/5] Staging: comedi: fix line-length coding style issue in usbduxfast.c ahern.michael.t
2011-01-09 23:03 ` [PATCH 2/5] Staging: comedi: whitespace ahern.michael.t
2011-01-09 23:03 ` [PATCH 3/5] Coding style in unioxx5.c KERN_ facility level and coding style warnings as reported by checkpatch.pl Signed-off-by: Michael Ahern <ahern.michael.t@gmail.com> ahern.michael.t
2011-01-10 6:39 ` Greg KH
2011-01-09 23:03 ` [PATCH 4/5] Coding style in serial2002 Patch that resolves braces and KERN_ warnings by checkpatch.pl Signed-off-by: Michael Ahern ahern.michael.t
2011-01-09 23:56 ` Joe Perches
2011-01-09 23:03 ` [PATCH 5/5] Coding style in s626 Patch that resolves line length warnings by checkpatch.pl Signed-off-by: Michael Ahern <ahern.michael.t@gmail.com> ahern.michael.t
2011-01-10 6:39 ` Greg KH
2011-01-10 6:36 ` [PATCH 1/5] Staging: comedi: fix line-length coding style issue in usbduxfast.c Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.