staging: comedi: ni_labpc: cleanup true/false flags in boardinfo

[~andy/linux] / drivers / staging / comedi / drivers / ni_labpc.h

diff --git a/drivers/staging/comedi/drivers/ni_labpc.h b/drivers/staging/comedi/drivers/ni_labpc.h
index b0327c53603b8d8dc52d300209215947d1c11ae7..f4381815efe9e32daf54242b38a615d5951d75c0 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc.h
+++ b/drivers/staging/comedi/drivers/ni_labpc.h
@@ -27,26 +27,19 @@
 #define EEPROM_SIZE    256     /*  256 byte eeprom */
 #define NUM_AO_CHAN    2       /*  boards have two analog output channels */
 
-enum labpc_register_layout { labpc_plus_layout, labpc_1200_layout };
 enum transfer_type { fifo_not_empty_transfer, fifo_half_full_transfer,
        isa_dma_transfer
 };
 
 struct labpc_boardinfo {
        const char *name;
-       int ai_speed;           /*  maximum input speed in nanoseconds */
-
-       /*  1200 has extra registers compared to pc+ */
-       enum labpc_register_layout register_layout;
-       int has_ao;             /*  has analog output true/false */
        const struct comedi_lrange *ai_range_table;
        const int *ai_range_code;
-
-       /*  board can auto scan up in ai channels, not just down */
-       unsigned ai_scan_up:1;
-
-       /* uses memory mapped io instead of ioports */
-       unsigned has_mmio:1;
+       int ai_speed;                   /* maximum input speed in ns */
+       unsigned ai_scan_up:1;          /* can auto scan up in ai channels */
+       unsigned has_ao:1;              /* has analog outputs */
+       unsigned is_labpc1200:1;        /* has extra regs compared to pc+ */
+       unsigned has_mmio:1;            /* uses memory mapped io */
 };
 
 struct labpc_private {