The omap1.c file includes some functions which used to be used by the other OMAP SoC variants which we removed a while ago, but which we missed when doing that removal. They have no callers, so we can delete them.
This code was the last user of hw_error() in this file, so we can also remove the hw-error.h include. Signed-off-by: Peter Maydell <[email protected]> --- hw/arm/omap1.c | 26 -------------------------- include/hw/arm/omap.h | 3 --- 2 files changed, 29 deletions(-) diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index c9f9c3ef40..15087ba03e 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -25,7 +25,6 @@ #include "target/arm/cpu.h" #include "system/address-spaces.h" #include "exec/cpu-common.h" -#include "hw/core/hw-error.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/arm/boot.h" @@ -2095,31 +2094,6 @@ static struct omap_mpuio_s *omap_mpuio_init(MemoryRegion *memory, return s; } -qemu_irq *omap_mpuio_in_get(struct omap_mpuio_s *s) -{ - return s->in; -} - -void omap_mpuio_out_set(struct omap_mpuio_s *s, int line, qemu_irq handler) -{ - if (line >= 16 || line < 0) - hw_error("%s: No GPIO line %i\n", __func__, line); - s->handler[line] = handler; -} - -void omap_mpuio_key(struct omap_mpuio_s *s, int row, int col, int down) -{ - if (row >= 5 || row < 0) - hw_error("%s: No key %i-%i\n", __func__, col, row); - - if (down) - s->buttons[row] |= 1 << col; - else - s->buttons[row] &= ~(1 << col); - - omap_mpuio_kbd_update(s); -} - /* MicroWire Interface */ struct omap_uwire_s { MemoryRegion iomem; diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index 6ea47293a6..dc63323210 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -486,9 +486,6 @@ struct omap_uart_s *omap_uart_init(hwaddr base, void omap_uart_reset(struct omap_uart_s *s); struct omap_mpuio_s; -qemu_irq *omap_mpuio_in_get(struct omap_mpuio_s *s); -void omap_mpuio_out_set(struct omap_mpuio_s *s, int line, qemu_irq handler); -void omap_mpuio_key(struct omap_mpuio_s *s, int row, int col, int down); struct omap_uwire_s; -- 2.43.0
