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

Timestamp:

Jan 3, 2013, 1:22:56 PM (13 years ago)

Author:

rousseau

Message:

Fixed the Open Watcom build

Building with Open Watcom produced a non working driver.

Causes & Fixes

o Enum types were 8 bits when using WCC

This caused the functions with variable arguments to fail.
Adding the -ei compiler-flag to WCC solved this issue.

o Incorrect inline assembler syntax to call DeviceHelp in os2ahci.c

DeviceHelp is a 16:16 far pointer residing in memory.
MASM interprets 'call DeviceHelp' differently than WASM.
The correct syntax is: 'call dword ptr [DeviceHelp]'.

o Missing segments from TGROUP in init.asm

WLINK then generates the AUTO class, most probably causing incorrect
relocation fixups.

Enhancements

o WASM (or JWASM) can now be used instead of ALP
o WCC can now be used instead of CL
o The Open Watcom linker (WLINK) can now be used instead of LINK
o Streamlined both makefiles a notch so it's easy to use both tool-chains

To investigate

o CL barks about a missing prototype for DevHelp_Yield() in lib.c

The prototype is actually defined in dhcalls.h but CL still barks.

o Using WCC with ALP and WLINK produces an oversized image

Probaly due to misplaced BSS segments. WCC with ALP and LINK produces
a normal sized image however.

File:

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

trunk/src/os2ahci/os2ahci.h

@@ -28 +28 @@
 
 /* IMPORTANT NOTE: The DDK headers require tight structure packing and this
- * is controlled via compiler parameters. Thus, all stuctures in os2ahci.sys
+ * is controlled via compiler parameters. Thus, all stuctures in os2ahci.add
  * are expected to be byte-aligned without the need of explicit pragma pack()
  * directives. Where possible, the structures are layed out such that words
@@ -49 +49 @@
 #include <reqpkt.h>
 
+/* NOTE: (Rousseau)
+ * The regular dhcalls.h from $(DDK)\base\h also works.
+ * The devhelp.h from $(DDK)\base\h produces inline assembler errors.
+ * The modified devhelp.h from ..\include works OK and is used because it
+ * generates a slightly smaller driver image.
+ */
 #ifdef __WATCOMC__
 /* include WATCOM specific DEVHELP stubs */
@@ -106 +112 @@
 #define dddphex   if (debug > 2) phex
 
-/* verbosity console print macros 
+/* verbosity console print macros
  * (we use 'i' in ciprintf here to avoid name clash
  * with vprintf-like funcs)
@@ -380 +386 @@
   SG_TO_BUF,                           /* copy from S/G list to buffer */
   BUF_TO_SG                            /* copy from buffer to S/G list */
-} SG_MEMCPY_DIRECTION;  
+} SG_MEMCPY_DIRECTION;
 
 /* -------------------------- function prototypes -------------------------- */