Changeset 121 for trunk/src/os2ahci/os2ahci.h

Timestamp:

Aug 31, 2011, 11:23:46 PM (14 years ago)

Author:

cjm

Message:

OS2AHCI Version 1.19
====================

• Added retry counters to all commands (IORBs) in order to prevent infinite retry loops. This was necessary because Virtualbox 4.x doesn't seem to set the "current command index" in specific ATAPI error situations, causing the failing command to be retried indefinitely instead of asking for a sense buffer

• Minor changes to debug logging

File:

• trunk/src/os2ahci/os2ahci.h (modified) (2 diffs)

trunk/src/os2ahci/os2ahci.h

@@ -82 +82 @@
 /* default command timeout (can be overwritten in the IORB) */
 #define DEFAULT_TIMEOUT  30000
+
+/* Maximum number of retries for commands in the restart/reset context hooks.
+ *
+ * Please note that the corresponding variable in the ADD workspace is a bit
+ * field, thus increasing this value means increasing the size of the bit
+ * field. At the time of writing this comment the 'retries' variable was 2
+ * bits wide (i.e. a maximum number of 3 retries) and there was exactly one
+ * bit left before the ADD workspace structure would become too large...
+ */
+#define MAX_RETRIES          3
 
 /* max/min macros */
@@ -354 +364 @@
   unsigned      complete      : 1;     /* IORB has completed processing */
   unsigned      unaligned     : 1;     /* unaligned S/G; need to use transfer buffer */
+  unsigned      retries       : 2;     /* number of retries for this command */
   unsigned      cmd_slot      : 5;     /* AHCI command slot for this IORB */
 } ADD_WORKSPACE;