diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2021-06-17 13:53:21 +0200 |
|---|---|---|
| committer | Corey Minyard <cminyard@mvista.com> | 2021-07-08 14:15:01 -0500 |
| commit | 426f53de9c2110b6c2a05fdc1a89f2e0c1a0b97e (patch) | |
| tree | 5e19c3a849ed648316a41ff41e6dc1ca7097310c | |
| parent | 410bbee1b23faf25349355b13317078f5a73a441 (diff) | |
| download | qemu-426f53de9c2110b6c2a05fdc1a89f2e0c1a0b97e.zip qemu-426f53de9c2110b6c2a05fdc1a89f2e0c1a0b97e.tar.gz qemu-426f53de9c2110b6c2a05fdc1a89f2e0c1a0b97e.tar.bz2 | |
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>
| -rw-r--r-- | hw/arm/nseries.c | 2 | ||||
| -rw-r--r-- | hw/input/lm832x.c | 1 | ||||
| -rw-r--r-- | include/hw/input/lm832x.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index 92b6756..906c915 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -417,7 +417,7 @@ 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. */ 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); } diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c index d2b92b4..19a646d 100644 --- a/hw/input/lm832x.c +++ b/hw/input/lm832x.c @@ -28,7 +28,6 @@ #include "ui/console.h" #include "qom/object.h" -#define TYPE_LM8323 "lm8323" OBJECT_DECLARE_SIMPLE_TYPE(LM823KbdState, LM8323) struct LM823KbdState { diff --git a/include/hw/input/lm832x.h b/include/hw/input/lm832x.h index f47e579..2a58ccf 100644 --- a/include/hw/input/lm832x.h +++ b/include/hw/input/lm832x.h @@ -21,6 +21,8 @@ #ifndef HW_INPUT_LM832X #define HW_INPUT_LM832X +#define TYPE_LM8323 "lm8323" + void lm832x_key_event(DeviceState *dev, int key, int state); #endif |