Changeset 9 for trunk/src/pci.c

Timestamp:

Sep 13, 2010, 12:44:39 AM (15 years ago)

Author:

root

Message:

fixes for Watcom compiler

File:

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

trunk/src/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];
@@ -830 +829 @@
 {
   void (_far *func)(void);
+  unsigned short prot_idc_DS;
   RP_GENIOCTL ioctl;
 
@@ -867 +867 @@
   func = oemhlp.ProtIDCEntry;
 
+  /* MT: the Watcom inline assembler does not support struct member reference,
+   * so we have to 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;
-    call far ptr [func];
+    mov  ds, prot_idc_DS;
+    call dword ptr [func];
 
     pop  di;