On Tue, Sep 01, 2015 at 04:50:39PM -0400, John Snow wrote: > The initial register device-to-host FIS no longer needs to specially > set certain fields, as these can be handled generically by setting those > fields explicitly with the signatures we want at port reset time. > > (1) Signatures are decomposed into their four component registers and > set upon (AHCI) port reset. > (2) the signature cache register is no longer set manually per-each > device type, but instead just once during ahci_init_d2h. > > Signed-off-by: John Snow <js...@redhat.com> > --- > hw/ide/ahci.c | 32 ++++++++++++++++++++------------ > 1 file changed, 20 insertions(+), 12 deletions(-) > > diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c > index d04a161..3c50ccb 100644 > --- a/hw/ide/ahci.c > +++ b/hw/ide/ahci.c > @@ -542,20 +542,31 @@ static void ahci_init_d2h(AHCIDevice *ad) > { > uint8_t init_fis[20]; > IDEState *ide_state = &ad->port.ifs[0]; > + AHCIPortRegs *pr = &ad->port_regs; > > memset(init_fis, 0, sizeof(init_fis)); > > - init_fis[4] = 1; > - init_fis[12] = 1; > - > - if (ide_state->drive_kind == IDE_CD) { > - init_fis[5] = ide_state->lcyl; > - init_fis[6] = ide_state->hcyl; > - } > + /* We're emulating receiving the first Reg H2D Fis from the device; > + * Update the SIG register, but otherwise procede as normal. */
s/procede/proceed/