Changeset 39

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

Location:

trunk

Files:

• src/os2ahci/ata.c (modified) (4 diffs)
• src/os2ahci/ata.h (modified) (2 diffs)
• src/os2ahci/atapi.c (modified) (1 diff)
• src/os2ahci/os2ahci.def (modified) (1 diff)
• src/os2ahci/pci.c (modified) (1 diff)
• tools/blddate.cmd (modified) (2 diffs)
• tools/bldlvl.cmd (modified) (1 diff)

trunk/src/os2ahci/ata.c

@@ -2 +2 @@
  * ata.c - ATA command processing
  *
- * Copyright (c) 2010 Christian Mueller. Parts copied from/inspired by the
- * Linux AHCI driver; those parts are (c) Linux AHCI/ATA maintainers
+ * Copyright (c) 2010 Christian Mueller, Markus Thielen.
+ * Parts copied from/inspired by the Linux AHCI driver; 
+ * those parts are (c) Linux AHCI/ATA maintainers
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -462 +463 @@
 
   /* extract total number of sectors */
-  if (id_buf[ATA_ID_CFS_ENABLE_2] & 0x40) {
+  if (id_buf[ATA_ID_CFS_ENABLE_2] & 0x400) {
     /* 48-bit LBA supported */
     if (ATA_CAPACITY48_H(id_buf) != 0) {
@@ -483 +484 @@
       CUR_CAPACITY(id_buf) == CUR_HEADS(id_buf) *
                               CUR_CYLS(id_buf) *
-                              CUR_SECTORS(id_buf)) {
+                                                                                                                        CUR_SECTORS(id_buf)) {
     /* use BIOS-supplied values for geometry */
     geometry->NumHeads        = CUR_HEADS(id_buf);
@@ -496 +497 @@
     geometry->TotalCylinders  = ATA_CYLS(id_buf);
 
-  } else {
-    /* construct values based on typical [SCSI] BIOS algorithms */
+  } 
+  
+  /* MT: if neither ATA nor BIOS supply valid data, or if their
+   *     CHS values result in a sector count lower than determined,
+   *     we use a typical [SCSI] BIOS algorithm 
+   */
+  if ((u32) geometry->NumHeads * (u32) geometry->SectorsPerTrack *
+          (u32) geometry->TotalCylinders < geometry->TotalSectors) {
     geometry->NumHeads        = 255;
     geometry->SectorsPerTrack = 63;

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))
 

trunk/src/os2ahci/atapi.c

@@ -2 +2 @@
  * atapi.c - ATAPI command processing
  *
- * Copyright (c) 2010 Christian Mueller. Parts copied from/inspired by the
- * Linux AHCI driver; those parts are (c) Linux AHCI/ATA maintainers
+ * Copyright (c) 2010 Christian Mueller, Markus Thielen. 
+ * Parts copied from/inspired by the Linux AHCI driver; 
+ * those parts are (c) Linux AHCI/ATA maintainers
  *
  *  This program is free software; you can redistribute it and/or modify

trunk/src/os2ahci/os2ahci.def

@@ -1 +1 @@
 library os2ahci
-Description '$@#thi.guten (www.thiguten.de):1.00.20101105#@OS/2 AHCI Adapter Device Driver'
+Description '$@#thi.guten (www.thiguten.de):1.00.20101108#@OS/2 AHCI Adapter Device Driver'
 protmode
 

trunk/src/os2ahci/pci.c

@@ -2 +2 @@
  * PCI.c - PCI constants and detection code for os2ahci driver
  *
- * Copyright (c) 2010 Christian Mueller. Parts copied from/inspired by the
- * LINUX ahci driver; those parts are (c) Linux AHCI/ATA maintainers
+ * Copyright (c) 2010 Christian Mueller, Markus Thielen.
+ * Parts copied from/inspired by the LINUX ahci driver; 
+ * those parts are (c) Linux AHCI/ATA maintainers
  *
  *  This program is free software; you can redistribute it and/or modify

trunk/tools/blddate.cmd

@@ -1 +1 @@
 /*
- * blddate.cmd - REXX script to spit out a header file containing 
+ * blddate.cmd - REXX script to spit out a header file containing
  * #defines for the current day, month and year
  *
@@ -11 +11 @@
 
 say '/* auto generated by blddate.cmd */'
-say '#define BLD_YEAR  ' SUBSTR(d, 1, 4)
-say '#define BLD_MONTH ' SUBSTR(d, 5, 2)
-say '#define BLD_DAY   ' SUBSTR(d, 7, 2)
+say '#define BLD_YEAR  ' FORMAT(SUBSTR(d, 1, 4))
+say '#define BLD_MONTH ' FORMAT(SUBSTR(d, 5, 2))
+say '#define BLD_DAY   ' FORMAT(SUBSTR(d, 7, 2))
 
 

trunk/tools/bldlvl.cmd

@@ -266 +266 @@
     Say "    CTRL+BRK currently disabled"
     Return 0
+