← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
141
141
                /* Test the time base */
142
142
           /**********************/
143
143
 
144
 
                if ((devpriv->ps_BoardInfo->
145
 
                                b_AvailableConvertUnit & (1 << b_TimeBase)) !=
 
144
                if ((this_board->b_AvailableConvertUnit & (1 << b_TimeBase)) !=
146
145
                        0) {
147
146
              /*******************************/
148
147
                        /* Test the convert time value */
165
164
                 /*******************************/
166
165
 
167
166
                                if (dw_TestReloadValue >=
168
 
                                        devpriv->ps_BoardInfo->
 
167
                                        devpriv->s_EeParameters.
169
168
                                        ui_MinAcquisitiontimeNs) {
170
169
                                        if ((b_SingleDiff == APCI3XXX_SINGLE)
171
170
                                                || (b_SingleDiff ==
172
171
                                                        APCI3XXX_DIFF)) {
173
 
                                                if (((b_SingleDiff == APCI3XXX_SINGLE) && (devpriv->ps_BoardInfo->i_NbrAiChannel == 0)) || ((b_SingleDiff == APCI3XXX_DIFF) && (devpriv->ps_BoardInfo->i_NbrAiChannelDiff == 0))) {
 
172
                                                if (((b_SingleDiff == APCI3XXX_SINGLE)
 
173
                                                        && (devpriv->s_EeParameters.i_NbrAiChannel == 0))
 
174
                                                    || ((b_SingleDiff == APCI3XXX_DIFF)
 
175
                                                        && (this_board->i_NbrAiChannelDiff == 0))
 
176
                                                    ) {
174
177
                           /*******************************/
175
178
                                                        /* Single/Diff selection error */
176
179
                           /*******************************/
372
375
                /* Test the channel number */
373
376
           /***************************/
374
377
 
375
 
                if (((b_Channel < devpriv->ps_BoardInfo->i_NbrAiChannel)
 
378
                if (((b_Channel < devpriv->s_EeParameters.i_NbrAiChannel)
376
379
                                && (devpriv->b_SingelDiff == APCI3XXX_SINGLE))
377
 
                        || ((b_Channel < devpriv->ps_BoardInfo->
378
 
                                        i_NbrAiChannelDiff)
 
380
                        || ((b_Channel < this_board->i_NbrAiChannelDiff)
379
381
                                && (devpriv->b_SingelDiff == APCI3XXX_DIFF))) {
380
382
              /**********************************/
381
383
                        /* Test the channel configuration */
663
665
                /* Test the channel number */
664
666
           /***************************/
665
667
 
666
 
                if (b_Channel < devpriv->ps_BoardInfo->i_NbrAoChannel) {
 
668
                if (b_Channel < devpriv->s_EeParameters.i_NbrAoChannel) {
667
669
              /**********************************/
668
670
                        /* Test the channel configuration */
669
671
              /**********************************/
1273
1275
        /* Test the channel number */
1274
1276
        /***************************/
1275
1277
 
1276
 
        if (b_Channel <= devpriv->ps_BoardInfo->i_NbrDiChannel) {
 
1278
        if (b_Channel <= devpriv->s_EeParameters.i_NbrDiChannel) {
1277
1279
           /************************/
1278
1280
                /* Test the buffer size */
1279
1281
           /************************/
1492
1494
                /* Test the channel number */
1493
1495
           /***************************/
1494
1496
 
1495
 
                if (b_Channel < devpriv->ps_BoardInfo->i_NbrDoChannel) {
 
1497
                if (b_Channel < devpriv->s_EeParameters.i_NbrDoChannel) {
1496
1498
              /*******************/
1497
1499
                        /* Get the command */
1498
1500
              /*******************/
1568
1570
                /* Test the channel number */
1569
1571
           /***************************/
1570
1572
 
1571
 
                if (b_Channel < devpriv->ps_BoardInfo->i_NbrDoChannel) {
 
1573
                if (b_Channel < devpriv->s_EeParameters.i_NbrDoChannel) {
1572
1574
              /********************************/
1573
1575
                        /* Read the digital output port */
1574
1576
              /********************************/