Changeset 37 for trunk/src/os2ahci/ahci.c

Timestamp:

Nov 5, 2010, 4:01:49 PM (15 years ago)

Author:

markus

Message:

changed serial port setup (still not working ok), prolonged timeout during port reset

File:

• trunk/src/os2ahci/ahci.c (modified) (3 diffs)

trunk/src/os2ahci/ahci.c

@@ -576 +576 @@
   u8 _far *port_mmio = port_base(ai, p);
   u32 tmp;
-  int timeout = 500;
+  int timeout = 5000;
 
   dprintf("resetting port %d.%d\n", ad_no(ai), p);
@@ -1046 +1046 @@
   ddprintf("sending IDLE=%d command to port %d\n", idle, p);
   return ahci_exec_polled_cmd(ai, p, 0, 500, ATA_CMD_IDLE, AP_COUNT,
-                              idle ? 1 : 0, AP_END);
+                              idle ? 1 : 0, AP_END);
 }
 
@@ -1091 +1091 @@
   if ((tmp = readl(port_mmio + PORT_SCR_ERR)) != 0) {
     dprintf("SERR = 0x%08lx\n", tmp);
-    return(-1);
+    timeout = 0;
   }
   if (((tmp = readl(port_mmio + PORT_TFDATA)) & 0x89) != 0) {
     dprintf("TFDATA = 0x%08lx\n", tmp);
+    timeout = 0;
+  }
+
+  if (timeout <= 0) {
+    ahci_reset_port(ai, p, 0);
     return(-1);
   }
-
-  return((timeout <= 0) ? -1 : 0);
+  return(0);
 }