Now there are no callsites for the omap_badwidth_* family of functions we can remove their implementations.
Signed-off-by: Peter Maydell <[email protected]> --- include/hw/arm/omap.h | 10 -------- hw/arm/omap1.c | 59 ------------------------------------------- 2 files changed, 69 deletions(-) diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index bdb2e887e47..66a435a3d72 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -673,16 +673,6 @@ struct omap_mpu_state_s { struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *sdram, const char *core); -uint32_t omap_badwidth_read8(void *opaque, hwaddr addr); -void omap_badwidth_write8(void *opaque, hwaddr addr, - uint32_t value); -uint32_t omap_badwidth_read16(void *opaque, hwaddr addr); -void omap_badwidth_write16(void *opaque, hwaddr addr, - uint32_t value); -uint32_t omap_badwidth_read32(void *opaque, hwaddr addr); -void omap_badwidth_write32(void *opaque, hwaddr addr, - uint32_t value); - void omap_mpu_wakeup(void *opaque, int irq, int req); #define OMAP_BAD_REG(paddr) \ diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index cfa4e1f677c..8fa4195a5fa 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -44,65 +44,6 @@ #include "target/arm/cpu-qom.h" #include "trace.h" -static inline void omap_log_badwidth(const char *funcname, hwaddr addr, int sz) -{ - qemu_log_mask(LOG_GUEST_ERROR, "%s: %d-bit register %#08" HWADDR_PRIx "\n", - funcname, 8 * sz, addr); -} - -/* Should signal the TCMI/GPMC */ -uint32_t omap_badwidth_read8(void *opaque, hwaddr addr) -{ - uint8_t ret; - - omap_log_badwidth(__func__, addr, 1); - cpu_physical_memory_read(addr, &ret, 1); - return ret; -} - -void omap_badwidth_write8(void *opaque, hwaddr addr, - uint32_t value) -{ - uint8_t val8 = value; - - omap_log_badwidth(__func__, addr, 1); - cpu_physical_memory_write(addr, &val8, 1); -} - -uint32_t omap_badwidth_read16(void *opaque, hwaddr addr) -{ - uint16_t ret; - - omap_log_badwidth(__func__, addr, 2); - cpu_physical_memory_read(addr, &ret, 2); - return ret; -} - -void omap_badwidth_write16(void *opaque, hwaddr addr, - uint32_t value) -{ - uint16_t val16 = value; - - omap_log_badwidth(__func__, addr, 2); - cpu_physical_memory_write(addr, &val16, 2); -} - -uint32_t omap_badwidth_read32(void *opaque, hwaddr addr) -{ - uint32_t ret; - - omap_log_badwidth(__func__, addr, 4); - cpu_physical_memory_read(addr, &ret, 4); - return ret; -} - -void omap_badwidth_write32(void *opaque, hwaddr addr, - uint32_t value) -{ - omap_log_badwidth(__func__, addr, 4); - cpu_physical_memory_write(addr, &value, 4); -} - /* MPU OS timers */ struct omap_mpu_timer_s { MemoryRegion iomem; -- 2.43.0
