[xsrc/trunk]: xsrc/external/mit/xf86-video-vboxvideo/dist/src Rename vboxvide...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/3b83ec72888d
branches:  trunk
changeset: 10587:3b83ec72888d
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu Oct 22 20:47:23 2020 +0000

description:
Rename vboxvideo.h -> vboxvideo_drv.h, so that this can be built on
a host with a case-insensitive + case-preserving file system.

diffstat:

 external/mit/xf86-video-vboxvideo/dist/src/Makefile.am     |    2 +-
 external/mit/xf86-video-vboxvideo/dist/src/Makefile.in     |    2 +-
 external/mit/xf86-video-vboxvideo/dist/src/edid.c          |    4 +-
 external/mit/xf86-video-vboxvideo/dist/src/getmode.c       |    4 +-
 external/mit/xf86-video-vboxvideo/dist/src/helpers.c       |    2 +-
 external/mit/xf86-video-vboxvideo/dist/src/pointer.c       |    4 +-
 external/mit/xf86-video-vboxvideo/dist/src/setmode.c       |    4 +-
 external/mit/xf86-video-vboxvideo/dist/src/vboxvideo.c     |    4 +-
 external/mit/xf86-video-vboxvideo/dist/src/vboxvideo.h     |  240 -------------
 external/mit/xf86-video-vboxvideo/dist/src/vboxvideo_drv.h |  240 +++++++++++++
 external/mit/xf86-video-vboxvideo/dist/src/vbva.c          |    4 +-
 11 files changed, 255 insertions(+), 255 deletions(-)

diffs (truncated from 632 to 300 lines):

diff -r 5352f8b79c57 -r 3b83ec72888d external/mit/xf86-video-vboxvideo/dist/src/Makefile.am
--- a/external/mit/xf86-video-vboxvideo/dist/src/Makefile.am    Wed Oct 21 14:54:57 2020 +0000
+++ b/external/mit/xf86-video-vboxvideo/dist/src/Makefile.am    Thu Oct 22 20:47:23 2020 +0000
@@ -59,7 +59,7 @@
          vboxvideo.c \
          VBoxVideoErr.h \
          VBoxVideoGuest.h \
-         vboxvideo.h \
+         vboxvideo_drv.h \
          VBoxVideo.h \
          VBoxVideoIPRT.h \
          VBoxVideoVBE.h \
diff -r 5352f8b79c57 -r 3b83ec72888d external/mit/xf86-video-vboxvideo/dist/src/Makefile.in
--- a/external/mit/xf86-video-vboxvideo/dist/src/Makefile.in    Wed Oct 21 14:54:57 2020 +0000
+++ b/external/mit/xf86-video-vboxvideo/dist/src/Makefile.in    Thu Oct 22 20:47:23 2020 +0000
@@ -408,7 +408,7 @@
          vboxvideo.c \
          VBoxVideoErr.h \
          VBoxVideoGuest.h \
-         vboxvideo.h \
+         vboxvideo_drv.h \
          VBoxVideo.h \
          VBoxVideoIPRT.h \
          VBoxVideoVBE.h \
diff -r 5352f8b79c57 -r 3b83ec72888d external/mit/xf86-video-vboxvideo/dist/src/edid.c
--- a/external/mit/xf86-video-vboxvideo/dist/src/edid.c Wed Oct 21 14:54:57 2020 +0000
+++ b/external/mit/xf86-video-vboxvideo/dist/src/edid.c Thu Oct 22 20:47:23 2020 +0000
@@ -1,4 +1,4 @@
-/* $Id: edid.c,v 1.1.1.1 2019/01/09 23:50:31 mrg Exp $ */
+/* $Id: edid.c,v 1.2 2020/10/22 20:47:23 thorpej Exp $ */
 /** @file
  *
  * Linux Additions X11 graphics driver, EDID construction
@@ -39,7 +39,7 @@
 #include "misc.h"
 #include "xf86DDC.h"
 #include "xf86Crtc.h"
-#include "vboxvideo.h"
+#include "vboxvideo_drv.h"
 
 enum { EDID_SIZE = 128 };
 
diff -r 5352f8b79c57 -r 3b83ec72888d external/mit/xf86-video-vboxvideo/dist/src/getmode.c
--- a/external/mit/xf86-video-vboxvideo/dist/src/getmode.c      Wed Oct 21 14:54:57 2020 +0000
+++ b/external/mit/xf86-video-vboxvideo/dist/src/getmode.c      Thu Oct 22 20:47:23 2020 +0000
@@ -1,4 +1,4 @@
-/* $Id: getmode.c,v 1.1.1.1 2019/01/09 23:50:31 mrg Exp $ */
+/* $Id: getmode.c,v 1.2 2020/10/22 20:47:23 thorpej Exp $ */
 /** @file
  * VirtualBox X11 Additions graphics driver dynamic video mode functions.
  */
@@ -25,7 +25,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "vboxvideo.h"
+#include "vboxvideo_drv.h"
 
 #define NEED_XF86_TYPES
 #include "xf86.h"
