diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2011-07-29 16:35:18 +0100 |
|---|---|---|
| committer | Andrzej Zaborowski <andrew.zaborowski@intel.com> | 2011-07-30 06:00:42 +0200 |
| commit | c4f05c8cf715fa613e1985421080e62a7b169284 (patch) | |
| tree | 089b2ebc9eaee0a427d207277054285f9d8df8e1 /hw/lm832x.c | |
| parent | 77831c204fda6303408aee1853c36768d853b413 (diff) | |
| download | qemu-c4f05c8cf715fa613e1985421080e62a7b169284.tar.gz qemu-c4f05c8cf715fa613e1985421080e62a7b169284.tar.bz2 qemu-c4f05c8cf715fa613e1985421080e62a7b169284.zip | |
lm832x: Take DeviceState pointer in lm832x_key_event()
Since lm832x has been qdev'ified, its users will generally
have a DeviceState pointer rather than an i2c_slave pointer,
so adjust lm832x_key_event's prototype to suit.
This allows the n810 (its only user) to actually pass a correct
pointer to it rather than NULL. The effect is that we no longer
segfault when a key is pressed.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
Diffstat (limited to 'hw/lm832x.c')
| -rw-r--r-- | hw/lm832x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/lm832x.c b/hw/lm832x.c index 590a4ccff9..992ce49729 100644 --- a/hw/lm832x.c +++ b/hw/lm832x.c @@ -474,9 +474,9 @@ static int lm8323_init(i2c_slave *i2c) return 0; } -void lm832x_key_event(struct i2c_slave *i2c, int key, int state) +void lm832x_key_event(DeviceState *dev, int key, int state) { - LM823KbdState *s = (LM823KbdState *) i2c; + LM823KbdState *s = FROM_I2C_SLAVE(LM823KbdState, I2C_SLAVE_FROM_QDEV(dev)); if ((s->status & INT_ERROR) && (s->error & ERR_FIFOOVR)) return; |