staging: comedi: addi_common.h: cleanup after removal of addi_apci_1710

Now that the addi_apci_1710 driver has been removed, get rid of all the
unnecessary stuff in addi_common.h.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h
index f1be5ade9962efee53dd47613ec469b143b054b7..dfd1e666cc18864191cab0536ddf99c0ee82f3b8 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.h
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h
@@ -113,150 +113,6 @@ struct addi_board {
                          struct comedi_insn *, unsigned int *);
 };
 
-/* MODULE INFO STRUCTURE */
-
-union str_ModuleInfo {
-       /* Incremental counter infos */
-       struct {
-               union {
-                       struct {
-                               unsigned char b_ModeRegister1;
-                               unsigned char b_ModeRegister2;
-                               unsigned char b_ModeRegister3;
-                               unsigned char b_ModeRegister4;
-                       } s_ByteModeRegister;
-                       unsigned int dw_ModeRegister1_2_3_4;
-               } s_ModeRegister;
-
-               struct {
-                       unsigned int b_IndexInit:1;
-                       unsigned int b_CounterInit:1;
-                       unsigned int b_ReferenceInit:1;
-                       unsigned int b_IndexInterruptOccur:1;
-                       unsigned int b_CompareLogicInit:1;
-                       unsigned int b_FrequencyMeasurementInit:1;
-                       unsigned int b_FrequencyMeasurementEnable:1;
-               } s_InitFlag;
-
-       } s_SiemensCounterInfo;
-
-       /* SSI infos */
-       struct {
-               unsigned char b_SSIProfile;
-               unsigned char b_PositionTurnLength;
-               unsigned char b_TurnCptLength;
-               unsigned char b_SSIInit;
-       } s_SSICounterInfo;
-
-       /* TTL I/O infos */
-       struct {
-               unsigned char b_TTLInit;
-               unsigned char b_PortConfiguration[4];
-       } s_TTLIOInfo;
-
-       /* Digital I/O infos */
-       struct {
-               unsigned char b_DigitalInit;
-               unsigned char b_ChannelAMode;
-               unsigned char b_ChannelBMode;
-               unsigned char b_OutputMemoryEnabled;
-               unsigned int dw_OutputMemory;
-       } s_DigitalIOInfo;
-
-      /*********************/
-       /* 82X54 timer infos */
-      /*********************/
-
-       struct {
-               struct {
-                       unsigned char b_82X54Init;
-                       unsigned char b_InputClockSelection;
-                       unsigned char b_InputClockLevel;
-                       unsigned char b_OutputLevel;
-                       unsigned char b_HardwareGateLevel;
-                       unsigned int dw_ConfigurationWord;
-               } s_82X54TimerInfo[3];
-               unsigned char b_InterruptMask;
-       } s_82X54ModuleInfo;
-
-      /*********************/
-       /* Chronometer infos */
-      /*********************/
-
-       struct {
-               unsigned char b_ChronoInit;
-               unsigned char b_InterruptMask;
-               unsigned char b_PCIInputClock;
-               unsigned char b_TimingUnit;
-               unsigned char b_CycleMode;
-               double d_TimingInterval;
-               unsigned int dw_ConfigReg;
-       } s_ChronoModuleInfo;
-
-      /***********************/
-       /* Pulse encoder infos */
-      /***********************/
-
-       struct {
-               struct {
-                       unsigned char b_PulseEncoderInit;
-               } s_PulseEncoderInfo[4];
-               unsigned int dw_SetRegister;
-               unsigned int dw_ControlRegister;
-               unsigned int dw_StatusRegister;
-       } s_PulseEncoderModuleInfo;
-
-       /* Tor conter infos */
-       struct {
-               struct {
-                       unsigned char b_TorCounterInit;
-                       unsigned char b_TimingUnit;
-                       unsigned char b_InterruptEnable;
-                       double d_TimingInterval;
-                       unsigned int ul_RealTimingInterval;
-               } s_TorCounterInfo[2];
-               unsigned char b_PCIInputClock;
-       } s_TorCounterModuleInfo;
-
-       /* PWM infos */
-       struct {
-               struct {
-                       unsigned char b_PWMInit;
-                       unsigned char b_TimingUnit;
-                       unsigned char b_InterruptEnable;
-                       double d_LowTiming;
-                       double d_HighTiming;
-                       unsigned int ul_RealLowTiming;
-                       unsigned int ul_RealHighTiming;
-               } s_PWMInfo[2];
-               unsigned char b_ClockSelection;
-       } s_PWMModuleInfo;
-
-       /* ETM infos */
-       struct {
-               struct {
-                       unsigned char b_ETMEnable;
-                       unsigned char b_ETMInterrupt;
-               } s_ETMInfo[2];
-               unsigned char b_ETMInit;
-               unsigned char b_TimingUnit;
-               unsigned char b_ClockSelection;
-               double d_TimingInterval;
-               unsigned int ul_Timing;
-       } s_ETMModuleInfo;
-
-       /* CDA infos */
-       struct {
-               unsigned char b_CDAEnable;
-               unsigned char b_CDAInterrupt;
-               unsigned char b_CDAInit;
-               unsigned char b_FctSelection;
-               unsigned char b_CDAReadFIFOOverflow;
-       } s_CDAModuleInfo;
-
-};
-
-/* Private structure for the addi_apci3120 driver */
 struct addi_private {
        int iobase;
        int i_IobaseAmcc;       /*  base+size for AMCC chip */
@@ -299,31 +155,6 @@ struct addi_private {
        /* Pointer to the current process */
        struct task_struct *tsk_Current;
 
-       /* Hardware board infos for 1710 */
-       struct {
-               unsigned int ui_Address;        /* Board address */
-               unsigned int ui_FlashAddress;
-               unsigned char b_InterruptNbr;   /* Board interrupt number */
-               unsigned char b_SlotNumber;     /* PCI slot number */
-               unsigned char b_BoardVersion;
-               unsigned int dw_MolduleConfiguration[4];        /* Module config */
-       } s_BoardInfos;
-
-       /* Interrupt infos */
-       struct {
-               unsigned int ul_InterruptOccur; /* 0   : No interrupt occur */
-                                               /* > 0 : Interrupt occur */
-               unsigned int ui_Read;   /* Read FIFO */
-               unsigned int ui_Write;  /* Write FIFO */
-               struct {
-                       unsigned char b_OldModuleMask;
-                       unsigned int ul_OldInterruptMask;       /* Interrupt mask */
-                       unsigned int ul_OldCounterLatchValue;   /* Interrupt counter value */
-               } s_FIFOInterruptParameters[APCI1710_SAVE_INTERRUPT];
-       } s_InterruptParameters;
-
-       union str_ModuleInfo s_ModuleInfo[4];
-
        /* Parameters read from EEPROM overriding static board info */
        struct {
                int i_NbrAiChannel;     /*  num of A/D chans */