Changeset 39 for trunk/src/os2ahci/ata.h

Timestamp:

Nov 8, 2010, 9:40:19 PM (15 years ago)

Author:

markus

Message:

fixed bug reading CHS from identify package result; fixed ATA geometry mapping

File:

• trunk/src/os2ahci/ata.h (modified) (2 diffs)

trunk/src/os2ahci/ata.h

@@ -25 +25 @@
  * Macros to access geometry values in the ATA ID buffer
  */
-#define ATA_CYLS(id_buf)            *((u32 *) (id_buf + ATA_ID_CYLS))
-#define ATA_HEADS(id_buf)           *((u32 *) (id_buf + ATA_ID_HEADS))
-#define ATA_SECTORS(id_buf)         *((u32 *) (id_buf + ATA_ID_SECTORS))
+#define ATA_CYLS(id_buf)            *((u16 *) (id_buf + ATA_ID_CYLS))
+#define ATA_HEADS(id_buf)           *((u16 *) (id_buf + ATA_ID_HEADS))
+#define ATA_SECTORS(id_buf)         *((u16 *) (id_buf + ATA_ID_SECTORS))
 #define ATA_CAPACITY(id_buf)        *((u32 *) (id_buf + ATA_ID_LBA_CAPACITY))
 
@@ -33 +33 @@
 #define ATA_CAPACITY48_H(id_buf)    *((u32 *) (id_buf + ATA_ID_LBA_CAPACITY_2 + 2))
 
-#define CUR_CYLS(id_buf)            *((u32 *) (id_buf + ATA_ID_CUR_CYLS))
-#define CUR_HEADS(id_buf)           *((u32 *) (id_buf + ATA_ID_CUR_HEADS))
-#define CUR_SECTORS(id_buf)         *((u32 *) (id_buf + ATA_ID_CUR_SECTORS))
+#define CUR_CYLS(id_buf)            *((u16 *) (id_buf + ATA_ID_CUR_CYLS))
+#define CUR_HEADS(id_buf)           *((u16 *) (id_buf + ATA_ID_CUR_HEADS))
+#define CUR_SECTORS(id_buf)         *((u16 *) (id_buf + ATA_ID_CUR_SECTORS))
 #define CUR_CAPACITY(id_buf)        *((u32 *) (id_buf + ATA_ID_CUR_CAPACITY))