From: Frank Mori Hess Date: Mon, 30 Dec 2002 22:49:43 +0000 (+0000) Subject: fixed channel 1 analog output insn (bug11) X-Git-Tag: r0_7_67x~131 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=850504cde54c753c79348ba120b5053924381d4e;p=comedi.git fixed channel 1 analog output insn (bug11) --- diff --git a/comedi/drivers/cb_pcidas.c b/comedi/drivers/cb_pcidas.c index 6a1d13df..fa8845b7 100644 --- a/comedi/drivers/cb_pcidas.c +++ b/comedi/drivers/cb_pcidas.c @@ -44,8 +44,8 @@ Driver: cb_pcidas.o Description: Driver for the ComputerBoards/MeasurementComputing cards of the PCI-DAS series with the AMCC S5933 PCI controller. Author: Ivan Martinez , - Frank Mori Hess -Updated: 2002-1-09 + Frank Mori Hess +Updated: 2002-12-30 Devices: [Measurement Computing] PCI-DAS1602/16 (cb_pcidas), PCI-DAS1602/16jr, PCI-DAS1602/12, PCI-DAS1200, PCI-DAS1200jr, PCI-DAS1000, PCI-DAS1001, PCI_DAS1002 @@ -59,8 +59,6 @@ Status: - PCI-DAS1000, 1001, 1002: Should work, but untested. Please report usage. - The boards' autocalibration features are not yet supported. - Configuration options: [0] - PCI bus of device (optional) [1] - PCI slot of device (optional) @@ -185,7 +183,10 @@ analog triggering on 1602 series #define DAC8254 8 // analog output registers for 100x, 1200 series -#define DAC_DATA_REG(channel) ((channel) & 0x1) +static inline unsigned int DAC_DATA_REG( unsigned int channel ) +{ + return 2 * ( channel & 0x1 ); +} /* analog output registers for 1602 series*/ #define DACDATA 0 // DAC DATA register #define DACFIFOCLR 2 // DAC FIFO CLEAR