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

Timestamp:

Dec 14, 2010, 9:35:35 PM (15 years ago)

Author:

markus

Message:

fixed ata_cmd to FIS mapping (LBA-28); removed sector mapping test code

File:

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

trunk/src/os2ahci/ata.c

@@ -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);
         return(-1);
       }
-      dprintf("LBA28: 0x%08lx\n", ata_cmd.lba_l);
+      /* add upper 4 bits to device field */
+      ata_cmd.device |= (ata_cmd.lba_l >> 24) & 0x0fU;
+      /* only lower 24 bits come into _debug lba_l */
+      ata_cmd.lba_l &= 0x00ffffffUL;
       break;
 
@@ -133 +137 @@
 
     case AP_DEVICE:
-      /* ATA device byte */
-      ata_cmd.device = va_arg(va, u16) >> 8;
+      /* ATA device byte; note that this byte contains the highest
+       * 4 bits of LBA-28 address; we have to leave them alone here. */
+      ata_cmd.device |= (va_arg(va, u16) & 0xf000U) >> 8;
       break;
 
@@ -313 +318 @@
   fis[12] = (u8) ata_cmd->count;
   fis[13] = (u8) (ata_cmd->count >> 8);
-
-  phex(fis, 14, "FIS:\n");
 }