Changeset 74 for hacks/xtide/atalib.c

Timestamp:

Dec 21, 2015, 1:40:51 AM (10 years ago)

Author:

bird

Message:

xtide util hacking, included bios patch.

File:

• hacks/xtide/atalib.c (modified) (11 diffs)

hacks/xtide/atalib.c

@@ -43 +43 @@
 uint16_t g_uBasePort;
 uint16_t g_uCtrlPort;
-uint16_t g_uPortShift;
+uint8_t  g_cPortShift;
 uint8_t  g_bDevice;
 uint8_t  g_fUseLbaMode = 1;
@@ -201 +201 @@
     cb >>= 1;
 
-    if (f8BitData)
+    if (f8BitData == 1)
     {
         while (cb-- > 0)
@@ -223 +223 @@
 
     cb >>= 1;
-    if (f8BitData)
+    if (f8BitData == 1)
     {
         while (cb-- > 0)
@@ -363 +363 @@
     outp(ATA_REG_CYLINDER_HIGH(g_uBasePort),    0);
 
-    bSts = AtaSubmitCommandAndWaitForData(ATA_CMD_WRITE_SECTORS);
+    bSts = AtaSubmitCommandAndWaitForData(ATA_CMD_WRITE_BUFFER);
     if (bSts & ATA_STS_ERR)
         return AtaError(bSts, "writing buffer (#1)");
@@ -466 +466 @@
     /* Set the reset flat. */
     outp(ATA_REG_CONTROL(g_uBasePort), ATA_CTL_SRST);
+/** @todo This still needs work - it doesn't work when ERR is set. */
 
     /* Wait for the busy flag response. */
-    ATA_DELAY_400NS();
-    ATA_DELAY_400NS();
+    for (bSts = 0; bSts < 20; bSts++)
+        ATA_DELAY_400NS();
     while (!(bSts = inp(ATA_REG_STATUS(g_uBasePort))) & ATA_STS_BUSY)
         ATA_DELAY_400NS();
@@ -521 +522 @@
 }
 
-int AtaInit(uint16_t uBasePort, uint16_t uCtrlPort, uint8_t uPortShift, uint8_t bDevice, uint8_t f8BitData)
+int AtaInit(uint16_t uBasePort, uint16_t uCtrlPort, uint8_t cPortShift, uint8_t bDevice, uint8_t f8BitData)
 {
     int rc;
@@ -528 +529 @@
     g_uBasePort  = uBasePort;
     g_uCtrlPort  = uCtrlPort;
-    g_uPortShift = uPortShift;
+    g_cPortShift = cPortShift;
     g_bDevice    = bDevice;
     g_f8BitData  = f8BitData;
@@ -539 +540 @@
     inp(ATA_REG_STATUS(g_uBasePort));
     bSts    = inp(ATA_REG_STATUS(g_uBasePort));
-    bStsAlt = inp(ATA_REG_ALT_STATUS(g_uBasePort));
+    bStsAlt = inp(ATA_REG_ALT_STATUS(g_uCtrlPort));
     if (bSts != bStsAlt || bSts == 0xff)
     {
         fprintf(stderr, "Status register differs or is 0xff\n");
-        fprintf(stderr, "     status=");
-        AtaPrintStatus(stdout, bSts);
+        fprintf(stderr, " port %#05x    status=", ATA_REG_STATUS(g_uBasePort));
+        AtaPrintStatus(stderr, bSts);
         fprintf(stderr, "\n");
-        fprintf(stderr, " alt status=");
-        AtaPrintStatus(stdout, bStsAlt);
+        fprintf(stderr, " port %#05x alt status=", ATA_REG_ALT_STATUS(g_uCtrlPort));
+        AtaPrintStatus(stderr, bStsAlt);
         fprintf(stderr, "\n");
         return -1;
@@ -619 +620 @@
 
         /* Figure 5-9 in SanDisk Manual Rev 12.0: */
-        if (   (g_awIdentify[83] & UINT16_C(0xc00)) == UINT16_C(0x4000)
-            && (g_awIdentify[84] & UINT16_C(0xc00)) == UINT16_C(0x4000))
+printf("debug: word82=%#x word83=%#x word84=%#x\n", g_awIdentify[82], g_awIdentify[83], g_awIdentify[84]);
+        if (   g_awIdentify[82] != 0 && g_awIdentify[82] != UINT16_C(0xffff)
+            && g_awIdentify[83] != 0 && g_awIdentify[83] != UINT16_C(0xffff)
+            && g_awIdentify[84] != 0 && g_awIdentify[84] != UINT16_C(0xffff)
+            && (g_awIdentify[83] & UINT16_C(0xc000)) == UINT16_C(0x4000)
+            && (g_awIdentify[84] & UINT16_C(0xc000)) == UINT16_C(0x4000) )
         {
             g_fSupportsWriteBuffer = (g_awIdentify[82] & UINT16_C(0x1000)) != 0;
@@ -628 +633 @@
                g_fSupportsWriteBuffer == 1 ? "have" : g_fSupportsWriteBuffer == 0 ? "no" : "uncertain",
                g_fSupportsReadBuffer  == 1 ? "have" : g_fSupportsReadBuffer  == 0 ? "no" : "uncertain");
+        break;
     }
 
@@ -729 +735 @@
                  || strcmp(pszArg, "-8") == 0)
             f8BitData = 1;
+        else if (   strcmp(pszArg, "--8-bit-data-plus") == 0
+                 || strcmp(pszArg, "-8+") == 0)
+            f8BitData = 3;
         else if (   strcmp(pszArg, "--16-bit-data") == 0
                  || strcmp(pszArg, "-16") == 0)
             f8BitData = 0;
+        else if (strcmp(pszArg, "--ide") == 0)
+        {
+            /* Normal IDE, primary. */
+            uBasePort  = 0x1f0;
+            uCtrlPort  = 0x3f0;
+            cShiftPort = 0;
+            f8BitData  = 0;
+        }
+        else if (strcmp(pszArg, "--xt-cf") == 0)
+        {
+            /* Lo-tech CF-lite. */
+            uBasePort  = 0x300;
+            uCtrlPort  = 0x310;
+            cShiftPort = 1;
+            f8BitData  = 1;
+        }
     }