From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Mon, 19 Dec 2005 00:41:18 +0000 (+0000)
Subject: Added some missing AO registers for m-series
X-Git-Tag: r0_7_71~99
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4fedf887cf29ac0c2edefb21bb743db633ddd3e7;p=comedi.git

Added some missing AO registers for m-series
---

diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c
index 5d823a80..a81ac810 100644
--- a/comedi/drivers/ni_pcimio.c
+++ b/comedi/drivers/ni_pcimio.c
@@ -1093,7 +1093,6 @@ static uint16_t m_series_stc_readw(comedi_device *dev, int reg)
 		offset = M_Offset_Joint_Status_2;
 		break;
 	/* FIXME: DIO_Parallel_Input_Register (16 bit reg) is replaced by M_Offset_Static_Digital_Input (32 bit) */
-	/* FIXME: most G_* registers don't exist on m series, maybe the CDIO registers replaced them? */
 	default:
 		rt_printk("%s: bug! unhandled register=0x%x in switch.\n", __FUNCTION__, reg);
 		return 0;
diff --git a/comedi/drivers/ni_stc.h b/comedi/drivers/ni_stc.h
index bf0f5fb4..2b00b2c4 100644
--- a/comedi/drivers/ni_stc.h
+++ b/comedi/drivers/ni_stc.h
@@ -910,7 +910,64 @@ enum m_series_register_offsets
 	M_Offset_CDI_Mask_Enable = 0x230,
 	M_Offset_CDO_Mask_Enable = 0x234,
 };
+static inline int M_Offset_AO_Waveform_Order(int channel)
+{
+	return 0xc2 + 0x4 * channel;
+};
+static inline int M_Offset_AO_Config_Bank(int channel)
+{
+	return 0xc3 + 0x4 * channel;
+};
+static inline int M_Offset_DAC_Direct_Data(int channel)
+{
+	return 0xc0 + 0x4 * channel;
+}
+static inline int M_Offset_Gen_PWM(int channel)
+{
+	return 0x44 + 0x2 * channel;
+}
+static inline int M_Offset_Static_AI_Control(int i)
+{
+	int offset[] =
+	{
+		0x64,
+		0x261,
+		0x262,
+		0x263,
+	};
+	if(((unsigned)i) >= sizeof(offset) / sizeof(offset[0]))
+	{
+		rt_printk("%s: invalid channel=%i\n", __FUNCTION__, i);
+		return offset[0];
+	}
+	return offset[i];
+};
+static inline int M_Offset_AO_Reference_Attenuation(int channel)
+{
+	int offset[] =
+	{
+		0x264,
+		0x265,
+		0x266,
+		0x267
+	};
+	if(((unsigned)channel) >= sizeof(offset) / sizeof(offset[0]))
+	{
+		rt_printk("%s: invalid channel=%i\n", __FUNCTION__, channel);
+		return offset[0];
+	}
+	return offset[channel];
+};
 
+enum MSeries_AO_Config_Bank_Bits
+{
+	MSeries_AO_DAC_Offset_Select_Mask = 0x7,
+	MSeries_AO_DAC_Offset_AO_Ground_Bits = 0x0,
+	MSeries_AO_DAC_Reference_Mask = 0x38,
+	MSeries_AO_DAC_Reference_Internal_Bits = 0x0,
+	MSeries_AO_Update_Timed_Bit = 0x40,
+	MSeries_AO_Bipolar_Bit = 0x80
+};
 
 typedef struct ni_board_struct{
 	int device_id;