Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset a00d555 in mainline


Ignore:
Timestamp:
2012-07-17T15:52:55Z (10 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial
Children:
730dce77
Parents:
e435537
Message:

AHCI fixups

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/block/ahci/ahci.c

    re435537 ra00d555  
    527527        sata->shadow_pxis.u32 &= ~pxis.u32;
    528528       
    529         if ((sata->invalid_device) || (ahci_port_is_error(pxis))_ {
     529        if ((sata->invalid_device) || (ahci_port_is_error(pxis))) {
    530530                ddf_msg(LVL_ERROR,
    531531                    "%s: Unrecoverable error during FPDMA read", sata->model);
     
    622622        {
    623623                /* Disable interrupt - interrupt is deasserted in qemu 1.0.1 */
    624                 .cmd = CMD_MEM_WRITE_32,
     624                .cmd = CMD_PIO_WRITE_32,
    625625                .addr = NULL,
    626626                .value = AHCI_GHC_GHC_AE
    627627        },
    628628        {
     629                .cmd = CMD_PIO_READ_32,
     630                .addr = NULL,
     631                .dstarg = 1
     632        },
     633        {
    629634                /* Clear interrupt status register - for vbox and real hw */
    630                 .cmd = CMD_MEM_REWRITE_32,
    631                 .addr = NULL
     635                .cmd = CMD_PIO_WRITE_A_32,
     636                .addr = NULL,
     637                .srcarg = 1
    632638        },
    633639        {
     
    896902        ahci_cmds[1].addr =
    897903            ((uint32_t *) (size_t) hw_res_parsed.mem_ranges.ranges[0].address) + 2;
     904        ahci_cmds[2].addr = ahci_cmds[1].addr;
    898905       
    899906        irq_code_t ct;
Note: See TracChangeset for help on using the changeset viewer.