Changeset 43363 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Sep 20, 2012 9:56:07 AM (12 years ago)

Author:

vboxsync

Message:

Haiku Additions.

Location:

trunk/src/VBox/Additions/common

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxGuest/Makefile.kmk (modified) (6 diffs)
• VBoxGuest/VBoxGuest-haiku-stubs.c (added)
• VBoxGuest/VBoxGuest-haiku.c (added)
• VBoxGuest/VBoxGuest-haiku.h (added)
• VBoxGuestLib/VBoxGuestR3Lib.cpp (modified) (3 diffs)
• VBoxService/VBoxServiceTimeSync.cpp (modified) (1 diff)
• VBoxService/VBoxServiceVMInfo.cpp (modified) (3 diffs)

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

@@ -23 +23 @@
  include $(PATH_SUB_CURRENT)/VBoxGuestLib/Makefile.kmk
  include $(PATH_SUB_CURRENT)/VBoxControl/Makefile.kmk
- if1of ($(KBUILD_TARGET), freebsd linux os2 solaris win)
+ if1of ($(KBUILD_TARGET), freebsd haiku linux os2 solaris win)
   include $(PATH_SUB_CURRENT)/VBoxGuest/Makefile.kmk
  endif
- if1of ($(KBUILD_TARGET), freebsd linux os2 solaris win)
+ if1of ($(KBUILD_TARGET), freebsd haiku linux os2 solaris win)
   include $(PATH_SUB_CURRENT)/VBoxService/Makefile.kmk
  endif

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

@@ -20 +20 @@
 
 
-if1of ($(KBUILD_TARGET), freebsd $(if $(defined VBOX_WITH_ADDITION_DRIVERS),linux,) os2 solaris win)
+if1of ($(KBUILD_TARGET), freebsd haiku $(if $(defined VBOX_WITH_ADDITION_DRIVERS),linux,) os2 solaris win)
  #
  # VBoxGuest - The Guest Additions Driver.
@@ -27 +27 @@
  VBoxGuest_TEMPLATE      = VBOXGUESTR0
  VBoxGuest_NAME.freebsd  = vboxguest
+ VBoxGuest_NAME.haiku    = vboxguest
  VBoxGuest_NAME.linux    = vboxguest
  VBoxGuest_NAME.solaris  = vboxguest
@@ -33 +34 @@
   VBoxGuest_DEBUG_INSTTYPE.win = both
  endif
+ VBoxGuest_DEFS.haiku    = VBOX_SVN_REV=$(VBOX_SVN_REV) _KERNEL_MODE=1
  VBoxGuest_DEFS.linux    = KBUILD_MODNAME=KBUILD_STR\(vboxguest\) KBUILD_BASENAME=KBUILD_STR\(vboxguest\) DEBUG_HASH=2 DEBUG_HASH2=3 EXPORT_SYMTAB
  VBoxGuest_DEFS.solaris  = VBOX_SVN_REV=$(VBOX_SVN_REV)
@@ -50 +52 @@
  VBoxGuest_DEPS.linux   += $(VBOX_SVN_REV_HEADER)
  VBoxGuest_DEPS.freebsd += $(VBOX_SVN_REV_HEADER)
+ VBoxGuest_DEPS.haiku   += $(VBOX_SVN_REV_HEADER)
  VBoxGuest_DEFS          = VBGL_VBOXGUEST VBOX_WITH_HGCM
  VBoxGuest_INCS          = .
@@ -75 +78 @@
    endif
   endif # win
-  ifn1of ($(KBUILD_TARGET), linux freebsd solaris)
+  ifn1of ($(KBUILD_TARGET), linux freebsd solaris haiku)
    VBoxGuest_SOURCES    = VBoxGuest-$(KBUILD_TARGET).cpp
   else
@@ -95 +98 @@
         $(PATH_STAGE)/gen-sys-hdrs/bus_if.h \
         $(PATH_STAGE)/gen-sys-hdrs/device_if.h
+  ifeq ($(KBUILD_TARGET),haiku)
+   # Haiku drivers cannot export symbols for other drivers, but modules can.
+   # Therefore vboxguest is a module containing the ring-0 guest lib, and vboxdev/vboxsf
+   # use this module to access the guest lib
+   SYSMODS += VBoxDev
+   VBoxDev_TEMPLATE      = VBOXGUESTR0
+   VBoxDev_NAME          = vboxdev
+   VBoxDev_DEFS          = VBOX_SVN_REV=$(VBOX_SVN_REV) _KERNEL_MODE=1 VBGL_VBOXGUEST VBOX_WITH_HGCM IN_RING0
+   VBoxDev_SOURCES       = VBoxDev-haiku.c VBoxGuest-haiku-stubs.c
+  endif
  else # OS/2:
   # The library order is crucial, so a bit of trickery is necessary.

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp

@@ -38 +38 @@
 
 #elif defined(RT_OS_FREEBSD) \
+   || defined(RT_OS_HAIKU) \
    || defined(RT_OS_LINUX) \
    || defined(RT_OS_SOLARIS)
@@ -198 +199 @@
 #else
 
-    /* The default implementation. (linux, solaris, freebsd) */
+    /* The default implementation. (linux, solaris, freebsd, haiku) */
     RTFILE File;
     int rc = RTFileOpen(&File, pszDeviceName, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
@@ -381 +382 @@
     return rc;
 
+#elif defined(RT_OS_HAIKU)
+        /* The ioctl hook in Haiku does take the len parameter when specified,
+         * so just use it.
+         */
+    int rc = ioctl((int)g_File, iFunction, pvData, cbData);
+    if (RT_LIKELY(rc == 0))
+        return VINF_SUCCESS;
+
+    /* Positive values are negated VBox error status codes. */
+    if (rc > 0)
+        rc = -rc;
+    else
+        rc = RTErrConvertFromErrno(errno);
+    return rc;
+
 #elif defined(VBOX_VBGLR3_XFREE86)
     /* PORTME - This is preferred over the RTFileIOCtl variant below, just be careful with the (int). */

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp

@@ -411 +411 @@
         VBoxServiceError("VBoxServiceTimeSyncAdjust: GetSystemTimeAdjustment failed, error=%ld\n", GetLastError());
 
-#elif defined(RT_OS_OS2)
+#elif defined(RT_OS_OS2) || defined(RT_OS_HAIKU)
     /* No API for doing gradual time adjustments. */
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -40 +40 @@
 # include <net/if.h>
 # include <unistd.h>
-# ifndef RT_OS_OS2
-#  ifndef RT_OS_FREEBSD
-#   include <utmpx.h> /* @todo FreeBSD 9 should have this. */
-#  endif
+# if !defined(RT_OS_OS2) && !defined(RT_OS_FREEBSD) && !defined(RT_OS_HAIKU)
+#  include <utmpx.h> /* @todo FreeBSD 9 should have this. */
 # endif
 # ifdef RT_OS_SOLARIS
@@ -266 +264 @@
     rc = VERR_NOT_IMPLEMENTED;
 
+#elif defined(RT_OS_HAIKU)
+    /** @todo Haiku: Port logged on user info retrieval. */
+    rc = VERR_NOT_IMPLEMENTED;
+
 #elif defined(RT_OS_OS2)
     /** @todo OS/2: Port logged on (LAN/local/whatever) user info retrieval. */
@@ -519 +521 @@
     if (sd >= 0)
         closesocket(sd);
+
+#elif defined(RT_OS_HAIKU)
+    /** @todo Haiku: implement network info. retreival */
+    return VERR_NOT_IMPLEMENTED;
 
 #elif defined(RT_OS_FREEBSD)