diff -r 5352f8b79c57 -r 3b83ec72888d external/mit/xf86-video-vboxvideo/dist/src/helpers.c
--- a/external/mit/xf86-video-vboxvideo/dist/src/helpers.c      Wed Oct 21 14:54:57 2020 +0000
+++ b/external/mit/xf86-video-vboxvideo/dist/src/helpers.c      Thu Oct 22 20:47:23 2020 +0000
@@ -20,7 +20,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "vboxvideo.h"
+#include "vboxvideo_drv.h"
 #include "os.h"
 #include "propertyst.h"
 #include "windowstr.h"
diff -r 5352f8b79c57 -r 3b83ec72888d external/mit/xf86-video-vboxvideo/dist/src/pointer.c
--- a/external/mit/xf86-video-vboxvideo/dist/src/pointer.c      Wed Oct 21 14:54:57 2020 +0000
+++ b/external/mit/xf86-video-vboxvideo/dist/src/pointer.c      Thu Oct 22 20:47:23 2020 +0000
@@ -1,4 +1,4 @@
-/* $Id: pointer.c,v 1.1.1.1 2019/01/09 23:50:31 mrg Exp $ */
+/* $Id: pointer.c,v 1.2 2020/10/22 20:47:23 thorpej Exp $ */
 /** @file
  * VirtualBox X11 Additions graphics driver utility functions
  */
@@ -36,7 +36,7 @@
 #include "cursorstr.h"
 #include "servermd.h"
 
-#include "vboxvideo.h"
+#include "vboxvideo_drv.h"
 
 #ifdef XORG_7X
 # include <stdlib.h>
diff -r 5352f8b79c57 -r 3b83ec72888d external/mit/xf86-video-vboxvideo/dist/src/setmode.c
--- a/external/mit/xf86-video-vboxvideo/dist/src/setmode.c      Wed Oct 21 14:54:57 2020 +0000
+++ b/external/mit/xf86-video-vboxvideo/dist/src/setmode.c      Thu Oct 22 20:47:23 2020 +0000
@@ -1,4 +1,4 @@
-/* $Id: setmode.c,v 1.1.1.1 2019/01/09 23:50:31 mrg Exp $ */
+/* $Id: setmode.c,v 1.2 2020/10/22 20:47:23 thorpej Exp $ */
 /** @file
  * Linux Additions X11 graphics driver, mode setting
  */
@@ -46,7 +46,7 @@
 # define XF86_LIBC_H
 # include <string.h>
 #endif
-#include "vboxvideo.h"
+#include "vboxvideo_drv.h"
 #include "xf86.h"
 
 /* VGA hardware functions for setting and restoring text mode */
diff -r 5352f8b79c57 -r 3b83ec72888d external/mit/xf86-video-vboxvideo/dist/src/vboxvideo.c
--- a/external/mit/xf86-video-vboxvideo/dist/src/vboxvideo.c    Wed Oct 21 14:54:57 2020 +0000
+++ b/external/mit/xf86-video-vboxvideo/dist/src/vboxvideo.c    Thu Oct 22 20:47:23 2020 +0000
@@ -1,4 +1,4 @@
-/* $Id: vboxvideo.c,v 1.1.1.1 2019/01/09 23:50:31 mrg Exp $ */
+/* $Id: vboxvideo.c,v 1.2 2020/10/22 20:47:23 thorpej Exp $ */
 /** @file
  * Linux Additions X11 graphics driver
  */
@@ -42,7 +42,7 @@
  *          Michael Thayer <michael.thayer%oracle.com@localhost>
  */
 
-#include "vboxvideo.h"
+#include "vboxvideo_drv.h"
 #include <VBoxVideoVBE.h>
 
 /* Basic definitions and functions needed by all drivers. */
