Changeset 75552 in vbox

Timestamp:

Nov 18, 2018 4:55:03 AM (6 years ago)

Author:

vboxsync

Message:

VBoxGuest/os2: fixes

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxGuest-os2.cpp (modified) (1 diff)
• VBoxGuestA-os2.asm (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -138 +138 @@
   # The library order is crucial, so a bit of trickery is necessary.
   # A library is used to make sure that VBoxGuestA-os2.asm is first in the link. (temporary hack?)
-  VBoxGuest_SOURCES       = \
-        VBoxGuestA-os2.asm \
-        VBoxGuest-os2.def
-  #VBoxGuest_LDFLAGS       = -s -t -v
-  VBoxGuest_LIBS          = \
-        $(TARGET_VBoxGuestLibOs2Hack) \
-        $(VBOX_LIB_VBGL_R0BASE) \
-        $(VBOX_LIB_IPRT_GUEST_R0) \
-        $(VBOX_GCC_LIBGCC) \
-        end
-  ## When debugging init with kDrvTest:
-  #VBoxGuest_NAME          = VBoxGst
-
-  # see
-  LIBRARIES += VBoxGuestLibOs2Hack
-  VBoxGuestLibOs2Hack_TEMPLATE = VBOXGUESTR0LIB
-  VBoxGuestLibOs2Hack_INSTTYPE = none
-  VBoxGuestLibOs2Hack_DEFS = $(VBoxGuest_DEFS)
-  VBoxGuestLibOs2Hack_INCS = \
-        . \
-        $(PATH_ROOT)/src/VBox/Runtime/include # for the os2ddk
-  VBoxGuestLibOs2Hack_SOURCES = \
-        VBoxGuest-os2.cpp \
-        VBoxGuest.cpp
+VBoxGuest_SOURCES        = \
+        VBoxGuestA-os2.asm
+  ifdef VBOX_USE_WATCOM_FOR_OS2
+VBoxGuest_LIBS           = \
+        $(VBoxGuestLibOs2Hack_1_TARGET) \
+        $(VBOX_LIB_VBGL_R0BASE) \
+        $(VBOX_LIB_IPRT_GUEST_R0) \
+        $(PATH_IGCC)/lib/libend.lib
+  else
+VBoxGuest_SOURCES       += \
+        VBoxGuest-os2.def
+#VBoxGuest_LDFLAGS        = -s -t -v
+VBoxGuest_LIBS           = \
+        $(VBoxGuestLibOs2Hack_1_TARGET) \
+        $(VBOX_LIB_VBGL_R0BASE) \
+        $(VBOX_LIB_IPRT_GUEST_R0) \
+        $(VBOX_GCC_LIBGCC) \
+        end
+  endif
+## When debugging init with kDrvTest:
+#VBoxGuest_NAME          = VBoxGst
+
+# See above.
+LIBRARIES += VBoxGuestLibOs2Hack
+VBoxGuestLibOs2Hack_TEMPLATE = VBOXGUESTR0LIB
+VBoxGuestLibOs2Hack_INSTTYPE = none
+VBoxGuestLibOs2Hack_DEFS = $(VBoxGuest_DEFS)
+VBoxGuestLibOs2Hack_INCS = \
+        . \
+        $(PATH_ROOT)/src/VBox/Runtime/include # for the os2ddk
+VBoxGuestLibOs2Hack_SOURCES = \
+        VBoxGuest-os2.cpp \
+        VBoxGuest.cpp
  endif # OS/2
 

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp

@@ -134 +134 @@
 DECLASM(int) vgdrvOS2Init(const char *pszArgs)
 {
-    Log(("vgdrvOS2Init: pszArgs='%s' MMIO=0x%RX32 IOPort=0x%RX16 Int=%#x Bus=%#x Dev=%#x Fun=%d\n",
-         pszArgs, g_PhysMMIOBase, g_IOPortBase, g_bInterruptLine, g_bPciBusNo, g_bPciDevFunNo >> 3, g_bPciDevFunNo & 7));
+    //Log(("vgdrvOS2Init: pszArgs='%s' MMIO=0x%RX32 IOPort=0x%RX16 Int=%#x Bus=%#x Dev=%#x Fun=%d\n",
+    //     pszArgs, g_PhysMMIOBase, g_IOPortBase, g_bInterruptLine, g_bPciBusNo, g_bPciDevFunNo >> 3, g_bPciDevFunNo & 7));
 
     /*

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm

@@ -186 +186 @@
 %define DevHlp_VirtToLin        05bh
 %define DevHlp_SAVE_MESSAGE     03dh
-%define DevHlp_EIO              031h
+%define DevHlp_EOI              031h
 %define DevHlp_SetIRQ           01bh
 %define DevHlp_PhysToVirt       015h
@@ -1062 +1062 @@
 .our:
     mov     al, [NAME(g_bInterruptLine)]
-    mov     dl, DevHlp_EIO
+    mov     dl, DevHlp_EOI
     call far [NAME(g_fpfnDevHlp)]