Skip to content

L
linux
Commit 06033fce authored by Darren Armstrong's avatar Darren Armstrong Committed by Greg Kroah-Hartman
Browse files
Options

Staging: comedi: ssc_dnp: Fixed coding style issues 

Fixed coding style issues: 80-char width limit, KERN_ facility level
Signed-off-by: default avatarDarren Armstrong <darren.armstrong85@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b4ae23ce
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 41 deletions
drivers/staging/comedi/drivers/ssv_dnp.c
View file @ 06033fce
...@@ -41,14 +41,14 @@ Status: unknown ...@@ -41,14 +41,14 @@ Status: unknown
/* 0..3 remain unchanged! For details about Port C Mode Register see */ /* 0..3 remain unchanged! For details about Port C Mode Register see */
/* the remarks in dnp_insn_config() below. */ /* the remarks in dnp_insn_config() below. */
#define CSCIR 0x22 /* Chip Setup and Control Index Register */ #define CSCIR 0x22 /* Chip Setup and Control Index Register */
#define CSCDR 0x23 /* Chip Setup and Control Data Register */ #define CSCDR 0x23 /* Chip Setup and Control Data Register */
#define PAMR 0xa5 /* Port A Mode Register */ #define PAMR 0xa5 /* Port A Mode Register */
#define PADR 0xa9 /* Port A Data Register */ #define PADR 0xa9 /* Port A Data Register */
#define PBMR 0xa4 /* Port B Mode Register */ #define PBMR 0xa4 /* Port B Mode Register */
#define PBDR 0xa8 /* Port B Data Register */ #define PBDR 0xa8 /* Port B Data Register */
#define PCMR 0xa3 /* Port C Mode Register */ #define PCMR 0xa3 /* Port C Mode Register */
#define PCDR 0xa7 /* Port C Data Register */ #define PCDR 0xa7 /* Port C Data Register */
/* This data structure holds information about the supported boards -------- */ /* This data structure holds information about the supported boards -------- */
...@@ -59,8 +59,9 @@ struct dnp_board { ...@@ -59,8 +59,9 @@ struct dnp_board {
int have_dio; int have_dio;
}; };
static const struct dnp_board dnp_boards[] = { /* we only support one DNP 'board' */ /* We only support one DNP 'board' variant at the moment */
{ /* variant at the moment */ static const struct dnp_board dnp_boards[] = {
{
.name = "dnp-1486", .name = "dnp-1486",
.ai_chans = 16, .ai_chans = 16,
.ai_bits = 12, .ai_bits = 12,
...@@ -80,9 +81,9 @@ struct dnp_private_data { ...@@ -80,9 +81,9 @@ struct dnp_private_data {
#define devpriv ((dnp_private *)dev->private) #define devpriv ((dnp_private *)dev->private)
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* The struct comedi_driver structure tells the Comedi core module which functions */ /* The struct comedi_driver structure tells the Comedi core module which */
/* to call to configure/deconfigure (attach/detach) the board, and also */ /* functions to call to configure/deconfigure (attach/detach) the board, and */
/* about the kernel module that contains the device code. */ /* also about the kernel module that contains the device code. */
/* */ /* */
/* In the following section we define the API of this driver. */ /* In the following section we define the API of this driver. */
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
...@@ -97,7 +98,7 @@ static struct comedi_driver driver_dnp = { ...@@ -97,7 +98,7 @@ static struct comedi_driver driver_dnp = {
.detach = dnp_detach, .detach = dnp_detach,
.board_name = &dnp_boards[0].name, .board_name = &dnp_boards[0].name,
/* only necessary for non-PnP devs */ /* only necessary for non-PnP devs */
.offset = sizeof(struct dnp_board), /* like ISA-PnP, PCI or PCMCIA. */ .offset = sizeof(struct dnp_board), /* like ISA-PnP, PCI or PCMCIA */
.num_names = ARRAY_SIZE(dnp_boards), .num_names = ARRAY_SIZE(dnp_boards),
}; };
...@@ -122,28 +123,30 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -122,28 +123,30 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct comedi_subdevice *s; struct comedi_subdevice *s;
printk("comedi%d: dnp: ", dev->minor); printk(KERN_INFO "comedi%d: dnp: ", dev->minor);
/* Autoprobing: this should find out which board we have. Currently only */ /* Autoprobing: this should find out which board we have. Currently */
/* the 1486 board is supported and autoprobing is not implemented :-) */ /* only the 1486 board is supported and autoprobing is not */
/* implemented :-) */
/* dev->board_ptr = dnp_probe(dev); */ /* dev->board_ptr = dnp_probe(dev); */
/* Initialize the name of the board. We can use the "thisboard" macro now. */ /* Initialize the name of the board. */
/* We can use the "thisboard" macro now. */
dev->board_name = thisboard->name; dev->board_name = thisboard->name;
/* Allocate the private structure area. alloc_private() is a convenient */ /* Allocate the private structure area. alloc_private() is a */
/* macro defined in comedidev.h. */ /* convenient macro defined in comedidev.h. */
if (alloc_private(dev, sizeof(struct dnp_private_data)) < 0) if (alloc_private(dev, sizeof(struct dnp_private_data)) < 0)
return -ENOMEM; return -ENOMEM;
/* Allocate the subdevice structures. alloc_subdevice() is a convenient */ /* Allocate the subdevice structures. alloc_subdevice() is a */
/* macro defined in comedidev.h. */ /* convenient macro defined in comedidev.h. */
if (alloc_subdevices(dev, 1) < 0) if (alloc_subdevices(dev, 1) < 0)
return -ENOMEM; return -ENOMEM;
s = dev->subdevices + 0; s = dev->subdevices + 0;
/* digital i/o subdevice */ /* digital i/o subdevice */
s->type = COMEDI_SUBD_DIO; s->type = COMEDI_SUBD_DIO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE; s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = 20; s->n_chan = 20;
...@@ -158,7 +161,7 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -158,7 +161,7 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
* allocated for the primary 8259, so we don't need to allocate them * allocated for the primary 8259, so we don't need to allocate them
* ourselves. */ * ourselves. */
/* configure all ports as input (default) */ /* configure all ports as input (default) */
outb(PAMR, CSCIR); outb(PAMR, CSCIR);
outb(0x00, CSCDR); outb(0x00, CSCDR);
outb(PBMR, CSCIR); outb(PBMR, CSCIR);
...@@ -181,7 +184,7 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -181,7 +184,7 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int dnp_detach(struct comedi_device *dev) static int dnp_detach(struct comedi_device *dev)
{ {
/* configure all ports as input (default) */ /* configure all ports as input (default) */
outb(PAMR, CSCIR); outb(PAMR, CSCIR);
outb(0x00, CSCDR); outb(0x00, CSCDR);
outb(PBMR, CSCIR); outb(PBMR, CSCIR);
...@@ -189,8 +192,8 @@ static int dnp_detach(struct comedi_device *dev) ...@@ -189,8 +192,8 @@ static int dnp_detach(struct comedi_device *dev)
outb(PCMR, CSCIR); outb(PCMR, CSCIR);
outb((inb(CSCDR) & 0xAA), CSCDR); outb((inb(CSCDR) & 0xAA), CSCDR);
/* announce that we are finished */ /* announce that we are finished */
printk("comedi%d: dnp: remove\n", dev->minor); printk(KERN_INFO "comedi%d: dnp: remove\n", dev->minor);
return 0; return 0;
...@@ -210,12 +213,12 @@ static int dnp_dio_insn_bits(struct comedi_device *dev, ...@@ -210,12 +213,12 @@ static int dnp_dio_insn_bits(struct comedi_device *dev,
if (insn->n != 2) if (insn->n != 2)
return -EINVAL; /* insn uses data[0] and data[1] */ return -EINVAL; /* insn uses data[0] and data[1] */
/* The insn data is a mask in data[0] and the new data in data[1], each */ /* The insn data is a mask in data[0] and the new data in data[1], */
/* channel cooresponding to a bit. */ /* each channel cooresponding to a bit. */
/* Ports A and B are straight forward: each bit corresponds to an output */ /* Ports A and B are straight forward: each bit corresponds to an */
/* pin with the same order. Port C is different: bits 0...3 correspond to */ /* output pin with the same order. Port C is different: bits 0...3 */
/* bits 4...7 of the output register (PCDR). */ /* correspond to bits 4...7 of the output register (PCDR). */
if (data[0]) { if (data[0]) {
...@@ -235,7 +238,7 @@ static int dnp_dio_insn_bits(struct comedi_device *dev, ...@@ -235,7 +238,7 @@ static int dnp_dio_insn_bits(struct comedi_device *dev,
| (u8) ((data[1] & 0x0F0000) >> 12), CSCDR); | (u8) ((data[1] & 0x0F0000) >> 12), CSCDR);
} }
/* on return, data[1] contains the value of the digital input lines. */ /* on return, data[1] contains the value of the digital input lines. */
outb(PADR, CSCIR); outb(PADR, CSCIR);
data[0] = inb(CSCDR); data[0] = inb(CSCDR);
outb(PBDR, CSCIR); outb(PBDR, CSCIR);
...@@ -260,7 +263,8 @@ static int dnp_dio_insn_config(struct comedi_device *dev, ...@@ -260,7 +263,8 @@ static int dnp_dio_insn_config(struct comedi_device *dev,
u8 register_buffer; u8 register_buffer;
int chan = CR_CHAN(insn->chanspec); /* reduces chanspec to lower 16 bits */ /* reduces chanspec to lower 16 bits */
int chan = CR_CHAN(insn->chanspec);
switch (data[0]) { switch (data[0]) {
case INSN_CONFIG_DIO_OUTPUT: case INSN_CONFIG_DIO_OUTPUT:
...@@ -275,11 +279,11 @@ static int dnp_dio_insn_config(struct comedi_device *dev, ...@@ -275,11 +279,11 @@ static int dnp_dio_insn_config(struct comedi_device *dev,
return -EINVAL; return -EINVAL;
break; break;
} }
/* Test: which port does the channel belong to? */ /* Test: which port does the channel belong to? */
/* We have to pay attention with port C: this is the meaning of PCMR: */ /* We have to pay attention with port C: this is the meaning of PCMR: */
/* Bit in PCMR: 7 6 5 4 3 2 1 0 */ /* Bit in PCMR: 7 6 5 4 3 2 1 0 */
/* Corresponding port C pin: d 3 d 2 d 1 d 0 d= don't touch */ /* Corresponding port C pin: d 3 d 2 d 1 d 0 d= don't touch */
if ((chan >= 0) && (chan <= 7)) { if ((chan >= 0) && (chan <= 7)) {
/* this is port A */ /* this is port A */
...@@ -289,8 +293,8 @@ static int dnp_dio_insn_config(struct comedi_device *dev, ...@@ -289,8 +293,8 @@ static int dnp_dio_insn_config(struct comedi_device *dev,
chan -= 8; chan -= 8;
outb(PBMR, CSCIR); outb(PBMR, CSCIR);
} else if ((chan >= 16) && (chan <= 19)) { } else if ((chan >= 16) && (chan <= 19)) {
/* this is port C; multiplication with 2 brings bits into correct */ /* this is port C; multiplication with 2 brings bits into */
/* position for PCMR! */ /* correct position for PCMR! */
chan -= 16; chan -= 16;
chan *= 2; chan *= 2;
outb(PCMR, CSCIR); outb(PCMR, CSCIR);
...@@ -298,7 +302,7 @@ static int dnp_dio_insn_config(struct comedi_device *dev, ...@@ -298,7 +302,7 @@ static int dnp_dio_insn_config(struct comedi_device *dev,
return -EINVAL; return -EINVAL;
} }
/* read 'old' direction of the port and set bits (out=1, in=0) */ /* read 'old' direction of the port and set bits (out=1, in=0) */
register_buffer = inb(CSCDR); register_buffer = inb(CSCDR);
if (data[0] == COMEDI_OUTPUT) if (data[0] == COMEDI_OUTPUT)
register_buffer |= (1 << chan); register_buffer |= (1 << chan);
......
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