VirtualBox

Changeset 26054 in vbox for trunk/src/VBox/Additions


Ignore:
Timestamp:
Jan 26, 2010 8:46:38 PM (15 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
56971
Message:

Additions/x11/vboxvideo: use vboxvideo_70 for the XFree86 driver too

Location:
trunk/src/VBox/Additions
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r22575 r26054  
    204204#endif
    205205
     206#ifndef VBOX_VBGLR3_XFREE86
    206207    /*
    207208     * Create release logger
    … …  
    215216    if (RT_SUCCESS(rc2))
    216217        RTLogRelSetDefaultInstance(pReleaseLogger);
     218#endif
    217219
    218220    return VINF_SUCCESS;

  • trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp

    r25962 r26054  
    4949VBGLR3DECL(int) VbglR3WaitEvent(uint32_t fMask, uint32_t cMillies, uint32_t *pfEvents)
    5050{
     51#ifndef VBOX_VBGLR3_XFREE86
    5152    LogFlow(("VbglR3WaitEvent: fMask=0x%x, cMillies=%u, pfEvents=%p\n",
    5253             fMask, cMillies, pfEvents));
    5354    AssertReturn((fMask & ~VMMDEV_EVENT_VALID_EVENT_MASK) == 0, VERR_INVALID_PARAMETER);
    5455    AssertPtrNullReturn(pfEvents, VERR_INVALID_POINTER);
     56#endif
    5557
    5658    VBoxGuestWaitEventInfo waitEvent;
    … …  
    6264    if (RT_SUCCESS(rc))
    6365    {
     66#ifndef VBOX_VBGLR3_XFREE86
    6467        AssertMsg(waitEvent.u32Result == VBOXGUEST_WAITEVENT_OK, ("%d\n", waitEvent.u32Result));
     68#endif
    6569        if (pfEvents)
    6670            *pfEvents = waitEvent.u32EventFlagsOut;
    6771    }
    6872
     73#ifndef VBOX_VBGLR3_XFREE86
    6974    LogFlow(("VbglR3WaitEvent: rc=%Rrc, u32EventFlagsOut=0x%x. u32Result=%d\n",
    7075             rc, waitEvent.u32EventFlagsOut, waitEvent.u32Result));
     76#endif
    7177    return rc;
    7278}
    … …  
    183189    Req.u32NotMask = fNot;
    184190    int rc = vbglR3GRPerform(&Req.header);
    185 #ifdef DEBUG
     191#if defined(DEBUG) && !defined(VBOX_VBGLR3_XFREE86)
    186192    if (RT_SUCCESS(rc))
    187193        LogRel(("Successfully changed guest capabilities: or mask 0x%x, not mask 0x%x.\n", fOr, fNot));
    … …  
    193199
    194200
     201#ifndef VBOX_VBGLR3_XFREE86
    195202/**
    196203 * Fallback for vbglR3GetAdditionsVersion.
    … …  
    223230    return VINF_SUCCESS;
    224231}
     232#endif
    225233
    226234
    … …  
    281289
    282290
     291#ifndef VBOX_VBGLR3_XFREE86
    283292/**
    284293 * Retrieves the installed Guest Additions version and/or revision.
    … …  
    375384#endif /* !RT_OS_WINDOWS */
    376385}
    377 
     386#endif /* !VBOX_VBGLR3_XFREE86 */
    378387
    379388/**

  • trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp

    r21912 r26054  
    202202VBGLR3DECL(int) VbglR3SaveVideoMode(const char *pszName, uint32_t cx, uint32_t cy, uint32_t cBits)
    203203{
    204 #ifdef VBOX_WITH_GUEST_PROPS
     204#if defined(VBOX_WITH_GUEST_PROPS) && !defined(VBOX_VBGLR3_XFREE86)
    205205    using namespace guestProp;
    206206
    … …  
    216216        VbglR3GuestPropDisconnect(u32ClientId);  /* Return value ignored, because what can we do anyway? */
    217217    return rc;
    218 #else /* VBOX_WITH_GUEST_PROPS not defined */
     218#else /* !VBOX_WITH_GUEST_PROPS || VBOX_VBGLR3_XFREE86 */
    219219    return VERR_NOT_IMPLEMENTED;
    220 #endif /* VBOX_WITH_GUEST_PROPS not defined */
     220#endif /* !VBOX_WITH_GUEST_PROPS || VBOX_VBGLR3_XFREE86 */
    221221}
    222222
    … …  
    233233VBGLR3DECL(int) VbglR3RetrieveVideoMode(const char *pszName, uint32_t *pcx, uint32_t *pcy, uint32_t *pcBits)
    234234{
    235 #ifdef VBOX_WITH_GUEST_PROPS
     235#if defined(VBOX_WITH_GUEST_PROPS) && !defined(VBOX_VBGLR3_XFREE86)
    236236    using namespace guestProp;
    237237
    … …  
    294294    }
    295295    return rc;
    296 #else /* VBOX_WITH_GUEST_PROPS not defined */
     296#else /* !VBOX_WITH_GUEST_PROPS || VBOX_VBGLR3_XFREE86 */
    297297    return VERR_NOT_IMPLEMENTED;
    298 #endif /* VBOX_WITH_GUEST_PROPS not defined */
    299 }
     298#endif /* !VBOX_WITH_GUEST_PROPS || VBOX_VBGLR3_XFREE86 */
     299}

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

    r25564 r26054  
    104104 endif
    105105 vboxvideo_drv_SOURCES = \
    106         vboxvideo_68.c \
    107         vboxutils_68.c
     106        vboxvideo_70.c \
     107        vboxutils.c
    108108endif   # target linux
    109109
    … …  
    283283$$(PATH_vboxvideo_drv)/tstvboxvideo68.run: $$(INSTARGET_vboxvideo_drv)
    284284        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
    285             $(INSTARGET_vboxvideo_drv) $(OUR_PATH_VBOXVIDEO)/undefined_68 --static
     285            $(INSTARGET_vboxvideo_drv) $(OUR_PATH_VBOXVIDEO)/undefined_70 --static
    286286        $(QUIET)$(APPEND) -t "$@" "done"
    287287     endif

  • trunk/src/VBox/Additions/x11/vboxvideo/undefined_70

    r21473 r26054  
    142142__moddi3
    143143__divdi3
     144xf86sprintf
     145_GLOBAL_OFFSET_TABLE_

  • trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_70.c

    r24970 r26054  
    8181#endif  /* DEBUG_VIDEO not defined */
    8282
    83 #ifdef XFree86LOADER
     83#ifdef XORG_7X
    8484# include "xorg-server.h"
    85 #else
    86 # ifdef HAVE_CONFIG_H
    87 #  include "config.h"
    88 # endif
    8985#endif
    9086#include "vboxvideo.h"
    … …  
    149145 */
    150146
    151 _X_EXPORT DriverRec VBOXDRV = {
     147#ifdef XORG_7X
     148_X_EXPORT
     149#endif
     150DriverRec VBOXDRV = {
    152151    VBOX_VERSION,
    153152    VBOX_DRIVER_NAME,
    … …  
    157156    NULL,
    158157    0,
     158#ifdef XORG_7X
    159159    NULL
     160#endif
    160161};
    161162
    … …  
    239240    MODINFOSTRING1,
    240241    MODINFOSTRING2,
     242#ifdef XORG_7X
    241243    XORG_VERSION_CURRENT,
     244#else
     245    XF86_VERSION_CURRENT,
     246#endif
    242247    1,                          /* Module major version. Xorg-specific */
    243248    0,                          /* Module minor version. Xorg-specific */
    … …  
    253258 * followed by "ModuleData".
    254259 */
    255 _X_EXPORT XF86ModuleData vboxvideoModuleData = { &vboxVersionRec, vboxSetup, NULL };
     260#ifdef XORG_7X
     261_X_EXPORT
     262#endif
     263XF86ModuleData vboxvideoModuleData = { &vboxVersionRec, vboxSetup, NULL };
    256264
    257265static pointer
    … …  
    412420    int i;
    413421    DisplayModePtr m_prev;
    414     char *pcHostModeName = NULL;
     422    char szHostModeName[256] = "";
    415423
    416424    /* Are we really starting the server, or is this just a dummy run? */
    … …  
    504512            if ((0 != cx) && (0 != cy)) {
    505513                cx -= cx % 8;
    506                 pcHostModeName = XNFprintf("%dx%d", cx, cy);
     514                xf86sprintf(szHostModeName, "%dx%d", cx, cy);
    507515            }
    508516        }
    … …  
    536544    /* Add additional modes to the end of the mode list in case the others are
    537545       all invalid. */
    538     if (pcHostModeName != NULL)
    539     {
    540         pScrn->display->modes[i] = pcHostModeName;
     546    if (szHostModeName[0])
     547    {
     548        pScrn->display->modes[i] = szHostModeName;
    541549        ++i;
    542550    }
    … …  
    603611        }
    604612    }
    605 
     613       
    606614    /* Colour weight - we always call this, since we are always in
    607615       truecolour. */
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette