[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/11] ast2400: replace aspeed_smc_is_implemented()
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 09/11] ast2400: replace aspeed_smc_is_implemented() |
Date: |
Thu, 14 Jul 2016 17:29:41 +0100 |
From: Cédric Le Goater <address@hidden>
aspeed_smc_is_implemented() filters invalid registers in a peculiar
way. Let's remove it and open code the if conditions. It serves the
same purpose, the aesthetic is better, and new registers can easily be
added.
Signed-off-by: Cédric Le Goater <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/ssi/aspeed_smc.c | 35 +++++++++++++++--------------------
1 file changed, 15 insertions(+), 20 deletions(-)
diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index a371e30..854474b 100644
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -281,12 +281,6 @@ static void aspeed_smc_reset(DeviceState *d)
aspeed_smc_update_cs(s);
}
-static bool aspeed_smc_is_implemented(AspeedSMCState *s, hwaddr addr)
-{
- return (addr == s->r_conf || addr == s->r_timings || addr == s->r_ce_ctrl
||
- (addr >= s->r_ctrl0 && addr < s->r_ctrl0 + s->num_cs));
-}
-
static uint64_t aspeed_smc_read(void *opaque, hwaddr addr, unsigned int size)
{
AspeedSMCState *s = ASPEED_SMC(opaque);
@@ -300,13 +294,16 @@ static uint64_t aspeed_smc_read(void *opaque, hwaddr
addr, unsigned int size)
return 0;
}
- if (!aspeed_smc_is_implemented(s, addr)) {
+ if (addr == s->r_conf ||
+ addr == s->r_timings ||
+ addr == s->r_ce_ctrl ||
+ (addr >= s->r_ctrl0 && addr < s->r_ctrl0 + s->num_cs)) {
+ return s->regs[addr];
+ } else {
qemu_log_mask(LOG_UNIMP, "%s: not implemented: 0x%" HWADDR_PRIx "\n",
- __func__, addr);
+ __func__, addr);
return 0;
}
-
- return s->regs[addr];
}
static void aspeed_smc_write(void *opaque, hwaddr addr, uint64_t data,
@@ -324,20 +321,18 @@ static void aspeed_smc_write(void *opaque, hwaddr addr,
uint64_t data,
return;
}
- if (!aspeed_smc_is_implemented(s, addr)) {
+ if (addr == s->r_conf ||
+ addr == s->r_timings ||
+ addr == s->r_ce_ctrl) {
+ s->regs[addr] = value;
+ } else if (addr >= s->r_ctrl0 && addr < s->r_ctrl0 + s->num_cs) {
+ s->regs[addr] = value;
+ aspeed_smc_update_cs(s);
+ } else {
qemu_log_mask(LOG_UNIMP, "%s: not implemented: 0x%" HWADDR_PRIx "\n",
__func__, addr);
return;
}
-
- /*
- * Not much to do apart from storing the value and set the cs
- * lines if the register is a controlling one.
- */
- s->regs[addr] = value;
- if (addr >= s->r_ctrl0 && addr < s->r_ctrl0 + s->num_cs) {
- aspeed_smc_update_cs(s);
- }
}
static const MemoryRegionOps aspeed_smc_ops = {
--
1.9.1
- [Qemu-devel] [PULL 00/11] target-arm queue, Peter Maydell, 2016/07/14
- [Qemu-devel] [PULL 10/11] ast2400: pretend DMAs are done for U-boot, Peter Maydell, 2016/07/14
- [Qemu-devel] [PULL 11/11] ast2400: externalize revision numbers, Peter Maydell, 2016/07/14
- [Qemu-devel] [PULL 09/11] ast2400: replace aspeed_smc_is_implemented(),
Peter Maydell <=
- [Qemu-devel] [PULL 08/11] hw/misc: fix typo in Aspeed SCU hw-strap2 property name, Peter Maydell, 2016/07/14
- [Qemu-devel] [PULL 04/11] gic: provide defines for v2/v3 targetlist sizes, Peter Maydell, 2016/07/14
- [Qemu-devel] [PULL 07/11] m25p80: Fix QIOR/DIOR handling for Winbond, Peter Maydell, 2016/07/14
- [Qemu-devel] [PULL 05/11] hw/arm/virt: tcg: adjust MPIDR like KVM, Peter Maydell, 2016/07/14
- [Qemu-devel] [PULL 06/11] target-arm: Add missed AArch32 TLBI sytem registers, Peter Maydell, 2016/07/14
- [Qemu-devel] [PULL 03/11] target-arm: Use Neon for zero checking, Peter Maydell, 2016/07/14
- [Qemu-devel] [PULL 02/11] Revert "hw/ptimer: Perform counter wrap around if timer already expired", Peter Maydell, 2016/07/14
- [Qemu-devel] [PULL 01/11] virtio-mmio: format transport base address in BusClass.get_dev_path, Peter Maydell, 2016/07/14
- Re: [Qemu-devel] [PULL 00/11] target-arm queue, Peter Maydell, 2016/07/14