Added ad8842 caldac

diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c
index 878b2a87ed92c100b69a9df58941c1722aabb108..652b628ee68900efe9a0de47199a3d7aa60d3357 100644 (file)
--- a/comedi/drivers/ni_mio_common.c
+++ b/comedi/drivers/ni_mio_common.c
@@ -2164,6 +2164,7 @@ static int pack_dac8800(int addr,int val,int *bitstring);
 static int pack_dac8043(int addr,int val,int *bitstring);
 static int pack_ad8522(int addr,int val,int *bitstring);
 static int pack_ad8804(int addr,int val,int *bitstring);
+static int pack_ad8842(int addr,int val,int *bitstring);
 
 struct caldac_struct{
        int n_chans;
@@ -2177,6 +2178,7 @@ static struct caldac_struct caldacs[] = {
        [dac8043] = { 1, 12, pack_dac8043 },
        [ad8522]  = { 2, 12, pack_ad8522 },
        [ad8804] = { 12, 8, pack_ad8804 },
+       [ad8842] = { 8, 8, pack_ad8842 },
        [ad8804_debug] = { 16, 8, pack_ad8804 },
 };
 
@@ -2300,6 +2302,11 @@ static int pack_ad8804(int addr,int val,int *bitstring)
        return 12;
 }
 
+static int pack_ad8842(int addr,int val,int *bitstring)
+{
+       *bitstring=((addr+1)<<8) | (val&0xff);
+       return 12;
+}
 
 
 /*

diff --git a/comedi/drivers/ni_stc.h b/comedi/drivers/ni_stc.h
index de4d41c0b4efbde80b2469b7870a59642c444832..be5a304c36148c27a922b8b089d9643af4a7557b 100644 (file)
--- a/comedi/drivers/ni_stc.h
+++ b/comedi/drivers/ni_stc.h
@@ -598,7 +598,8 @@
 */
 
 enum{ ai_gain_16=0, ai_gain_8, ai_gain_14, ai_gain_4, ai_gain_611x };
-enum caldac_enum { caldac_none=0, mb88341, dac8800, dac8043, ad8522, ad8804, ad8804_debug };
+enum caldac_enum { caldac_none=0, mb88341, dac8800, dac8043, ad8522,
+       ad8804, ad8842, ad8804_debug };
 
 typedef struct ni_board_struct{
        int device_id;