OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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>
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/i2c.h
View File

@ -72,6 +72,6 @@ void wm8750_set_bclk_in(void *opaque, int new_hz);
void tmp105_set(i2c_slave *i2c, int temp);
/* lm832x.c */
void lm832x_key_event(i2c_slave *i2c, int key, int state);
void lm832x_key_event(DeviceState *dev, int key, int state);
#endif

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;

7
hw/nseries.c
View File

@ -45,7 +45,7 @@ struct n800_s {
i2c_bus *i2c;
int keymap[0x80];
i2c_slave *kbd;
DeviceState *kbd;
TUSBState *usb;
void *retu;
@ -362,7 +362,6 @@ static int n810_keys[0x80] = {
static void n810_kbd_setup(struct n800_s *s)
{
qemu_irq kbd_irq = qdev_get_gpio_in(s->cpu->gpio, N810_KEYBOARD_GPIO);
DeviceState *dev;
int i;
for (i = 0; i < 0x80; i ++)
@ -375,8 +374,8 @@ static void n810_kbd_setup(struct n800_s *s)
/* Attach the LM8322 keyboard to the I2C bus,
* should happen in n8x0_i2c_setup and s->kbd be initialised here. */
dev = i2c_create_slave(s->i2c, "lm8323", N810_LM8323_ADDR);
qdev_connect_gpio_out(dev, 0, kbd_irq);
s->kbd = i2c_create_slave(s->i2c, "lm8323", N810_LM8323_ADDR);
qdev_connect_gpio_out(s->kbd, 0, kbd_irq);
}
/* LCD MIPI DBI-C controller (URAL) */