Changeset 75 in kStuff for hacks/xtide/atalib.c

Timestamp:

Dec 27, 2015 7:47:37 PM (9 years ago)

Author:

bird

Message:

xtide-utils: added ataid for dumping the identify device response. (untested)

File:

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

hacks/xtide/atalib.c

@@ -522 +522 @@
 }
 
-int AtaInit(uint16_t uBasePort, uint16_t uCtrlPort, uint8_t cPortShift, uint8_t bDevice, uint8_t f8BitData)
+int AtaInit(uint16_t uBasePort, uint16_t uCtrlPort, uint8_t cPortShift, uint8_t bDevice, uint8_t f8BitData, uint8_t fReset)
 {
     int rc;
@@ -559 +559 @@
     {
         /* Reset the controller + devices. */
-        if (AtaReset() != 0)
-            return -1;
+        if (fReset)
+            if (AtaReset() != 0)
+                return -1;
+        fReset = 1;
 
         /* Enable 8-bit data transfers (just to be on the safe side). */
@@ -620 +622 @@
 
         /* Figure 5-9 in SanDisk Manual Rev 12.0: */
-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)
@@ -675 +676 @@
 {
     uint8_t  bDevice    = ATA_DEV_MASTER;
+    uint8_t  fReset     = 0;
 #if 0
     uint16_t uBasePort  = 0x1f0;    /* Primary ATA host controller. */
@@ -741 +743 @@
                  || strcmp(pszArg, "-16") == 0)
             f8BitData = 0;
+        else if (strcmp(pszArg, "--reset") == 0)
+            fReset = 1;
+        else if (strcmp(pszArg, "--no-reset") == 0)
+            fReset = 0;
         else if (strcmp(pszArg, "--ide") == 0)
         {
@@ -759 +765 @@
     }
 
-    return AtaInit(uBasePort, uCtrlPort, cShiftPort, bDevice, f8BitData);
-}
-
+    return AtaInit(uBasePort, uCtrlPort, cShiftPort, bDevice, f8BitData, fReset);
+}
+