aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2009-03-19 17:57:11 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 17:54:16 -0400
commit222ab1bc78dd8a48576e904da37fd6f71cb41a7e (patch)
tree8e36bd0dd4016547e3365f185ec75eb1d03d34ee
parent675935dd95cf24e81982e57021d03d5bf8bdac60 (diff)
Staging: comedi: Remove pcidas64_board typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/comedi/drivers/cb_pcidas64.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index 0e9eeefc93bd..4c2e97302a35 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -541,7 +541,7 @@ struct hw_fifo_info {
541 uint16_t fifo_size_reg_mask; 541 uint16_t fifo_size_reg_mask;
542}; 542};
543 543
544typedef struct pcidas64_board_struct { 544struct pcidas64_board {
545 const char *name; 545 const char *name;
546 int device_id; // pci device id 546 int device_id; // pci device id
547 int ai_se_chans; // number of ai inputs in single-ended mode 547 int ai_se_chans; // number of ai inputs in single-ended mode
@@ -556,7 +556,7 @@ typedef struct pcidas64_board_struct {
556 const struct hw_fifo_info *const ai_fifo; 556 const struct hw_fifo_info *const ai_fifo;
557 enum register_layout layout; // different board families have slightly different registers 557 enum register_layout layout; // different board families have slightly different registers
558 unsigned has_8255:1; 558 unsigned has_8255:1;
559} pcidas64_board; 559};
560 560
561static const struct hw_fifo_info ai_fifo_4020 = { 561static const struct hw_fifo_info ai_fifo_4020 = {
562 num_segments:2, 562 num_segments:2,
@@ -584,7 +584,7 @@ static const struct hw_fifo_info ai_fifo_60xx = {
584#define MAX_AI_DMA_RING_COUNT (0x80000 / DMA_BUFFER_SIZE) 584#define MAX_AI_DMA_RING_COUNT (0x80000 / DMA_BUFFER_SIZE)
585#define MIN_AI_DMA_RING_COUNT (0x10000 / DMA_BUFFER_SIZE) 585#define MIN_AI_DMA_RING_COUNT (0x10000 / DMA_BUFFER_SIZE)
586#define AO_DMA_RING_COUNT (0x10000 / DMA_BUFFER_SIZE) 586#define AO_DMA_RING_COUNT (0x10000 / DMA_BUFFER_SIZE)
587static inline unsigned int ai_dma_ring_count(pcidas64_board * board) 587static inline unsigned int ai_dma_ring_count(struct pcidas64_board * board)
588{ 588{
589 if (board->layout == LAYOUT_4020) 589 if (board->layout == LAYOUT_4020)
590 return MAX_AI_DMA_RING_COUNT; 590 return MAX_AI_DMA_RING_COUNT;
@@ -594,7 +594,7 @@ static inline unsigned int ai_dma_ring_count(pcidas64_board * board)
594 594
595static const int bytes_in_sample = 2; 595static const int bytes_in_sample = 2;
596 596
597static const pcidas64_board pcidas64_boards[] = { 597static const struct pcidas64_board pcidas64_boards[] = {
598 { 598 {
599 name: "pci-das6402/16", 599 name: "pci-das6402/16",
600 device_id:0x1d, 600 device_id:0x1d,
@@ -1016,7 +1016,7 @@ static const pcidas64_board pcidas64_boards[] = {
1016// Number of boards in cb_pcidas_boards 1016// Number of boards in cb_pcidas_boards
1017static inline unsigned int num_boards(void) 1017static inline unsigned int num_boards(void)
1018{ 1018{
1019 return sizeof(pcidas64_boards) / sizeof(pcidas64_board); 1019 return sizeof(pcidas64_boards) / sizeof(struct pcidas64_board);
1020} 1020}
1021 1021
1022static DEFINE_PCI_DEVICE_TABLE(pcidas64_pci_table) = { 1022static DEFINE_PCI_DEVICE_TABLE(pcidas64_pci_table) = {
@@ -1044,9 +1044,9 @@ static DEFINE_PCI_DEVICE_TABLE(pcidas64_pci_table) = {
1044 1044
1045MODULE_DEVICE_TABLE(pci, pcidas64_pci_table); 1045MODULE_DEVICE_TABLE(pci, pcidas64_pci_table);
1046 1046
1047static inline pcidas64_board *board(const struct comedi_device * dev) 1047static inline struct pcidas64_board *board(const struct comedi_device * dev)
1048{ 1048{
1049 return (pcidas64_board *) dev->board_ptr; 1049 return (struct pcidas64_board *) dev->board_ptr;
1050} 1050}
1051 1051
1052static inline unsigned short se_diff_bit_6xxx(struct comedi_device * dev, 1052static inline unsigned short se_diff_bit_6xxx(struct comedi_device * dev,
@@ -1267,7 +1267,7 @@ static void set_dac_range_bits(struct comedi_device * dev, volatile uint16_t * b
1267 *bits |= code << (2 * channel); 1267 *bits |= code << (2 * channel);
1268}; 1268};
1269 1269
1270static inline int ao_cmd_is_supported(const pcidas64_board * board) 1270static inline int ao_cmd_is_supported(const struct pcidas64_board * board)
1271{ 1271{
1272 return board->ao_nchan && board->layout != LAYOUT_4020; 1272 return board->ao_nchan && board->layout != LAYOUT_4020;
1273} 1273}