Changeset 69 for trunk/src/os2ahci/ata.c

Timestamp:

Jan 7, 2011, 4:54:46 PM (15 years ago)

Author:

markus

Message:

fixed ATAPI packet commands; added cache flush in shutdown handler; allow write cache for NCQ commands

File:

• trunk/src/os2ahci/ata.c (modified) (4 diffs)

trunk/src/os2ahci/ata.c

@@ -107 +107 @@
     case AP_FEATURES:
       /* ATA features word */
-      ata_cmd.features = va_arg(va, u16);
+      ata_cmd.features |= va_arg(va, u16);
       break;
 
@@ -118 +118 @@
       /* 28-bit sector address */
       ata_cmd.lba_l = va_arg(va, u32);
-      dprintf("LBA28: 0x%08lx\n", ata_cmd.lba_l);
       if (ata_cmd.lba_l & 0xf0000000UL) {
         dprintf("error: LBA-28 address %ld has more than 28 bits\n", ata_cmd.lba_l);
@@ -133 +132 @@
       ata_cmd.lba_l = va_arg(va, u32);
       ata_cmd.lba_h = va_arg(va, u16);
-      dprintf("LBA48: 0x%08lx\n", ata_cmd.lba_l);
       break;
 
@@ -703 +701 @@
                      AP_COUNT,     (u16) (slot << 3), /* tag = slot */
                      AP_SGLIST,    io->pSGList + sg_indx, (u16) sg_cnt,
-                     AP_DEVICE,    0xc000,   /* force unit access (FUA) */
+                     AP_DEVICE,    0x4000,
+                     AP_DEVICE,    (io->Flags & XIO_DISABLE_HW_WRITE_CACHE) ?
+                                   0x8000 : 0, /* force unit access */
                      AP_WRITE,     1,
                      AP_END);