[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/30] ahci: modify ahci_mem_read_32 to work on regis
From: |
John Snow |
Subject: |
[Qemu-devel] [PULL 14/30] ahci: modify ahci_mem_read_32 to work on register numbers |
Date: |
Fri, 8 Jun 2018 13:47:17 -0400 |
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
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 5be43ba2d0..99cbfe6447 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] [PULL 00/30] Ide patches, John Snow, 2018/06/08
- [Qemu-devel] [PULL 02/30] ahci: fix PxCI register race, John Snow, 2018/06/08
- [Qemu-devel] [PULL 03/30] ahci: don't schedule unnecessary BH, John Snow, 2018/06/08
- [Qemu-devel] [PULL 01/30] ahci: trim signatures on raise/lower, John Snow, 2018/06/08
- [Qemu-devel] [PULL 15/30] ahci: make mem_read_32 traces more descriptive, John Snow, 2018/06/08
- [Qemu-devel] [PULL 18/30] ahci: delete old host register address definitions, John Snow, 2018/06/08
- [Qemu-devel] [PULL 05/30] ahci: modify ahci_port_read to use register numbers, John Snow, 2018/06/08
- [Qemu-devel] [PULL 08/30] ahci: combine identical clauses in port write, John Snow, 2018/06/08
- [Qemu-devel] [PULL 14/30] ahci: modify ahci_mem_read_32 to work on register numbers,
John Snow <=
- [Qemu-devel] [PULL 13/30] ahci: fix host register max address, John Snow, 2018/06/08
- [Qemu-devel] [PULL 11/30] ahci: delete old port register address definitions, John Snow, 2018/06/08
- [Qemu-devel] [PULL 12/30] ahci: add host register enumeration, John Snow, 2018/06/08
- [Qemu-devel] [PULL 06/30] ahci: make port read traces more descriptive, John Snow, 2018/06/08
- [Qemu-devel] [PULL 09/30] ahci: modify ahci_port_write to use register numbers, John Snow, 2018/06/08
- [Qemu-devel] [PULL 17/30] ahci: adjust ahci_mem_write to work on registers, John Snow, 2018/06/08
- [Qemu-devel] [PULL 16/30] ahci: fix spacing damage on ahci_mem_write, John Snow, 2018/06/08
- [Qemu-devel] [PULL 26/30] ide: push end_transfer_func out of start_transfer callback, rename callback, John Snow, 2018/06/08
- [Qemu-devel] [PULL 27/30] ide: call ide_cmd_done from ide_transfer_stop, John Snow, 2018/06/08
- [Qemu-devel] [PULL 04/30] ahci: add port register enumeration, John Snow, 2018/06/08