diff -r 5352f8b79c57 -r 3b83ec72888d external/mit/xf86-video-vboxvideo/dist/src/vboxvideo.h
--- a/external/mit/xf86-video-vboxvideo/dist/src/vboxvideo.h    Wed Oct 21 14:54:57 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,240 +0,0 @@
-/* $Id: vboxvideo.h,v 1.1.1.1 2019/01/09 23:50:31 mrg Exp $ */
-/** @file
- * VirtualBox X11 Additions graphics driver
- */
-
-/*
- * Copyright (C) 2006-2017 Oracle Corporation
- *
- * This code is based on:
- *
- * X11 VESA driver
- *
- * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of Conectiva Linux shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in this Software without prior written authorization from
- * Conectiva Linux.
- *
- * Authors: Paulo César Pereira de Andrade <pcpa%conectiva.com.br@localhost>
- *          Michael Thayer <michael.thayer%oracle.com@localhost>
- */
-
-#ifndef _VBOXVIDEO_H_
-#define _VBOXVIDEO_H_
-
-#include <VBoxVideoGuest.h>
-#include <VBoxVideo.h>
-#include "version-generated.h"
-
-#define VBOX_VENDORID 0x80EE
-#define VBOX_DEVICEID 0xBEEF
-
-#ifndef VBVA_SCREEN_F_BLANK
-# define VBVA_SCREEN_F_BLANK    0x0004
-#endif
-
-#include <VBoxVideoVBE.h>
-
-#include "xf86.h"
-#include "xf86str.h"
-#include "xf86Cursor.h"
-
-#ifdef DEBUG
-
-#define TRACE_ENTRY() do { xf86ErrorF("%s: entering\n", __func__); } while(0)
-#define TRACE_EXIT() do { xf86ErrorF("%s: leaving\n", __func__); } while(0)
-#define TRACE_LINE() \
-    do { xf86ErrorF("%s: line\n", __func__, __LINE__); } while(0)
-#define TRACE_LOG(...) \
-do { \
-    xf86ErrorF("%s: ", __func__); \
-    xf86ErrorF(__VA_ARGS__); \
-} while(0)
-
-#else  /* !DEBUG */
-
-#define TRACE_ENTRY()         do { } while (0)
-#define TRACE_EXIT()          do { } while (0)
-#define TRACE_LOG(...)        do { } while (0)
-
-#endif  /* !DEBUG */
-
-#define VBOX_VERSION            VBOX_VERSION_MAJOR * 10000 \
-                              + VBOX_VERSION_MINOR * 100
-#define VBOX_NAME               "VBoxVideo"
-#define VBOX_DRIVER_NAME        "vboxvideo"
-
-#define VBOX_VIDEO_MAJOR  VBOX_VERSION_MAJOR
-#define VBOX_VIDEO_MINOR  VBOX_VERSION_MINOR
-
-#define VBOX_VIDEO_MIN_SIZE    64
-#define VBOX_VIDEO_MAX_VIRTUAL (INT16_MAX - 1)
-
-#define VBOXPTR(p) ((VBOXPtr)((p)->driverPrivate))
-
-/** Helper to work round different ways of getting the root window in different
- * server versions. */
-#if defined(XORG_VERSION_CURRENT) && XORG_VERSION_CURRENT < 70000000 \
-    && XORG_VERSION_CURRENT >= 10900000
-# define ROOT_WINDOW(pScrn) screenInfo.screens[(pScrn)->scrnIndex]->root
-#else
-# define ROOT_WINDOW(pScrn) WindowTable[(pScrn)->scrnIndex]
-#endif
-
-/** ChangeWindowProperty for X.Org Server 1.19 and later */
-#if defined(XORG_VERSION_CURRENT) && XORG_VERSION_CURRENT < 70000000 \
-    && XORG_VERSION_CURRENT >= 11900000
-# define ChangeWindowProperty(pWin, property, type, format, mode, \
-                              len, value, sendevent) \
-        dixChangeWindowProperty(serverClient, pWin, property, type, format, \
-                                mode, len, value, sendevent)
-#endif
-
-/** Structure containing all virtual monitor-specific information. */
-struct VBoxScreen
-{
-    /** Position information for each virtual screen for the purposes of
-     * sending dirty rectangle information to the right one. */
-    RTRECT2 aScreenLocation;
-    /** Is this CRTC enabled or in DPMS off state? */
-    Bool fPowerOn;
-#ifdef VBOXVIDEO_13
-    /** The virtual crtcs. */
-    struct _xf86Crtc *paCrtcs;
-    /** The virtual outputs, logically not distinct from crtcs. */
-    struct _xf86Output *paOutputs;
-#endif
-    /** Offsets of VBVA buffers in video RAM */
-    uint32_t aoffVBVABuffer;
-    /** Context information about the VBVA buffers for each screen */
-    struct VBVABUFFERCONTEXT aVbvaCtx;
-    /** The current preferred resolution for the screen */
-    RTRECTSIZE aPreferredSize;
-    /** The current preferred location for the screen. */
-    RTPOINT aPreferredLocation;
-    /** Has this screen been enabled by the host? */
-    Bool afConnected;
-    /** Does this screen have a preferred location? */
-    Bool afHaveLocation;
-};
-
-typedef struct VBOXRec
-{
-    EntityInfoPtr pEnt;
-#ifdef PCIACCESS
-    struct pci_device *pciInfo;
-#else
-    pciVideoPtr pciInfo;
-    PCITAG pciTag;
-#endif
-    void *base;
-    /** The amount of VRAM available for use as a framebuffer */
-    unsigned long cbFBMax;
-    /** The size of the framebuffer and the VBVA buffers at the end of it. */
-    unsigned long cbView;
-    /** Whether the pre-X-server mode was a VBE mode */
-    Bool fSavedVBEMode;
-    /** Paramters of the saved pre-X-server VBE mode, invalid if there is none
-     */
-    uint16_t cSavedWidth, cSavedHeight, cSavedPitch, cSavedBPP, fSavedFlags;
-    CloseScreenProcPtr CloseScreen;
-    /** Default X server procedure for enabling and disabling framebuffer access */
-    xf86EnableDisableFBAccessProc *EnableDisableFBAccess;
-    OptionInfoPtr Options;
-    /** @todo we never actually free this */
-    xf86CursorInfoPtr pCurs;
-    /** Do we currently want to use the host cursor? */
-    Bool fUseHardwareCursor;
-    /** Number of screens attached */
-    uint32_t cScreens;
-    /** Information about each virtual screen. */