Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141618
b: refs/heads/master
c: 3cc3872
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 8882ba4 commit 8a7ce61
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: 8ce8a1fff26a88498cfa435cf964bcba87682daf
refs/heads/master: 3cc3872bbd097a2bcbe740b7041b3d35cc8f0d3e
10 changes: 6 additions & 4 deletions trunk/drivers/staging/comedi/drivers/ni_at_a2150.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,16 +156,18 @@ static const a2150_board a2150_boards[] = {
*/
#define thisboard ((const a2150_board *)dev->board_ptr)

typedef struct {
struct a2150_private {

volatile unsigned int count; /* number of data points left to be taken */
unsigned int dma; // dma channel
s16 *dma_buffer; // dma buffer
unsigned int dma_transfer_size; // size in bytes of dma transfers
int irq_dma_bits; // irq/dma register bits
int config_bits; // config register bits
} a2150_private;
};


#define devpriv ((a2150_private *)dev->private)
#define devpriv ((struct a2150_private *)dev->private)

static int a2150_attach(struct comedi_device * dev, struct comedi_devconfig * it);
static int a2150_detach(struct comedi_device * dev);
Expand Down Expand Up @@ -346,7 +348,7 @@ static int a2150_attach(struct comedi_device * dev, struct comedi_devconfig * it
printk("\n");

/* allocate and initialize dev->private */
if (alloc_private(dev, sizeof(a2150_private)) < 0)
if (alloc_private(dev, sizeof(struct a2150_private)) < 0)
return -ENOMEM;

if (iobase == 0) {
Expand Down

0 comments on commit 8a7ce61

Please sign in to comment.