Changeset 101

Timestamp:

Jun 3, 2011, 10:26:26 PM (14 years ago)

Author:

Markus Thielen

Message:

use 32bit calculation during validation of BIOS provided CHS data; treat overflow flag in port interrupt status as error

Location:

trunk/src/os2ahci

Files:

• ahci.h (modified) (1 diff)
• ata.c (modified) (1 diff)

trunk/src/os2ahci/ahci.h ¶

@@ -176 +176 @@
                                  PORT_IRQ_UNK_FIS  | PORT_IRQ_BAD_PMP)
 #define PORT_IRQ_ERROR          (PORT_IRQ_FREEZE   | PORT_IRQ_TF_ERR   | \
-                                 PORT_IRQ_HBUS_DATA_ERR)
+                                 PORT_IRQ_OVERFLOW | PORT_IRQ_HBUS_DATA_ERR)
 #define DEF_PORT_IRQ            (PORT_IRQ_ERROR | PORT_IRQ_SG_DONE     | \
                                  PORT_IRQ_SDB_FIS | PORT_IRQ_DMAS_FIS  | \

trunk/src/os2ahci/ata.c ¶

@@ -503 +503 @@
   } else if (CUR_HEADS(id_buf) > 0 && CUR_CYLS(id_buf) > 0 &&
              CUR_SECTORS(id_buf) > 0 &&
-             CUR_CAPACITY(id_buf) == CUR_HEADS(id_buf) *
-                                     CUR_CYLS(id_buf) *
-                                     CUR_SECTORS(id_buf)) {
+             CUR_CAPACITY(id_buf) == (u32) CUR_HEADS(id_buf) *
+                                     (u32) CUR_CYLS(id_buf) *
+                                     (u32) CUR_SECTORS(id_buf)) {
     /* BIOS-supplied (aka "current") geometry values look valid */
     geometry->NumHeads        = CUR_HEADS(id_buf);