Changeset 55 for trunk/src/os2ahci

Timestamp:

Dec 14, 2010, 12:03:32 PM (15 years ago)

Author:

markus

Message:

fixed readtest to run under OS/2 Ring3 above 2GB; commented out ADD read sector dump code

Location:

trunk/src/os2ahci

Files:

• ahci.c (modified) (2 diffs)
• ata.c (modified) (3 diffs)
• os2ahci.def (modified) (1 diff)

trunk/src/os2ahci/ahci.c

@@ -32 +32 @@
                               ? atapi_##func : ata_##func
 
+
+/* #define LBATEST
+ * uncomment to perform sector mapping test of first drive */
+
 #define LBATEST_SECTORS_PER_READ     64
 #define LBATEST_SECTOR_SIZE         512
 
-#define LBATEST
 
 /* ------------------------ typedefs and structures ------------------------ */
@@ -1654 +1657 @@
   DevHelp_FreePhys(phys_addr);
 
+  LBA test compiled?
+
 }
 #endif

trunk/src/os2ahci/ata.c

@@ -618 +618 @@
 {
   IORB_EXECUTEIO _far *io = (IORB_EXECUTEIO _far *) iorb;
+/*    unsigned char _far *p; */
+/*    u16 mode_sw; */
 
   io->BlocksXferred += add_workspace(iorb)->blocks;
@@ -628 +630 @@
     /* requeue this IORB for next iteration */
     iorb_requeue(iorb);
-  }
+/*      printf("MT: IORB requeued\n"); */
+  }
+
+  /* MT: print hex dump of first sector read */
+/*    if (io->cSGList) { */
+/*      if (DevHelp_PhysToVirt(io->pSGList->ppXferBuf,  */
+/*                             (USHORT) io->pSGList->XferBufLen,  */
+/*                             (PVOID) &p, &mode_sw)) { */
+/*        printf("MT: failed to convert S/G pointer to virt address\n"); */
+/*      } else { */
+/*        phex(p, (int) io->pSGList->XferBufLen, "sector dump, RBA=0x%08lx\n", */
+/*             io->RBA); */
+/*      } */
+/*    } */
+  
 }
 
@@ -778 +794 @@
 
   rc = ata_cmd(ai, p, d, slot, 0,
-               AP_SGLIST,   apt->pSGList, apt->ppSGLIST,
+               AP_SGLIST,   apt->pSGList, apt->cSGList,
                AP_ATA_CMD,  apt->pControllerCmd,
                AP_WRITE,    !(apt->Flags & PT_DIRECTION_IN),

trunk/src/os2ahci/os2ahci.def

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