Changeset 14 for trunk/src/os2ahci/pci.c

Timestamp:

Sep 14, 2010, 10:44:57 AM (15 years ago)

Author:

markus

Message:

merged last NCQ related changes with Watcom related changes

File:

• trunk/src/os2ahci/pci.c (modified) (4 diffs)

trunk/src/os2ahci/pci.c

@@ -483 +483 @@
   UCHAR dev_func  = data->find_class.dev_func;
   ULONG val;
-  UCHAR rc;
   SEL gdt[PORT_DMA_BUF_SEGS + 1];
   char tmp[40];
@@ -831 +830 @@
   void (_far *func)(void);
   RP_GENIOCTL ioctl;
+  unsigned short prot_idc_ds;
 
   if (oemhlp.ProtIDCEntry == NULL || oemhlp.ProtIDC_DS == 0) {
@@ -867 +867 @@
   func = oemhlp.ProtIDCEntry;
 
+  /* The WATCOM compiler does not support struct references in inline
+   * assembler code, so we pass it in a stack variable
+   */
+  prot_idc_ds = oemhlp.ProtIDC_DS;
+
   _asm {
     push ds;
@@ -877 +882 @@
     pop  es
     lea  bx, ioctl;
-    mov  ds, oemhlp.ProtIDC_DS;
+    mov  ds, prot_idc_ds;
     call dword ptr [func];