Added support for a couple missing ao registers to m_series_stc_writew()

diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c
index b5349ea05052fa03aedc8c0d467ef36a2729fa75..d48256922fd74e37e9f044dd9d10b86718a54a8b 100644 (file)
--- a/comedi/drivers/ni_mio_common.c
+++ b/comedi/drivers/ni_mio_common.c
@@ -878,7 +878,7 @@ static int ni_ao_prep_fifo(comedi_device *dev,comedi_subdevice *s)
        int n;
 
        /* reset fifo */
-       devpriv->stc_writew(dev, 0,DAC_FIFO_Clear);
+       devpriv->stc_writew(dev, 1,DAC_FIFO_Clear);
        if(boardtype.reg_type & ni_reg_6xxx_mask)
                ni_ao_win_outl(dev, 0x6, AO_FIFO_Offset_Load_611x);
 
@@ -2167,7 +2167,7 @@ static int ni_ao_inttrig(comedi_device *dev,comedi_subdevice *s,
        ni_set_bits(dev, Interrupt_B_Enable_Register, AO_FIFO_Interrupt_Enable | AO_Error_Interrupt_Enable, 0);
        interrupt_b_bits = AO_Error_Interrupt_Enable;
 #ifdef PCIDMA
-       devpriv->stc_writew(dev, 0, DAC_FIFO_Clear);
+       devpriv->stc_writew(dev, 1, DAC_FIFO_Clear);
        if(boardtype.reg_type & ni_reg_6xxx_mask)
                ni_ao_win_outl(dev, 0x6, AO_FIFO_Offset_Load_611x);
        ni_ao_setup_MITE_dma(dev, &s->async->cmd);

diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c
index 1482ec17f8b3d330a277ac8112c6be64c3998762..e85617091c126254b416282b462f3a11adef6bec 100644 (file)
--- a/comedi/drivers/ni_pcimio.c
+++ b/comedi/drivers/ni_pcimio.c
@@ -1070,6 +1070,9 @@ static void m_series_stc_writew(comedi_device *dev, uint16_t data, int reg)
        case AO_Command_1_Register:
                offset = M_Offset_AO_Command_1;
                break;
+       case AO_Command_2_Register:
+               offset = M_Offset_AO_Command_2;
+               break;
        case AO_Mode_1_Register:
                offset = M_Offset_AO_Mode_1;
                break;
@@ -1088,6 +1091,9 @@ static void m_series_stc_writew(comedi_device *dev, uint16_t data, int reg)
        case AO_Start_Select_Register:
                offset = M_Offset_AO_Start_Select;
                break;
+       case AO_Trigger_Select_Register:
+               offset = M_Offset_AO_Trigger_Select;
+               break;
        case Clock_and_FOUT_Register:
                offset = M_Offset_Clock_and_FOUT;
                break;