Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141625
b: refs/heads/master
c: 087ea31
h: refs/heads/master
i:
  141623: 1996bd6
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 4996ed3 commit 89bf076
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a7195f3d92f5fc560e597598a56d9c394b65ee81
refs/heads/master: 087ea31bdabb0395f83223c153a0557136461a85
10 changes: 6 additions & 4 deletions trunk/drivers/staging/comedi/drivers/pcl818.c
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,8 @@ static struct comedi_driver driver_pcl818 = {

COMEDI_INITCLEANUP(driver_pcl818);

typedef struct {
struct pcl818_private {

unsigned int dma; // used DMA, 0=don't use DMA
int dma_rtc; // 1=RTC used with DMA, 0=no RTC alloc
unsigned int io_range;
Expand Down Expand Up @@ -358,13 +359,14 @@ typedef struct {
struct comedi_subdevice *sub_ai; // ptr to AI subdevice
unsigned char usefifo; // 1=use fifo
unsigned int ao_readback[2];
} pcl818_private;
};


static const unsigned int muxonechan[] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, // used for gain list programming
0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff
};

#define devpriv ((pcl818_private *)dev->private)
#define devpriv ((struct pcl818_private *)dev->private)
#define this_board ((const struct pcl818_board *)dev->board_ptr)

/*
Expand Down Expand Up @@ -1685,7 +1687,7 @@ static int pcl818_attach(struct comedi_device * dev, struct comedi_devconfig * i
unsigned long pages;
struct comedi_subdevice *s;

if ((ret = alloc_private(dev, sizeof(pcl818_private))) < 0)
if ((ret = alloc_private(dev, sizeof(struct pcl818_private))) < 0)
return ret; /* Can't alloc mem */

/* claim our I/O space */
Expand Down

0 comments on commit 89bf076

Please sign in to comment.