mirror of https://github.com/xemu-project/xemu.git
hw/input/lm832x: Define TYPE_LM8323 in public header
Define TYPE_LM8323 in the public "hw/input/lm832x.h" header and use it in hw/arm/nseries.c. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Acked-by: Corey Minyard <cminyard@mvista.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Corey Minyard <cminyard@mvista.com>
This commit is contained in:
parent
410bbee1b2
commit
426f53de9c
|
@ -417,7 +417,7 @@ static void n810_kbd_setup(struct n800_s *s)
|
||||||
/* Attach the LM8322 keyboard to the I2C bus,
|
/* Attach the LM8322 keyboard to the I2C bus,
|
||||||
* should happen in n8x0_i2c_setup and s->kbd be initialised here. */
|
* should happen in n8x0_i2c_setup and s->kbd be initialised here. */
|
||||||
s->kbd = DEVICE(i2c_slave_create_simple(omap_i2c_bus(s->mpu->i2c[0]),
|
s->kbd = DEVICE(i2c_slave_create_simple(omap_i2c_bus(s->mpu->i2c[0]),
|
||||||
"lm8323", N810_LM8323_ADDR));
|
TYPE_LM8323, N810_LM8323_ADDR));
|
||||||
qdev_connect_gpio_out(s->kbd, 0, kbd_irq);
|
qdev_connect_gpio_out(s->kbd, 0, kbd_irq);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
#include "ui/console.h"
|
#include "ui/console.h"
|
||||||
#include "qom/object.h"
|
#include "qom/object.h"
|
||||||
|
|
||||||
#define TYPE_LM8323 "lm8323"
|
|
||||||
OBJECT_DECLARE_SIMPLE_TYPE(LM823KbdState, LM8323)
|
OBJECT_DECLARE_SIMPLE_TYPE(LM823KbdState, LM8323)
|
||||||
|
|
||||||
struct LM823KbdState {
|
struct LM823KbdState {
|
||||||
|
|
|
@ -21,6 +21,8 @@
|
||||||
#ifndef HW_INPUT_LM832X
|
#ifndef HW_INPUT_LM832X
|
||||||
#define HW_INPUT_LM832X
|
#define HW_INPUT_LM832X
|
||||||
|
|
||||||
|
#define TYPE_LM8323 "lm8323"
|
||||||
|
|
||||||
void lm832x_key_event(DeviceState *dev, int key, int state);
|
void lm832x_key_event(DeviceState *dev, int key, int state);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue