Commit 982e3d11 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: s626: remove forward declarations 3 



Move the I2C functions up to remove the need for the forward
declarations.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6b387b70

drivers/staging/comedi/drivers/s626.c

+61 −63
Original line number Diff line number Diff line
@@ -216,8 +216,6 @@ static int s626_ns_to_timer(int *nanosec, int round_mode); 
/* internal routines */

static void WriteTrimDAC(struct comedi_device *dev, uint8_t LogicalChan,

			 uint8_t DacData);

static uint8_t I2Cread(struct comedi_device *dev, uint8_t addr);

static uint32_t I2Chandshake(struct comedi_device *dev, uint32_t val);

static void SetDAC(struct comedi_device *dev, uint16_t chan, short dacdata);

static void SendDAC(struct comedi_device *dev, uint32_t val);
@@ -493,6 +491,67 @@ static void DEBIreplace(struct comedi_device *dev, uint16_t addr, uint16_t mask, 
	DEBItransfer(dev);	/*  Execute the DEBI Write transfer. */

}



/* **************  EEPROM ACCESS FUNCTIONS  ************** */



static uint32_t I2Chandshake(struct comedi_device *dev, uint32_t val)

{

	/*  Write I2C command to I2C Transfer Control shadow register. */

	WR7146(P_I2CCTRL, val);



	/*  Upload I2C shadow registers into working registers and wait for */

	/*  upload confirmation. */



	MC_ENABLE(P_MC2, MC2_UPLD_IIC);

	while (!MC_TEST(P_MC2, MC2_UPLD_IIC))

		;



	/*  Wait until I2C bus transfer is finished or an error occurs. */

	while ((RR7146(P_I2CCTRL) & (I2C_BUSY | I2C_ERR)) == I2C_BUSY)

		;



	/*  Return non-zero if I2C error occurred. */

	return RR7146(P_I2CCTRL) & I2C_ERR;



}



/*  Read uint8_t from EEPROM. */

static uint8_t I2Cread(struct comedi_device *dev, uint8_t addr)

{

	uint8_t rtnval;



	/*  Send EEPROM target address. */

	if (I2Chandshake(dev, I2C_B2(I2C_ATTRSTART, I2CW)

			 /* Byte2 = I2C command: write to I2C EEPROM  device. */

			 | I2C_B1(I2C_ATTRSTOP, addr)

			 /* Byte1 = EEPROM internal target address. */

			 | I2C_B0(I2C_ATTRNOP, 0))) {	/*  Byte0 = Not sent. */

		/*  Abort function and declare error if handshake failed. */

		DEBUG("I2Cread: error handshake I2Cread  a\n");

		return 0;

	}

	/*  Execute EEPROM read. */

	if (I2Chandshake(dev, I2C_B2(I2C_ATTRSTART, I2CR)



			 /*  Byte2 = I2C */

			 /*  command: read */

			 /*  from I2C EEPROM */

			 /*  device. */

			 |I2C_B1(I2C_ATTRSTOP, 0)



			 /*  Byte1 receives */

			 /*  uint8_t from */

			 /*  EEPROM. */

			 |I2C_B0(I2C_ATTRNOP, 0))) {	/*  Byte0 = Not  sent. */



		/*  Abort function and declare error if handshake failed. */

		DEBUG("I2Cread: error handshake I2Cread b\n");

		return 0;

	}

	/*  Return copy of EEPROM value. */

	rtnval = (uint8_t) (RR7146(P_I2CCTRL) >> 16);

	return rtnval;

}



static unsigned int s626_ai_reg_to_uint(int data)

{

	unsigned int tempdata;
@@ -1938,67 +1997,6 @@ static void WriteTrimDAC(struct comedi_device *dev, uint8_t LogicalChan, 
		| (uint32_t) DacData);	/*  Include DAC setpoint data. */

}



/* **************  EEPROM ACCESS FUNCTIONS  ************** */

/*  Read uint8_t from EEPROM. */



static uint8_t I2Cread(struct comedi_device *dev, uint8_t addr)

{

	uint8_t rtnval;



	/*  Send EEPROM target address. */

	if (I2Chandshake(dev, I2C_B2(I2C_ATTRSTART, I2CW)

			 /* Byte2 = I2C command: write to I2C EEPROM  device. */

			 | I2C_B1(I2C_ATTRSTOP, addr)

			 /* Byte1 = EEPROM internal target address. */

			 | I2C_B0(I2C_ATTRNOP, 0))) {	/*  Byte0 = Not sent. */

		/*  Abort function and declare error if handshake failed. */

		DEBUG("I2Cread: error handshake I2Cread  a\n");

		return 0;

	}

	/*  Execute EEPROM read. */

	if (I2Chandshake(dev, I2C_B2(I2C_ATTRSTART, I2CR)



			 /*  Byte2 = I2C */

			 /*  command: read */

			 /*  from I2C EEPROM */

			 /*  device. */

			 |I2C_B1(I2C_ATTRSTOP, 0)



			 /*  Byte1 receives */

			 /*  uint8_t from */

			 /*  EEPROM. */

			 |I2C_B0(I2C_ATTRNOP, 0))) {	/*  Byte0 = Not  sent. */



		/*  Abort function and declare error if handshake failed. */

		DEBUG("I2Cread: error handshake I2Cread b\n");

		return 0;

	}

	/*  Return copy of EEPROM value. */

	rtnval = (uint8_t) (RR7146(P_I2CCTRL) >> 16);

	return rtnval;

}



static uint32_t I2Chandshake(struct comedi_device *dev, uint32_t val)

{

	/*  Write I2C command to I2C Transfer Control shadow register. */

	WR7146(P_I2CCTRL, val);



	/*  Upload I2C shadow registers into working registers and wait for */

	/*  upload confirmation. */



	MC_ENABLE(P_MC2, MC2_UPLD_IIC);

	while (!MC_TEST(P_MC2, MC2_UPLD_IIC))

		;



	/*  Wait until I2C bus transfer is finished or an error occurs. */

	while ((RR7146(P_I2CCTRL) & (I2C_BUSY | I2C_ERR)) == I2C_BUSY)

		;



	/*  Return non-zero if I2C error occurred. */

	return RR7146(P_I2CCTRL) & I2C_ERR;



}



/*  Private helper function: Write setpoint to an application DAC channel. */



static void SetDAC(struct comedi_device *dev, uint16_t chan, short dacdata)