diff options
author | Corey Minyard <cminyard@mvista.com> | 2017-01-09 11:40:20 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-01-09 11:40:20 +0000 |
commit | d307c28ca9dba7a0677035c9244198b05164c873 (patch) | |
tree | ee942307fac668f7a2d531bf6b86e6db025cdfd0 /hw/arm/z2.c | |
parent | ffe22bf51065dd33022cf91f77a821d1f11c250d (diff) | |
download | qemu-d307c28ca9dba7a0677035c9244198b05164c873.zip qemu-d307c28ca9dba7a0677035c9244198b05164c873.tar.gz qemu-d307c28ca9dba7a0677035c9244198b05164c873.tar.bz2 |
i2c: Allow I2C devices to NAK start events
Add a return value to the event handler. Some I2C devices will
NAK if they have no data, so allow them to do this. This required
the following changes:
Go through all the event handlers and change them to return int
and return 0.
Modify i2c_start_transfer to terminate the transaction on a NAK.
Modify smbus handing to not assert if a NAK occurs on a second
operation, and terminate the transaction and return -1 instead.
Add some information on semantics to I2CSlaveClass.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/z2.c')
-rw-r--r-- | hw/arm/z2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/arm/z2.c b/hw/arm/z2.c index b3a6bbd..1607cbd 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -220,7 +220,7 @@ static int aer915_send(I2CSlave *i2c, uint8_t data) return 0; } -static void aer915_event(I2CSlave *i2c, enum i2c_event event) +static int aer915_event(I2CSlave *i2c, enum i2c_event event) { AER915State *s = AER915(i2c); @@ -238,6 +238,8 @@ static void aer915_event(I2CSlave *i2c, enum i2c_event event) default: break; } + + return 0; } static int aer915_recv(I2CSlave *slave) |