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

Timestamp:

Aug 10, 2010 11:28:35 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

64613

Message:

VBoxGuest: VBoxGuest2.cpp/h, fixed file headers, moved comments to the right place, corrected the function prefix.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxGuest-os2.cpp (modified) (1 prop)
• VBoxGuest-os2.def (modified) (1 prop)
• VBoxGuest.cpp (modified) (4 diffs)
• VBoxGuest2.cpp (moved) (moved from trunk/src/VBox/Additions/common/VBoxGuest/VBoxHelper.cpp ) (4 diffs)
• VBoxGuest2.h (moved) (moved from trunk/src/VBox/Additions/common/VBoxGuest/VBoxHelper.h ) (2 diffs)
• VBoxGuestA-os2.asm (modified) (1 prop)

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

@@ -5 +5 @@
 
 #
-# Copyright (C) 2007 Oracle Corporation
+# Copyright (C) 2007-2010 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -22 +22 @@
 if1of ($(KBUILD_TARGET), freebsd $(if $(defined VBOX_WITH_ADDITION_DRIVERS),linux,) os2 solaris)
  #
- # VBoxGuest - The Guest Additions Driver (mixed case).
+ # VBoxGuest - The Guest Additions Driver.
  #
  SYSMODS += VBoxGuest
@@ -47 +47 @@
   VBoxGuest_SOURCES     += \
         VBoxGuest.cpp \
-        VBoxHelper.cpp
-  VBoxHelper.cpp_DEFS    = VBOX_SVN_REV=$(VBOX_SVN_REV)
+        VBoxGuest2.cpp
+  VBoxGuest2.cpp_DEFS    = VBOX_SVN_REV=$(VBOX_SVN_REV)
   VBoxGuest_LIBS         = \
         $(VBOX_LIB_VBGL_R0BASE) \

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

@@ -22 +22 @@
 #define LOG_GROUP   LOG_GROUP_DEFAULT
 #include "VBoxGuestInternal.h"
+#include "VBoxGuest2.h"
 #include <VBox/VMMDev.h> /* for VMMDEV_RAM_SIZE */
 #include <VBox/log.h>
@@ -36 +37 @@
 # include <iprt/thread.h>
 #endif
-#include "VBoxHelper.h"
 #include "version-generated.h"
 #if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
@@ -734 +734 @@
             Assert(pDevExt->PhysIrqAckEvents != 0);
 
-            rc = VBoxReportGuestInfo(enmOSType);
+            rc = VBoxGuestReportGuestInfo(enmOSType);
             if (RT_SUCCESS(rc))
             {
@@ -749 +749 @@
                         vboxGuestInitFixateGuestMappings(pDevExt);
 
-                        rc = VBoxReportGuestDriverStatus(true /* Driver is active */);
+                        rc = VBoxGuestReportDriverStatus(true /* Driver is active */);
                         if (RT_FAILURE(rc))
                             LogRel(("VBoxGuestInitDevExt: VBoxReportGuestDriverStatus failed, rc=%Rrc\n", rc));

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBoxHelper - Miscellaneous functions.
+ * VBoxGuest - Guest Additions Driver, bits shared with the windows code.
  */
 
@@ -25 +25 @@
  */
 
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
 #include <iprt/string.h>
 #include <VBox/err.h>
@@ -35 +38 @@
 
 
-int VBoxReportGuestInfo(VBOXOSTYPE enmOSType)
+/**
+ * Report the guest information to the host.
+ *
+ * @returns IPRT status code.
+ * @param   enmOSType       The OS type to report.
+ */
+int VBoxGuestReportGuestInfo(VBOXOSTYPE enmOSType)
 {
     /*
@@ -84 +93 @@
 }
 
-int VBoxReportGuestDriverStatus(bool fActive)
+
+/**
+ * Report the guest driver status to the host.
+ *
+ * @returns IPRT status code.
+ * @param   fActive         Flag whether the driver is now active or not.
+ */
+int VBoxGuestReportDriverStatus(bool fActive)
 {
     /*

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.h

@@ -1 @@
-/* $Id: */
+/* $Id$ */
 /** @file
- * VBoxHelper - Guest Additions Driver helper routines.
+ * VBoxGuest - Guest Additions Driver, bits shared with the windows code.
  */
 
@@ -14 +14 @@
  * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ *
+ * The contents of this file may alternatively be used under the terms
+ * of the Common Development and Distribution License Version 1.0
+ * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+ * VirtualBox OSE distribution, in which case the provisions of the
+ * CDDL are applicable instead of those of the GPL.
+ *
+ * You may elect to license modified versions of this file under the
+ * terms and conditions of either the GPL or the CDDL or both.
  */
 
-#ifndef ___VBoxGuestHelper_h
-#define ___VBoxGuestHelper_h
+#ifndef ___VBoxGuest2_h
+#define ___VBoxGuest2_h
 
-/**
- * Helper to report the guest information to host.
- *
- * @return IPRT status code.
- * @param enmOSType     The OS type to report.
- */
-int VBoxReportGuestInfo(VBOXOSTYPE enmOSType);
+int VBoxGuestReportGuestInfo(VBOXOSTYPE enmOSType);
+int VBoxGuestReportDriverStatus(bool fActive);
 
-/**
- * Helper to report the guest driver status to host.
- *
- * @return IPRT status code.
- * @param fActive      Flag whether the driver is now active or not.
- */
-int VBoxReportGuestDriverStatus(bool fActive);
+#endif
 
-#endif /* ___VBoxGuestHelper_h */
-