On Wed, Jun 16, 2021 at 06:14:09PM +0200, Philippe Mathieu-Daudé wrote:
> Instead of using the confuse i2c_send_recv(), rewrite to directly
> call i2c_recv() & i2c_send(), resulting in code easire to review.
^easier
>
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> hw/display/sm501.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/hw/display/sm501.c b/hw/display/sm501.c
> index f276276f7f1..569661a0746 100644
> --- a/hw/display/sm501.c
> +++ b/hw/display/sm501.c
> @@ -1033,17 +1033,18 @@ static void sm501_i2c_write(void *opaque, hwaddr
> addr, uint64_t value,
> case SM501_I2C_CONTROL:
> if (value & SM501_I2C_CONTROL_ENABLE) {
> if (value & SM501_I2C_CONTROL_START) {
> + bool is_recv = s->i2c_addr & 1;
> int res = i2c_start_transfer(s->i2c_bus,
> s->i2c_addr >> 1,
> - s->i2c_addr & 1);
> + is_recv);
> if (res) {
> s->i2c_status |= SM501_I2C_STATUS_ERROR;
> } else {
> int i;
> for (i = 0; i <= s->i2c_byte_count; i++) {
> - res = i2c_send_recv(s->i2c_bus, &s->i2c_data[i],
> - !(s->i2c_addr & 1));
> - if (res) {
> + if (is_recv) {
> + s->i2c_data[i] = i2c_recv(s->i2c_bus);
> + } else if (i2c_send(s->i2c_bus, s->i2c_data[i]) < 0)
> {
> s->i2c_status |= SM501_I2C_STATUS_ERROR;
> return;
> }
> --
> 2.31.1
>
