[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/16] ahci: modify ahci_mem_read_32 to work on r
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v2 11/16] ahci: modify ahci_mem_read_32 to work on register numbers |
Date: |
Thu, 31 May 2018 18:28:30 -0400 |
Signed-off-by: John Snow <address@hidden>
---
hw/ide/ahci.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index f2e8bce797..7edbb30f60 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -386,22 +386,27 @@ static uint64_t ahci_mem_read_32(void *opaque, hwaddr
addr)
uint32_t val = 0;
if (addr < AHCI_GENERIC_HOST_CONTROL_REGS_MAX_ADDR) {
- switch (addr) {
- case HOST_CAP:
+ enum AHCIHostReg regnum = addr / 4;
+ assert(regnum < AHCI_HOST_REG__COUNT);
+
+ switch (regnum) {
+ case AHCI_HOST_REG_CAP:
val = s->control_regs.cap;
break;
- case HOST_CTL:
+ case AHCI_HOST_REG_CTL:
val = s->control_regs.ghc;
break;
- case HOST_IRQ_STAT:
+ case AHCI_HOST_REG_IRQ_STAT:
val = s->control_regs.irqstatus;
break;
- case HOST_PORTS_IMPL:
+ case AHCI_HOST_REG_PORTS_IMPL:
val = s->control_regs.impl;
break;
- case HOST_VERSION:
+ case AHCI_HOST_REG_VERSION:
val = s->control_regs.version;
break;
+ default:
+ break;
}
} else if ((addr >= AHCI_PORT_REGS_START_ADDR) &&
(addr < (AHCI_PORT_REGS_START_ADDR +
--
2.14.3
- [Qemu-devel] [PATCH v2 10/16] ahci: fix host register max address, (continued)
- [Qemu-devel] [PATCH v2 10/16] ahci: fix host register max address, John Snow, 2018/05/31
- [Qemu-devel] [PATCH v2 05/16] ahci: combine identical clauses in port write, John Snow, 2018/05/31
- [Qemu-devel] [PATCH v2 08/16] ahci: delete old port register address definitions, John Snow, 2018/05/31
- [Qemu-devel] [PATCH v2 06/16] ahci: modify ahci_port_write to use register numbers, John Snow, 2018/05/31
- [Qemu-devel] [PATCH v2 07/16] ahci: make port write traces more descriptive, John Snow, 2018/05/31
- [Qemu-devel] [PATCH v2 01/16] ahci: add port register enumeration, John Snow, 2018/05/31
- [Qemu-devel] [PATCH v2 02/16] ahci: modify ahci_port_read to use register numbers, John Snow, 2018/05/31
- [Qemu-devel] [PATCH v2 13/16] ahci: fix spacing damage on ahci_mem_write, John Snow, 2018/05/31
- [Qemu-devel] [PATCH v2 12/16] ahci: make mem_read_32 traces more descriptive, John Snow, 2018/05/31
- [Qemu-devel] [PATCH v2 14/16] ahci: adjust ahci_mem_write to work on registers, John Snow, 2018/05/31
- [Qemu-devel] [PATCH v2 11/16] ahci: modify ahci_mem_read_32 to work on register numbers,
John Snow <=
- [Qemu-devel] [PATCH v2 09/16] ahci: add host register enumeration, John Snow, 2018/05/31
- [Qemu-devel] [PATCH v2 15/16] ahci: delete old host register address definitions, John Snow, 2018/05/31
- [Qemu-devel] [PATCH v2 16/16] ahci: make ahci_mem_write traces more descriptive, John Snow, 2018/05/31
- Re: [Qemu-devel] [PATCH v2 00/16] AHCI: tracing improvements, no-reply, 2018/05/31
- Re: [Qemu-devel] [PATCH v2 00/16] AHCI: tracing improvements, no-reply, 2018/05/31
- Re: [Qemu-devel] [PATCH v2 00/16] AHCI: tracing improvements, Philippe Mathieu-Daudé, 2018/05/31
- Re: [Qemu-devel] [PATCH v2 00/16] AHCI: tracing improvements, John Snow, 2018/05/31