From: H Hartley Sweeten Date: Fri, 1 May 2015 21:58:55 +0000 (-0700) Subject: staging: comedi: ni_stc.h: tidy up Interrupt_B_Ack_Register and bits X-Git-Tag: v4.2-rc1~88^2~731 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4a6de8327d125158827ad72d6d07d674c98e0387;p=karo-tx-linux.git staging: comedi: ni_stc.h: tidy up Interrupt_B_Ack_Register and bits Rename the CamelCase. Use the BIT() macro to define the bits. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index f0be47ef5347..db6c6e4cddf4 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -315,7 +315,7 @@ struct mio_regmap { static const struct mio_regmap m_series_stc_write_regmap[] = { [NISTC_INTA_ACK_REG] = { 0x104, 2 }, - [Interrupt_B_Ack_Register] = { 0x106, 2 }, + [NISTC_INTB_ACK_REG] = { 0x106, 2 }, [AI_Command_2_Register] = { 0x108, 2 }, [AO_Command_2_Register] = { 0x10a, 2 }, [G_Command_Register(0)] = { 0x10c, 2 }, @@ -1434,21 +1434,21 @@ static void ack_b_interrupt(struct comedi_device *dev, unsigned short b_status) unsigned short ack = 0; if (b_status & AO_BC_TC_St) - ack |= AO_BC_TC_Interrupt_Ack; + ack |= NISTC_INTB_ACK_AO_BC_TC; if (b_status & AO_Overrun_St) - ack |= AO_Error_Interrupt_Ack; + ack |= NISTC_INTB_ACK_AO_ERR; if (b_status & AO_START_St) - ack |= AO_START_Interrupt_Ack; + ack |= NISTC_INTB_ACK_AO_START; if (b_status & AO_START1_St) - ack |= AO_START1_Interrupt_Ack; + ack |= NISTC_INTB_ACK_AO_START1; if (b_status & AO_UC_TC_St) - ack |= AO_UC_TC_Interrupt_Ack; + ack |= NISTC_INTB_ACK_AO_UC_TC; if (b_status & AO_UI2_TC_St) - ack |= AO_UI2_TC_Interrupt_Ack; + ack |= NISTC_INTB_ACK_AO_UI2_TC; if (b_status & AO_UPDATE_St) - ack |= AO_UPDATE_Interrupt_Ack; + ack |= NISTC_INTB_ACK_AO_UPDATE; if (ack) - ni_stc_writew(dev, ack, Interrupt_B_Ack_Register); + ni_stc_writew(dev, ack, NISTC_INTB_ACK_REG); } static void handle_b_interrupt(struct comedi_device *dev, @@ -2900,7 +2900,7 @@ static int ni_ao_inttrig(struct comedi_device *dev, * stc manual says we are need to clear error interrupt after * AO_TMRDACWRs_In_Progress_St clears */ - ni_stc_writew(dev, AO_Error_Interrupt_Ack, Interrupt_B_Ack_Register); + ni_stc_writew(dev, NISTC_INTB_ACK_AO_ERR, NISTC_INTB_ACK_REG); ni_set_bits(dev, Interrupt_B_Enable_Register, interrupt_b_bits, 1); @@ -3104,8 +3104,8 @@ static int ni_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ni_stc_writew(dev, AO_Configuration_End, Joint_Reset_Register); if (cmd->stop_src == TRIG_COUNT) { - ni_stc_writew(dev, AO_BC_TC_Interrupt_Ack, - Interrupt_B_Ack_Register); + ni_stc_writew(dev, NISTC_INTB_ACK_AO_BC_TC, + NISTC_INTB_ACK_REG); ni_set_bits(dev, Interrupt_B_Enable_Register, AO_BC_TC_Interrupt_Enable, 1); } @@ -3208,7 +3208,7 @@ static int ni_ao_reset(struct comedi_device *dev, struct comedi_subdevice *s) ni_stc_writew(dev, AO_Disarm, AO_Command_1_Register); ni_set_bits(dev, Interrupt_B_Enable_Register, ~0, 0); ni_stc_writew(dev, AO_BC_Source_Select, AO_Personal_Register); - ni_stc_writew(dev, 0x3f98, Interrupt_B_Ack_Register); + ni_stc_writew(dev, NISTC_INTB_ACK_AO_ALL, NISTC_INTB_ACK_REG); ni_stc_writew(dev, AO_BC_Source_Select | AO_UPDATE_Pulse_Width | AO_TMRDACWR_Pulse_Width, AO_Personal_Register); ni_stc_writew(dev, 0, AO_Output_Control_Register); @@ -3749,7 +3749,7 @@ static const struct mio_regmap ni_gpct_to_stc_regmap[] = { [NITIO_G0_ABZ] = { 0x1c0, 2 }, /* M-Series only */ [NITIO_G1_ABZ] = { 0x1c2, 2 }, /* M-Series only */ [NITIO_G0_INT_ACK] = { NISTC_INTA_ACK_REG, 2 }, - [NITIO_G1_INT_ACK] = { Interrupt_B_Ack_Register, 2 }, + [NITIO_G1_INT_ACK] = { NISTC_INTB_ACK_REG, 2 }, [NITIO_G0_STATUS] = { AI_Status_1_Register, 2 }, [NITIO_G1_STATUS] = { AO_Status_1_Register, 2 }, [NITIO_G0_INT_ENA] = { Interrupt_A_Enable_Register, 2 }, diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index 098d8183f417..07df8a5e40ea 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -69,6 +69,32 @@ NISTC_INTA_ACK_AI_SC_TC | \ NISTC_INTA_ACK_AI_SC_TC_ERR) +#define NISTC_INTB_ACK_REG 3 +#define NISTC_INTB_ACK_G1_GATE BIT(15) +#define NISTC_INTB_ACK_G1_TC BIT(14) +#define NISTC_INTB_ACK_AO_ERR BIT(13) +#define NISTC_INTB_ACK_AO_STOP BIT(12) +#define NISTC_INTB_ACK_AO_START BIT(11) +#define NISTC_INTB_ACK_AO_UPDATE BIT(10) +#define NISTC_INTB_ACK_AO_START1 BIT(9) +#define NISTC_INTB_ACK_AO_BC_TC BIT(8) +#define NISTC_INTB_ACK_AO_UC_TC BIT(7) +#define NISTC_INTB_ACK_AO_UI2_TC BIT(6) +#define NISTC_INTB_ACK_AO_UI2_TC_ERR BIT(5) +#define NISTC_INTB_ACK_AO_BC_TC_ERR BIT(4) +#define NISTC_INTB_ACK_AO_BC_TC_TRIG_ERR BIT(3) +#define NISTC_INTB_ACK_G1_TC_ERR BIT(2) +#define NISTC_INTB_ACK_G1_GATE_ERR BIT(1) +#define NISTC_INTB_ACK_AO_ALL (NISTC_INTB_ACK_AO_ERR | \ + NISTC_INTB_ACK_AO_STOP | \ + NISTC_INTB_ACK_AO_START | \ + NISTC_INTB_ACK_AO_UPDATE | \ + NISTC_INTB_ACK_AO_START1 | \ + NISTC_INTB_ACK_AO_BC_TC | \ + NISTC_INTB_ACK_AO_UC_TC | \ + NISTC_INTB_ACK_AO_BC_TC_ERR | \ + NISTC_INTB_ACK_AO_BC_TC_TRIG_ERR) + #define AI_Status_1_Register 2 #define Interrupt_A_St 0x8000 #define AI_FIFO_Full_St 0x4000 @@ -89,25 +115,6 @@ #define AI_Status_2_Register 5 -#define Interrupt_B_Ack_Register 3 -enum Interrupt_B_Ack_Bits { - G1_Gate_Error_Confirm = _bit1, - G1_TC_Error_Confirm = _bit2, - AO_BC_TC_Trigger_Error_Confirm = _bit3, - AO_BC_TC_Error_Confirm = _bit4, - AO_UI2_TC_Error_Confrim = _bit5, - AO_UI2_TC_Interrupt_Ack = _bit6, - AO_UC_TC_Interrupt_Ack = _bit7, - AO_BC_TC_Interrupt_Ack = _bit8, - AO_START1_Interrupt_Ack = _bit9, - AO_UPDATE_Interrupt_Ack = _bit10, - AO_START_Interrupt_Ack = _bit11, - AO_STOP_Interrupt_Ack = _bit12, - AO_Error_Interrupt_Ack = _bit13, - G1_TC_Interrupt_Ack = _bit14, - G1_Gate_Interrupt_Ack = _bit15 -}; - #define AO_Status_1_Register 3 #define Interrupt_B_St _bit15 #define AO_FIFO_Full_St _bit14