Changeset 53770 in vbox for trunk/src/VBox/Additions/x11/vboxvideo

Timestamp:

Jan 12, 2015 9:10:36 AM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: better separate VBox-specific and X server-specific code.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• Makefile.kmk (modified) (1 diff)
• getmode.c (modified) (1 diff)
• helpers.c (added)
• vboxvideo.h (modified) (3 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

@@ -103 +103 @@
 vboxvideo_drv_SOURCES = \
         getmode.c \
+        helpers.c \
         pointer.c \
         setmode.c \

trunk/src/VBox/Additions/x11/vboxvideo/getmode.c

@@ -141 +141 @@
     unsigned i;
 
-    XF86ASSERT(cIndex < vboxNumStdModes,
+    VBVXASSERT(cIndex < vboxNumStdModes,
                ("cIndex = %d, vboxNumStdModes = %d\n", cIndex,
                 vboxNumStdModes));

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -58 +58 @@
 #ifdef DEBUG
 
-#include <xf86.h>
-
 #define TRACE_ENTRY() \
 do { \
-    xf86Msg(X_INFO, __PRETTY_FUNCTION__); \
-    xf86Msg(X_INFO, ": entering\n"); \
+    vbvxMsg(__PRETTY_FUNCTION__); \
+    vbvxMsg(": entering\n"); \
 } while(0)
 #define TRACE_EXIT() \
 do { \
-    xf86Msg(X_INFO, __PRETTY_FUNCTION__); \
-    xf86Msg(X_INFO, ": leaving\n"); \
+    vbvxMsg(__PRETTY_FUNCTION__); \
+    vbvxMsg(": leaving\n"); \
 } while(0)
 #define TRACE_LOG(...) \
 do { \
-    xf86Msg(X_INFO, __PRETTY_FUNCTION__); \
-    xf86Msg(X_INFO, __VA_ARGS__); \
+    vbvxMsg("%s: ", __PRETTY_FUNCTION__); \
+    vbvxMsg(__VA_ARGS__); \
 } while(0)
 # define TRACE_LINE() do \
 { \
-    ErrorF ("%s: line %d\n", __FUNCTION__, __LINE__); \
-    } while(0)
-# define XF86ASSERT(expr, out) \
-if (!(expr)) \
-{ \
-    ErrorF ("\nAssertion failed!\n\n"); \
-    ErrorF ("%s\n", #expr); \
-    ErrorF ("at %s (%s:%d)\n", __PRETTY_FUNCTION__, __FILE__, __LINE__); \
-    ErrorF out; \
-    FatalError("Aborting"); \
-}
+    vbvxMsg("%s: line %d\n", __FUNCTION__, __LINE__); \
+} while(0)
 #else  /* !DEBUG */
 
@@ -93 +82 @@
 #define TRACE_EXIT()          do { } while (0)
 #define TRACE_LOG(...)        do { } while (0)
-#define XF86ASSERT(expr, out) do { } while (0)
 
 #endif  /* !DEBUG */
+
+/* Not just for debug builds.  If something is wrong we want to know at once. */
+#define VBVXASSERT(expr, out) \
+if (!(expr)) \
+{ \
+    vbvxMsg("\nAssertion failed!\n\n"); \
+    vbvxMsg("%s\n", #expr); \
+    vbvxMsg("at %s (%s:%d)\n", __PRETTY_FUNCTION__, __FILE__, __LINE__); \
+    vbvxMsg out; \
+    vbvxAbortServer(); \
+}
 
 #define BOOL_STR(a) ((a) ? "TRUE" : "FALSE")
@@ -234 +233 @@
 } VBOXRec, *VBOXPtr;
 
+/* helpers.c */
+extern void vbvxMsg(const char *pszFormat, ...);
+extern void vbvxMsgV(const char *pszFormat, va_list args);
+extern void vbvxAbortServer(void);
+
+/* setmode.c */
 extern Bool vbox_init(int scrnIndex, VBOXPtr pVBox);
 extern Bool vbox_cursor_init (ScreenPtr pScreen);