Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fef79edc authored by Peter Meerwald-Stadler's avatar Peter Meerwald-Stadler Committed by Jonathan Cameron
Browse files

iio: health: max30102: Prepare for copying varying number of measurements 



Current code assumes always 2 measurements (6 bytes) have to be copied,
prepare for more flexibility

Signed-off-by: default avatarPeter Meerwald-Stadler <pmeerw@pmeerw.net>
Acked-by: default avatarMatt Ranostay <matt.ranostay@konsulko.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 83e6415d

drivers/iio/health/max30102.c

+10 −5
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ enum max3012_led_idx { 
#define MAX30102_REG_FIFO_OVR_CTR		0x05

#define MAX30102_REG_FIFO_RD_PTR		0x06

#define MAX30102_REG_FIFO_DATA			0x07

#define MAX30102_REG_FIFO_DATA_ENTRY_LEN	6

#define MAX30102_REG_FIFO_DATA_BYTES		3



#define MAX30102_REG_FIFO_CONFIG		0x08

#define MAX30102_REG_FIFO_CONFIG_AVG_4SAMPLES	BIT(1)
@@ -198,6 +198,11 @@ static inline int max30102_fifo_count(struct max30102_data *data) 
	return 0;

}



#define MAX30102_COPY_DATA(i) \

	memcpy(&data->processed_buffer[(i)], \

	       &buffer[(i) * MAX30102_REG_FIFO_DATA_BYTES], \

	       MAX30102_REG_FIFO_DATA_BYTES)



static int max30102_read_measurement(struct max30102_data *data)

{

	int ret;
@@ -205,13 +210,13 @@ static int max30102_read_measurement(struct max30102_data *data) 


	ret = i2c_smbus_read_i2c_block_data(data->client,

					    MAX30102_REG_FIFO_DATA,

					    MAX30102_REG_FIFO_DATA_ENTRY_LEN,

					    2 * MAX30102_REG_FIFO_DATA_BYTES,

					    buffer);



	memcpy(&data->processed_buffer[0], &buffer[0], 3);

	memcpy(&data->processed_buffer[1], &buffer[3], 3);

	MAX30102_COPY_DATA(0);

	MAX30102_COPY_DATA(1);



	return (ret == MAX30102_REG_FIFO_DATA_ENTRY_LEN) ? 0 : -EINVAL;

	return (ret == 2 * MAX30102_REG_FIFO_DATA_BYTES) ? 0 : -EINVAL;

}



static irqreturn_t max30102_interrupt_handler(int irq, void *private)