david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ahci: modify ahci_port_read to use register numbers

Browse Source 
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180531222835.16558-3-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
John Snow 2018-06-08 13:17:36 -04:00
parent 4e6e1de4e0
commit 536551d758
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hw/ide/ahci.c
View File

@ -93,41 +93,42 @@ static const char *AHCIPortIRQ_lookup[AHCI_PORT_IRQ__COUNT] = {
[AHCI_PORT_IRQ_BIT_CPDS] = "CPDS" [AHCI_PORT_IRQ_BIT_CPDS] = "CPDS"
}; };
static uint32_t ahci_port_read(AHCIState *s, int port, int offset) static uint32_t ahci_port_read(AHCIState *s, int port, int offset)
{ {
uint32_t val; uint32_t val;
AHCIPortRegs *pr; AHCIPortRegs *pr = &s->dev[port].port_regs;
pr = &s->dev[port].port_regs; enum AHCIPortReg regnum = offset / sizeof(uint32_t);
assert(regnum < (AHCI_PORT_ADDR_OFFSET_LEN / sizeof(uint32_t)));
switch (offset) { switch (regnum) {
case PORT_LST_ADDR: case AHCI_PORT_REG_LST_ADDR:
val = pr->lst_addr; val = pr->lst_addr;
break; break;
case PORT_LST_ADDR_HI: case AHCI_PORT_REG_LST_ADDR_HI:
val = pr->lst_addr_hi; val = pr->lst_addr_hi;
break; break;
case PORT_FIS_ADDR: case AHCI_PORT_REG_FIS_ADDR:
val = pr->fis_addr; val = pr->fis_addr;
break; break;
case PORT_FIS_ADDR_HI: case AHCI_PORT_REG_FIS_ADDR_HI:
val = pr->fis_addr_hi; val = pr->fis_addr_hi;
break; break;
case PORT_IRQ_STAT: case AHCI_PORT_REG_IRQ_STAT:
val = pr->irq_stat; val = pr->irq_stat;
break; break;
case PORT_IRQ_MASK: case AHCI_PORT_REG_IRQ_MASK:
val = pr->irq_mask; val = pr->irq_mask;
break; break;
case PORT_CMD: case AHCI_PORT_REG_CMD:
val = pr->cmd; val = pr->cmd;
break; break;
case PORT_TFDATA: case AHCI_PORT_REG_TFDATA:
val = pr->tfdata; val = pr->tfdata;
break; break;
case PORT_SIG: case AHCI_PORT_REG_SIG:
val = pr->sig; val = pr->sig;
break; break;
case PORT_SCR_STAT: case AHCI_PORT_REG_SCR_STAT:
if (s->dev[port].port.ifs[0].blk) { if (s->dev[port].port.ifs[0].blk) {
val = SATA_SCR_SSTATUS_DET_DEV_PRESENT_PHY_UP | val = SATA_SCR_SSTATUS_DET_DEV_PRESENT_PHY_UP |
SATA_SCR_SSTATUS_SPD_GEN1 | SATA_SCR_SSTATUS_IPM_ACTIVE; SATA_SCR_SSTATUS_SPD_GEN1 | SATA_SCR_SSTATUS_IPM_ACTIVE;
@ -135,19 +136,18 @@ static uint32_t ahci_port_read(AHCIState *s, int port, int offset)
val = SATA_SCR_SSTATUS_DET_NODEV; val = SATA_SCR_SSTATUS_DET_NODEV;
} }
break; break;
case PORT_SCR_CTL: case AHCI_PORT_REG_SCR_CTL:
val = pr->scr_ctl; val = pr->scr_ctl;
break; break;
case PORT_SCR_ERR: case AHCI_PORT_REG_SCR_ERR:
val = pr->scr_err; val = pr->scr_err;
break; break;
case PORT_SCR_ACT: case AHCI_PORT_REG_SCR_ACT:
val = pr->scr_act; val = pr->scr_act;
break; break;
case PORT_CMD_ISSUE: case AHCI_PORT_REG_CMD_ISSUE:
val = pr->cmd_issue; val = pr->cmd_issue;
break; break;
case PORT_RESERVED:
default: default:
val = 0; val = 0;
} }