diff options
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_common.c | 7 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_stc.h | 27 |
2 files changed, 18 insertions, 16 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 2b9790ed6945..8cdcc1b600f6 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -3436,7 +3436,8 @@ static int ni_cdo_inttrig(struct comedi_device *dev, * ni_writeb(dev, Interrupt_Group_C_Enable_Bit, NI_M_INTC_ENA_REG); */ for (i = 0; i < timeout; ++i) { - if (ni_readl(dev, NI_M_CDIO_STATUS_REG) & CDO_FIFO_Full_Bit) + if (ni_readl(dev, NI_M_CDIO_STATUS_REG) & + NI_M_CDIO_STATUS_CDO_FIFO_FULL) break; udelay(10); } @@ -3531,13 +3532,13 @@ static void handle_cdio_interrupt(struct comedi_device *dev) #endif cdio_status = ni_readl(dev, NI_M_CDIO_STATUS_REG); - if (cdio_status & (CDO_Overrun_Bit | CDO_Underflow_Bit)) { + if (cdio_status & NI_M_CDIO_STATUS_CDO_ERROR) { /* XXX just guessing this is needed and does something useful */ ni_writel(dev, CDO_Error_Interrupt_Confirm_Bit, NI_M_CDIO_CMD_REG); s->async->events |= COMEDI_CB_OVERFLOW; } - if (cdio_status & CDO_FIFO_Empty_Bit) { + if (cdio_status & NI_M_CDIO_STATUS_CDO_FIFO_EMPTY) { ni_writel(dev, CDO_Empty_FIFO_Interrupt_Enable_Clear_Bit, NI_M_CDIO_CMD_REG); /* s->async->events |= COMEDI_CB_EOA; */ diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index a26e5c21aed1..2f0f94d1e101 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -1042,6 +1042,20 @@ static const struct comedi_lrange range_ni_E_ao_ext; #define NI_M_CDI_FIFO_DATA_REG 0x220 #define NI_M_CDO_FIFO_DATA_REG 0x220 #define NI_M_CDIO_STATUS_REG 0x224 +#define NI_M_CDIO_STATUS_CDI_OVERFLOW BIT(20) +#define NI_M_CDIO_STATUS_CDI_OVERRUN BIT(19) +#define NI_M_CDIO_STATUS_CDI_ERROR (NI_M_CDIO_STATUS_CDI_OVERFLOW | \ + NI_M_CDIO_STATUS_CDI_OVERRUN) +#define NI_M_CDIO_STATUS_CDI_FIFO_REQ BIT(18) +#define NI_M_CDIO_STATUS_CDI_FIFO_FULL BIT(17) +#define NI_M_CDIO_STATUS_CDI_FIFO_EMPTY BIT(16) +#define NI_M_CDIO_STATUS_CDO_UNDERFLOW BIT(4) +#define NI_M_CDIO_STATUS_CDO_OVERRUN BIT(3) +#define NI_M_CDIO_STATUS_CDO_ERROR (NI_M_CDIO_STATUS_CDO_UNDERFLOW | \ + NI_M_CDIO_STATUS_CDO_OVERRUN) +#define NI_M_CDIO_STATUS_CDO_FIFO_REQ BIT(2) +#define NI_M_CDIO_STATUS_CDO_FIFO_FULL BIT(1) +#define NI_M_CDIO_STATUS_CDO_FIFO_EMPTY BIT(0) #define NI_M_CDIO_CMD_REG 0x224 #define NI_M_CDI_MODE_REG 0x228 #define NI_M_CDO_MODE_REG 0x22c @@ -1051,19 +1065,6 @@ static const struct comedi_lrange range_ni_E_ao_ext; #define NI_M_AO_REF_ATTENUATION_REG(x) (0x264 + (x)) #define NI_M_AO_REF_ATTENUATION_X5 BIT(0) -enum CDIO_Status_Bits { - CDO_FIFO_Empty_Bit = 0x1, - CDO_FIFO_Full_Bit = 0x2, - CDO_FIFO_Request_Bit = 0x4, - CDO_Overrun_Bit = 0x8, - CDO_Underflow_Bit = 0x10, - CDI_FIFO_Empty_Bit = 0x10000, - CDI_FIFO_Full_Bit = 0x20000, - CDI_FIFO_Request_Bit = 0x40000, - CDI_Overrun_Bit = 0x80000, - CDI_Overflow_Bit = 0x100000 -}; - enum CDIO_Command_Bits { CDO_Disarm_Bit = 0x1, CDO_Arm_Bit = 0x2, |