Skip to content

Commit

Permalink
Staging: comedi: ssc_dnp: Fixed coding style issues
Browse files Browse the repository at this point in the history 
Fixed coding style issues: 80-char width limit, KERN_ facility level

Signed-off-by: Darren Armstrong <darren.armstrong85@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Darren Armstrong authored and Greg Kroah-Hartman committed May 11, 2010
1 parent b4ae23c commit 06033fc
Showing 1 changed file with 45 additions and 41 deletions.
86 changes: 45 additions & 41 deletions drivers/staging/comedi/drivers/ssv_dnp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ Status: unknown
/* 0..3 remain unchanged! For details about Port C Mode Register see */
/* the remarks in dnp_insn_config() below. */

#define CSCIR 0x22 /* Chip Setup and Control Index Register */
#define CSCDR 0x23 /* Chip Setup and Control Data Register */
#define PAMR 0xa5 /* Port A Mode Register */
#define PADR 0xa9 /* Port A Data Register */
#define PBMR 0xa4 /* Port B Mode Register */
#define PBDR 0xa8 /* Port B Data Register */
#define PCMR 0xa3 /* Port C Mode Register */
#define PCDR 0xa7 /* Port C Data Register */
#define CSCIR 0x22 /* Chip Setup and Control Index Register */
#define CSCDR 0x23 /* Chip Setup and Control Data Register */
#define PAMR 0xa5 /* Port A Mode Register */
#define PADR 0xa9 /* Port A Data Register */
#define PBMR 0xa4 /* Port B Mode Register */
#define PBDR 0xa8 /* Port B Data Register */
#define PCMR 0xa3 /* Port C Mode Register */
#define PCDR 0xa7 /* Port C Data Register */

/* This data structure holds information about the supported boards -------- */

Expand All @@ -59,8 +59,9 @@ struct dnp_board {
int have_dio;
};

static const struct dnp_board dnp_boards[] = { /* we only support one DNP 'board' */
{ /* variant at the moment */
/* We only support one DNP 'board' variant at the moment */
static const struct dnp_board dnp_boards[] = {
{
.name = "dnp-1486",
.ai_chans = 16,
.ai_bits = 12,
Expand All @@ -80,9 +81,9 @@ struct dnp_private_data {
#define devpriv ((dnp_private *)dev->private)

/* ------------------------------------------------------------------------- */
/* The struct comedi_driver structure tells the Comedi core module which functions */
/* to call to configure/deconfigure (attach/detach) the board, and also */
/* about the kernel module that contains the device code. */
/* The struct comedi_driver structure tells the Comedi core module which */
/* functions to call to configure/deconfigure (attach/detach) the board, and */
/* also about the kernel module that contains the device code. */
/* */
/* In the following section we define the API of this driver. */
/* ------------------------------------------------------------------------- */
Expand All @@ -97,7 +98,7 @@ static struct comedi_driver driver_dnp = {
.detach = dnp_detach,
.board_name = &dnp_boards[0].name,
/* 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),
};

Expand All @@ -122,28 +123,30 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it)

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 */
/* the 1486 board is supported and autoprobing is not implemented :-) */
/* Autoprobing: this should find out which board we have. Currently */
/* only the 1486 board is supported and autoprobing is not */
/* implemented :-) */
/* 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;

/* Allocate the private structure area. alloc_private() is a convenient */
/* macro defined in comedidev.h. */
/* Allocate the private structure area. alloc_private() is a */
/* convenient macro defined in comedidev.h. */
if (alloc_private(dev, sizeof(struct dnp_private_data)) < 0)
return -ENOMEM;

/* Allocate the subdevice structures. alloc_subdevice() is a convenient */
/* macro defined in comedidev.h. */
/* Allocate the subdevice structures. alloc_subdevice() is a */
/* convenient macro defined in comedidev.h. */

if (alloc_subdevices(dev, 1) < 0)
return -ENOMEM;

s = dev->subdevices + 0;
/* digital i/o subdevice */
/* digital i/o subdevice */
s->type = COMEDI_SUBD_DIO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = 20;
Expand All @@ -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
* ourselves. */

/* configure all ports as input (default) */
/* configure all ports as input (default) */
outb(PAMR, CSCIR);
outb(0x00, CSCDR);
outb(PBMR, CSCIR);
Expand All @@ -181,16 +184,16 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int dnp_detach(struct comedi_device *dev)
{

/* configure all ports as input (default) */
/* configure all ports as input (default) */
outb(PAMR, CSCIR);
outb(0x00, CSCDR);
outb(PBMR, CSCIR);
outb(0x00, CSCDR);
outb(PCMR, CSCIR);
outb((inb(CSCDR) & 0xAA), CSCDR);

/* announce that we are finished */
printk("comedi%d: dnp: remove\n", dev->minor);
/* announce that we are finished */
printk(KERN_INFO "comedi%d: dnp: remove\n", dev->minor);

return 0;

Expand All @@ -210,12 +213,12 @@ static int dnp_dio_insn_bits(struct comedi_device *dev,
if (insn->n != 2)
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 */
/* channel cooresponding to a bit. */
/* The insn data is a mask in data[0] and the new data in data[1], */
/* each channel cooresponding to a bit. */

/* Ports A and B are straight forward: each bit corresponds to an output */
/* pin with the same order. Port C is different: bits 0...3 correspond to */
/* bits 4...7 of the output register (PCDR). */
/* Ports A and B are straight forward: each bit corresponds to an */
/* output pin with the same order. Port C is different: bits 0...3 */
/* correspond to bits 4...7 of the output register (PCDR). */

if (data[0]) {

Expand All @@ -235,7 +238,7 @@ static int dnp_dio_insn_bits(struct comedi_device *dev,
| (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);
data[0] = inb(CSCDR);
outb(PBDR, CSCIR);
Expand All @@ -260,7 +263,8 @@ static int dnp_dio_insn_config(struct comedi_device *dev,

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]) {
case INSN_CONFIG_DIO_OUTPUT:
Expand All @@ -275,11 +279,11 @@ static int dnp_dio_insn_config(struct comedi_device *dev,
return -EINVAL;
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: */
/* 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 */
/* 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 */
/* Corresponding port C pin: d 3 d 2 d 1 d 0 d= don't touch */

if ((chan >= 0) && (chan <= 7)) {
/* this is port A */
Expand All @@ -289,16 +293,16 @@ static int dnp_dio_insn_config(struct comedi_device *dev,
chan -= 8;
outb(PBMR, CSCIR);
} else if ((chan >= 16) && (chan <= 19)) {
/* this is port C; multiplication with 2 brings bits into correct */
/* position for PCMR! */
/* this is port C; multiplication with 2 brings bits into */
/* correct position for PCMR! */
chan -= 16;
chan *= 2;
outb(PCMR, CSCIR);
} else {
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);
if (data[0] == COMEDI_OUTPUT)
register_buffer |= (1 << chan);
Expand Down

0 comments on commit 06033fc

Please sign in to comment.