Changeset a00d555 in mainline for uspace/drv/block/ahci/ahci.c

Timestamp:

2012-07-17T15:52:55Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

730dce77

Parents:

e435537

Message:

AHCI fixups

File:

• uspace/drv/block/ahci/ahci.c (modified) (3 diffs)

uspace/drv/block/ahci/ahci.c

@@ -527 +527 @@
         sata->shadow_pxis.u32 &= ~pxis.u32;
         
-        if ((sata->invalid_device) || (ahci_port_is_error(pxis))_ {
+        if ((sata->invalid_device) || (ahci_port_is_error(pxis))) {
                 ddf_msg(LVL_ERROR,
                     "%s: Unrecoverable error during FPDMA read", sata->model);
@@ -622 +622 @@
         {
                 /* Disable interrupt - interrupt is deasserted in qemu 1.0.1 */
-                .cmd = CMD_MEM_WRITE_32,
+                .cmd = CMD_PIO_WRITE_32,
                 .addr = NULL,
                 .value = AHCI_GHC_GHC_AE
         },
         {
+                .cmd = CMD_PIO_READ_32,
+                .addr = NULL,
+                .dstarg = 1
+        },
+        {
                 /* Clear interrupt status register - for vbox and real hw */
-                .cmd = CMD_MEM_REWRITE_32,
-                .addr = NULL
+                .cmd = CMD_PIO_WRITE_A_32,
+                .addr = NULL,
+                .srcarg = 1
         },
         {
@@ -896 +902 @@
         ahci_cmds[1].addr =
             ((uint32_t *) (size_t) hw_res_parsed.mem_ranges.ranges[0].address) + 2;
+        ahci_cmds[2].addr = ahci_cmds[1].addr;
         
         irq_code_t ct;