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

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.c (modified) (6 diffs)

trunk/src/os2ahci/os2ahci.c

@@ -164 +164 @@
     rc = char_dev_input((RP_RWV _far *) req);
     break;
-    
+
   default:
     rc = STDON | STATUS_ERR_UNKCMD;
@@ -358 +358 @@
 
 #ifdef ECS_BUILD
-  ciprintf("This driver is licensed for use only in conjunction with eComStation.");
+  ciprintf("This driver is licensed for use only in conjunction with eComStation.\n");
+#else
+  ciprintf("This is the Open Watcom build.\n");
 #endif
 
@@ -455 +457 @@
 
     case OS2AHCI_IDC_BIOSMODE:
-      /* reconfigure adapters in BIOS/int13 mode; needed for generating 
+      /* reconfigure adapters in BIOS/int13 mode; needed for generating
        * trap dumps on some machines. This is called by ACPI.PSD.
        *
        * To enter BIOS mode, we flush all write caches, turn off interrupts
-       * and restore the BIOS configuration. This is exactly what 
+       * and restore the BIOS configuration. This is exactly what
        * apm_suspend() does.
        */
@@ -474 +476 @@
   case DSKSP_CAT_GENERIC:
     return(ioctl_gen_dsk(ioctl));
-    
+
   case DSKSP_CAT_SMART:
     return(ioctl_smart(ioctl));
@@ -1521 +1523 @@
 {
   _asm {
-
     push ds
     push es
@@ -1533 +1534 @@
     mov si, OFFSET asm_krnl_exit
     mov dl, DevHlp_RegisterKrnlExit
-    call Device_Help
+
+    call dword ptr [Device_Help]
 
     pop  di