motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 17:23:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

lm832x: Take DeviceState pointer in lm832x_key_event()

Browse source 
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>
This commit is contained in:
Peter Maydell 2011-07-29 16:35:18 +01:00 • committed by Andrzej Zaborowski
parent 77831c204f
commit c4f05c8cf7
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hw/lm832x.c
View file

@ -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;