|
@@ -45,6 +45,7 @@ Configuration options:
|
|
|
|
|
|
#include "../comedidev.h"
|
|
|
|
|
|
+#include "comedi_fc.h"
|
|
|
#include "8253.h"
|
|
|
#include "amcc_s5933.h"
|
|
|
|
|
@@ -1047,30 +1048,11 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
|
|
|
|
|
|
/* step 1: make sure trigger sources are trivially valid */
|
|
|
|
|
|
- tmp = cmd->start_src;
|
|
|
- cmd->start_src &= TRIG_NOW | TRIG_EXT;
|
|
|
- if (!cmd->start_src || tmp != cmd->start_src)
|
|
|
- err++;
|
|
|
-
|
|
|
- tmp = cmd->scan_begin_src;
|
|
|
- cmd->scan_begin_src &= TRIG_FOLLOW;
|
|
|
- if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src)
|
|
|
- err++;
|
|
|
-
|
|
|
- tmp = cmd->convert_src;
|
|
|
- cmd->convert_src &= TRIG_TIMER | TRIG_EXT;
|
|
|
- if (!cmd->convert_src || tmp != cmd->convert_src)
|
|
|
- err++;
|
|
|
-
|
|
|
- tmp = cmd->scan_end_src;
|
|
|
- cmd->scan_end_src &= TRIG_COUNT;
|
|
|
- if (!cmd->scan_end_src || tmp != cmd->scan_end_src)
|
|
|
- err++;
|
|
|
-
|
|
|
- tmp = cmd->stop_src;
|
|
|
- cmd->stop_src &= TRIG_COUNT | TRIG_NONE;
|
|
|
- if (!cmd->stop_src || tmp != cmd->stop_src)
|
|
|
- err++;
|
|
|
+ err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW | TRIG_EXT);
|
|
|
+ err |= cfc_check_trigger_src(&cmd->scan_begin_src, TRIG_FOLLOW);
|
|
|
+ err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_TIMER | TRIG_EXT);
|
|
|
+ err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);
|
|
|
+ err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_COUNT | TRIG_NONE);
|
|
|
|
|
|
if (err)
|
|
|
return 1;
|