Changeset 147

Timestamp:

Feb 21, 2013, 10:37:43 AM (12 years ago)

Author:

rousseau

Message:

Changed the default value of the /r option (TRACK ticket #21)

Reason for the change

o Snip from the TRAC ticket

<snip>

One thing that keeps coming up in some cases is that on systems with an
Intel disc controller you need the /R option specified.
In some cases the system is able to boot with from the CD but it does
not recognize the hard disc.
Using the /R option fixes.

</snip>

o Logic suggests...

Since /r was already turned on when an Intel AHCI controller was detected
to be in SATA mode, this report seems to imply that for some obscure reason
a port reset is needed even when the BIOS programmed the controller in
AHCI mode. This would suggest some faulty BIOS initialization.

Changed behavior

o The /r option is now on by default

It can be turned off by specifying /!r on the driver command-line.
However, when the [Intel] AHCI controller was found to be initialized
by the BIOS in SATA mode, ports will always be reset, even when /!r
is specified. This seems to be an [Intel] AHCI controller requirement.

Comment reference

o From a comment in ahci.c around line 146

<snip>

Adapter is not in AHCI mode and the spec says a COMRESET is
required when switching from SATA to AHCI mode and vice versa.

</snip>

Location:

trunk/src/os2ahci

Files:

• README (modified) (6 diffs)
• os2ahci.c (modified) (2 diffs)

trunk/src/os2ahci/README

@@ -54 +54 @@
 
  - IBM OS/2 DDK version 9.23 or later (see ddk\base\h\version.mak)
- - Microsoft C600 
+ - Microsoft C600
  - ALP Assembler (part of DDK)
  - link.exe (part of DDK)
@@ -63 +63 @@
 
 
-Watcom Build
-------------
-
-The source tree contains several files that were created during an
-attempt to use the Watcom compiler (e.g. wmakefile); however, the
-Watcom build is broken and produces a non-working driver.
+Open Watcom Build
+-----------------
+
+The Open Watcom Build is fixed and now produces a working driver.
+
+The toolchain required for compilation with Open Watcom consists of:
+
+ - IBM OS/2 DDK version 9.23 or later (see ddk\base\h\version.mak)
+   (Used for include files and qgrep)
+ - Open Watcom C/C++ package
+   (available from: http://www.openwatcom.org/index.php/Downloads)
+ - WCC 16-bits C Compiler (part of the Open Watcom package)
+ - WASM Assembler (part of the Open Watcom package)
+ - WLINK Linker (part of the Open Watcom package)
+ - QGREP (part of DDK)
+
+Please note that the Open Watcom Build is not as extensively tested as the
+normal DDK Build so don't use it on production systems yet.
+
+Use the _wbuild.cmd script or run wmake -ms -f wmakefile to build it.
+When switching between building with the DDK and Open Watcom,
+be sure to do a clean first.
+
 
 
@@ -95 +112 @@
                        at http://svn.ecomstation.nl/ahci/wiki/AhciTrace
                        for more info.
-/d                     Debug output on COM port/trace buffer; multiple "/d" 
+/d                     Debug output on COM port/trace buffer; multiple "/d"
                        options will increase verbosity:
                          1 = requests
@@ -107 +124 @@
 /f                     Force the use of the HW write cache when using NCQ
                        commands; see "Native Command Queuing" below for
-                       further explanation
-/r                     Reset ports during initialization (default = off
-                       unless the [Intel] AHCI controller was found to be
-                       initialized by the BIOS in SATA mode)
+                       further explanation (default = off)
+/r                     Reset ports during initialization (default = on)
+                       Can be turned off with /!r, however, when the
+                       [Intel] AHCI controller was found to be
+                       initialized by the BIOS in SATA mode, ports will
+                       always be reset even when /!r was specified
 /a                     Set adapter for adapter-specific options
                        (default = -1, all adapters)
@@ -156 +175 @@
 
 This has the following effect:
-  
+
   - Enable NCQ for all hard disks
   - Disable NCQ for hard disk on adapter #0, port #5
@@ -330 +349 @@
    to ignore type 2 controllers (i.e. controllers supporting both SATA and
    AHCI) using the command line options "/A:x /I".
- 
+
  - The IOCTL interface for SMART is based on the idea of IDE controllers
    with a master and a slave drive. OS2AHCI maps all devices (ATA or ATAPI)

trunk/src/os2ahci/os2ahci.c

@@ -87 +87 @@
 int             debug = 0;         /* if > 0, print debug messages to COM1 */
 int             thorough_scan = 1; /* if != 0, perform thorough PCI scan */
-int             init_reset;        /* if != 0, reset ports during init */
+int             init_reset = 1;    /* if != 0, reset ports during init */
 int             force_write_cache; /* if != 0, force write cache */
 int             verbosity = 1;     /* == 1 -> show sign on banner
@@ -265 +265 @@
       case 'r':
         /* reset ports during initialization */
-        init_reset = 1;
+        init_reset = !invert_option;
         break;