Module Name: xsrc
Committed By: mrg
Date: Thu Jul 4 06:40:40 UTC 2024
Modified Files:
xsrc/external/mit/xf86-input-elographics/dist/src: xf86Elo.c
xsrc/external/mit/xf86-input-elographics/include: config.h
xsrc/external/mit/xf86-video-chips/dist: compile
xsrc/external/mit/xf86-video-chips/dist/src: ct_BltHiQV.h ct_accel.c
ct_driver.c
xsrc/external/mit/xf86-video-chips/dist/util: AsmMacros.h
xsrc/external/mit/xf86-video-nv/dist/src: g80_driver.c g80_exa.c
g80_type.h nv_driver.c nv_setup.c nv_type.h nv_xaa.c riva_driver.c
xsrc/external/mit/xf86-video-savage/dist/src: savage_dri.c
savage_driver.c savage_driver.h savage_exa.c
xsrc/external/mit/xf86-video-siliconmotion/dist/src: smi.h smi_driver.c
smi_output.c
xsrc/external/mit/xf86-video-vboxvideo/dist/src: Makefile.am
Makefile.in VBoxVideoIPRT.h edid.c pointer.c
xsrc/external/mit/xf86-video-vboxvideo/include: config.h
Removed Files:
xsrc/external/mit/xf86-video-siliconmotion/dist: README
xsrc/external/mit/xf86-video-vboxvideo/dist: README
xsrc/external/mit/xf86-video-vboxvideo/dist/src: helpers.c
Log Message:
merge xf86-input-elographics 1.4.4, xf86-video-chips 1.5.0,
xf86-video-nv 2.1.23, xf86-video-savage 2.4.1,
xf86-video-siliconmotion 1.7.10, xf86-video-vboxvideo 1.0.1.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-input-elographics/include/config.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-chips/dist/compile
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_BltHiQV.h
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c
cvs rdiff -u -r1.29 -r1.30 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c \
xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h \
xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c \
xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c \
xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c \
xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/xf86-video-siliconmotion/dist/README
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-vboxvideo/dist/README
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.am \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.in \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/VBoxVideoIPRT.h \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/edid.c \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/pointer.c
cvs rdiff -u -r1.2 -r0 \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/helpers.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xf86-video-vboxvideo/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c
diff -u xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.8 xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.9
--- xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.8 Sun Jan 8 21:34:49 2023
+++ xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c Thu Jul 4 06:40:39 2024
@@ -266,7 +266,7 @@ xf86EloGetPacket(unsigned char *buffer,
*/
ErrorF("Elographics: Dropping one byte in an attempt to synchronize: '%c' 0x%X\n",
buffer[0], buffer[0]);
- memcpy(&buffer[0], &buffer[1], num_bytes-1);
+ memmove(&buffer[0], &buffer[1], num_bytes-1);
}
else {
/*
Index: xsrc/external/mit/xf86-input-elographics/include/config.h
diff -u xsrc/external/mit/xf86-input-elographics/include/config.h:1.6 xsrc/external/mit/xf86-input-elographics/include/config.h:1.7
--- xsrc/external/mit/xf86-input-elographics/include/config.h:1.6 Sun Jan 8 21:34:49 2023
+++ xsrc/external/mit/xf86-input-elographics/include/config.h Thu Jul 4 06:40:39 2024
@@ -43,13 +43,13 @@
#define PACKAGE_NAME "xf86-input-elographics"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xf86-input-elographics 1.4.3"
+#define PACKAGE_STRING "xf86-input-elographics 1.4.4"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xf86-input-elographics"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.4.3"
+#define PACKAGE_VERSION "1.4.4"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 1
@@ -58,10 +58,10 @@
#define PACKAGE_VERSION_MINOR 4
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 3
+#define PACKAGE_VERSION_PATCHLEVEL 4
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.4.3"
+#define VERSION "1.4.4"
Index: xsrc/external/mit/xf86-video-chips/dist/compile
diff -u xsrc/external/mit/xf86-video-chips/dist/compile:1.3 xsrc/external/mit/xf86-video-chips/dist/compile:1.4
--- xsrc/external/mit/xf86-video-chips/dist/compile:1.3 Fri Aug 19 23:30:29 2016
+++ xsrc/external/mit/xf86-video-chips/dist/compile Thu Jul 4 06:40:39 2024
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
# Written by Tom Tromey <tro...@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@ func_file_conv ()
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/*)
+ cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
@@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -339,9 +340,9 @@ exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
Index: xsrc/external/mit/xf86-video-chips/dist/src/ct_BltHiQV.h
diff -u xsrc/external/mit/xf86-video-chips/dist/src/ct_BltHiQV.h:1.2 xsrc/external/mit/xf86-video-chips/dist/src/ct_BltHiQV.h:1.3
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_BltHiQV.h:1.2 Thu Feb 16 15:05:57 2017
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_BltHiQV.h Thu Jul 4 06:40:39 2024
@@ -55,7 +55,7 @@
/* For some odd reason the blitter busy bit occasionly "locks up" when
* it gets polled to fast. However I have observed this behavior only
* when doing ScreenToScreenColorExpandFill on a 65550. This operation
- * was broken anyway (the source offest register is not observed) therefore
+ * was broken anyway (the source offset register is not observed) therefore
* no action was taken.
*
* This function uses indirect access to XR20 to test whether the blitter
Index: xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c
diff -u xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c:1.5 xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c:1.6
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c:1.5 Sun Mar 5 01:32:02 2017
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c Thu Jul 4 06:40:39 2024
@@ -29,7 +29,7 @@
* When monochrome tiles/stipples are cached on the HiQV chipsets the
* pitch of the monochrome data is the displayWidth. The HiQV manuals
* state that the source pitch is ignored with monochrome data, and so
- * "offically" there the XAA cached monochrome data can't be used. But
+ * "officially" there the XAA cached monochrome data can't be used. But
* it appears that by not setting the monochrome source alignment in
* BR03, the monochrome source pitch is forced to the displayWidth!!
*
Index: xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
diff -u xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.29 xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.30
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.29 Sun Mar 3 09:31:52 2019
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c Thu Jul 4 06:40:39 2024
@@ -820,7 +820,7 @@ CHIPSPciProbe(DriverPtr drv, int entity_
cPtr->Chipset = match_data;
/*
* For cards that can do dual head per entity, mark the entity
- * as sharable.
+ * as shareable.
*/
if (match_data == CHIPS_CT69030) {
CHIPSEntPtr cPtrEnt = NULL;
@@ -1859,9 +1859,10 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int
if (xf86LoadSubModule(pScrn, "i2c")) {
if (chips_i2cInit(pScrn)) {
if ((pMon = xf86PrintEDID(xf86DoEDID_DDC2(XF86_SCRN_ARG(pScrn),
- cPtr->I2C))) != NULL)
+ cPtr->I2C))) != NULL) {
ddc_done = TRUE;
xf86SetDDCproperties(pScrn,pMon);
+ }
}
}
/*
@@ -2111,7 +2112,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int
/*
* Some chips seem to dislike some clocks in one of the PLL's. Give
- * the user the oppurtunity to change it
+ * the user the opportunity to change it
*/
if (xf86GetOptValInteger(cPtr->Options, OPTION_CRT_CLK_INDX, &indx)) {
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Force CRT Clock index to %d\n",
@@ -5273,7 +5274,7 @@ chipsModeInit(ScrnInfoPtr pScrn, Display
* Normally the alternalte registers are set by the BIOS to optimized
* values.
* While the horizontal an vertical refresh rates are fixed independent
- * of the visible display size to ensure optimal performace of both
+ * of the visible display size to ensure optimal performance of both
* displays they can be adapted to the screen resolution and CRT
* requirements in CRT mode by programming the standard timing registers
* in the VGA fashion.
@@ -5283,7 +5284,7 @@ chipsModeInit(ScrnInfoPtr pScrn, Display
* by the _alternate_ horizontal and vertical display size registers.
* The size of the visible should always be equal or less than the
* physical size.
- * For the 69030 chipsets, the CRT and LCD display channels are seperate
+ * For the 69030 chipsets, the CRT and LCD display channels are separate
* and so can be driven independently.
*/
static Bool
@@ -5816,7 +5817,7 @@ chipsModeInitWingine(ScrnInfoPtr pScrn,
/*
* This chipset seems to have problems if
- * HBlankEnd is choosen equals HTotal
+ * HBlankEnd is chosen equals HTotal
*/
if (!mode->CrtcHAdjusted)
mode->CrtcHBlankEnd = min(mode->CrtcHSyncEnd, mode->CrtcHTotal - 2);
@@ -6052,7 +6053,7 @@ chipsModeInit655xx(ScrnInfoPtr pScrn, Di
/*
* This chipset seems to have problems if
- * HBlankEnd is choosen equals HTotal
+ * HBlankEnd is chosen equals HTotal
*/
if (!mode->CrtcHAdjusted)
mode->CrtcHBlankEnd = min(mode->CrtcHSyncEnd, mode->CrtcHTotal - 2);
@@ -6484,7 +6485,7 @@ chipsModeInit655xx(ScrnInfoPtr pScrn, Di
}
}
- /* This stuff was emprically derived several years ago. Not sure its
+ /* This stuff was empirically derived several years ago. Not sure its
* still needed, and I'd love to get rid of it as its ugly
*/
switch (cPtr->Chipset) {
@@ -6558,7 +6559,7 @@ chipsRestore(ScrnInfoPtr pScrn, vgaRegPt
/* set extended regs */
chipsRestoreExtendedRegs(pScrn, ChipsReg);
#if 0
- /* if people complain about lock ups or blank screens -- reenable */
+ /* if people complain about lock ups or blank screens -- re-enable */
/* set CRTC registers - do it before sequencer restarts */
for (i=0; i<25; i++)
hwp->writeCrtc(hwp, i, VgaReg->CRTC[i]);
@@ -6584,7 +6585,7 @@ chipsRestore(ScrnInfoPtr pScrn, vgaRegPt
chipsRestoreStretching(pScrn, (unsigned char)ChipsReg->FR[0x40],
(unsigned char)ChipsReg->FR[0x48]);
#if 0
- /* if people report about stretching not working -- reenable */
+ /* if people report about stretching not working -- re-enable */
/* why twice ? :
* sometimes the console is not well restored even if these registers
* are good, re-write the registers works around it
@@ -6599,7 +6600,7 @@ chipsRestore(ScrnInfoPtr pScrn, vgaRegPt
/* perform a synchronous reset */
if (!cPtr->SyncResetIgn) {
if (!IS_HiQV(cPtr)) {
- /* enable syncronous reset on 655xx */
+ /* enable synchronous reset on 655xx */
tmp = cPtr->readXR(cPtr, 0x0E);
cPtr->writeXR(cPtr, 0x0E, tmp & 0x7F);
}
Index: xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h
diff -u xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h:1.2 xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h:1.3
--- xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h:1.2 Mon May 31 21:44:19 2021
+++ xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h Thu Jul 4 06:40:39 2024
@@ -78,32 +78,25 @@
#endif
static __inline__ void
-outb(port, val)
-unsigned long port;
-char val;
+outb(unsigned long port, char val)
{
__asm__ __volatile__("stba %0, [%1] %2" : : "r" (val), "r" (port), "i" (ASI_PL));
}
static __inline__ void
-outw(port, val)
-unsigned long port;
-char val;
+outw(unsigned long port, char val)
{
__asm__ __volatile__("stha %0, [%1] %2" : : "r" (val), "r" (port), "i" (ASI_PL));
}
static __inline__ void
-outl(port, val)
-unsigned long port;
-char val;
+outl(unsigned long port, char val)
{
__asm__ __volatile__("sta %0, [%1] %2" : : "r" (val), "r" (port), "i" (ASI_PL));
}
static __inline__ unsigned int
-inb(port)
-unsigned long port;
+inb(unsigned long port)
{
unsigned char ret;
__asm__ __volatile__("lduba [%1] %2, %0" : "=r" (ret) : "r" (port), "i" (ASI_PL));
@@ -111,8 +104,7 @@ unsigned long port;
}
static __inline__ unsigned int
-inw(port)
-unsigned long port;
+inw(unsigned long port)
{
unsigned char ret;
__asm__ __volatile__("lduha [%1] %2, %0" : "=r" (ret) : "r" (port), "i" (ASI_PL));
@@ -120,8 +112,7 @@ unsigned long port;
}
static __inline__ unsigned int
-inl(port)
-unsigned long port;
+inl(unsigned long port)
{
unsigned char ret;
__asm__ __volatile__("lda [%1] %2, %0" : "=r" (ret) : "r" (port), "i" (ASI_PL));
@@ -132,9 +123,7 @@ unsigned long port;
extern unsigned int IOPortBase; /* Memory mapped I/O port area */
static __inline__ void
-outb(port, val)
- short port;
- char val;
+outb(short port, char val)
{
if ((unsigned short)port >= 0x400) return;
@@ -142,9 +131,7 @@ outb(port, val)
}
static __inline__ void
-outw(port, val)
- short port;
- short val;
+outw(short port, short val)
{
if ((unsigned short)port >= 0x400) return;
@@ -152,9 +139,7 @@ outw(port, val)
}
static __inline__ void
-outl(port, val)
- short port;
- int val;
+outl(short port, int val)
{
if ((unsigned short)port >= 0x400) return;
@@ -162,8 +147,7 @@ outl(port, val)
}
static __inline__ unsigned int
-inb(port)
- short port;
+inb(short port)
{
if ((unsigned short)port >= 0x400) return((unsigned int)-1);
@@ -171,8 +155,7 @@ inb(port)
}
static __inline__ unsigned int
-inw(port)
- short port;
+inw(short port)
{
if ((unsigned short)port >= 0x400) return((unsigned int)-1);
@@ -180,78 +163,13 @@ inw(port)
}
static __inline__ unsigned int
-inl(port)
- short port;
+inl(short port)
{
if ((unsigned short)port >= 0x400) return((unsigned int)-1);
return(*(volatile unsigned long*)(((unsigned short)(port))+IOPortBase));
}
#else /* __arm32__ */
-#if defined(Lynx) && defined(__powerpc__)
-extern unsigned char *ioBase;
-
-static volatile void
-eieio()
-{
- __asm__ __volatile__ ("eieio");
-}
-
-static void
-outb(port, value)
-short port;
-unsigned char value;
-{
- *(uchar *)(ioBase + port) = value; eieio();
-}
-
-static void
-outw(port, value)
-short port;
-unsigned short value;
-{
- *(unsigned short *)(ioBase + port) = value; eieio();
-}
-
-static void
-outl(port, value)
-short port;
-unsigned long value;
-{
- *(unsigned long *)(ioBase + port) = value; eieio();
-}
-
-static unsigned char
-inb(port)
-short port;
-{
- unsigned char val;
-
- val = *((unsigned char *)(ioBase + port)); eieio();
- return(val);
-}
-
-static unsigned short
-inw(port)
-short port;
-{
- unsigned short val;
-
- val = *((unsigned short *)(ioBase + port)); eieio();
- return(val);
-}
-
-static unsigned long
-inl(port)
-short port;
-{
- unsigned long val;
-
- val = *((unsigned long *)(ioBase + port)); eieio();
- return(val);
-}
-
-#else
#if defined(__FreeBSD__) && defined(__alpha__)
#include <sys/types.h>
@@ -266,32 +184,25 @@ extern u_int32_t inl(u_int32_t port);
#else
#ifdef GCCUSESGAS
static __inline__ void
-outb(port, val)
-short port;
-char val;
+outb(short port, char val)
{
__asm__ __volatile__("outb %0,%1" : :"a" (val), "d" (port));
}
static __inline__ void
-outw(port, val)
-short port;
-short val;
+outw(short portm, short val)
{
__asm__ __volatile__("outw %0,%1" : :"a" (val), "d" (port));
}
static __inline__ void
-outl(port, val)
-short port;
-unsigned int val;
+outl(short port, unsigned int val)
{
__asm__ __volatile__("outl %0,%1" : :"a" (val), "d" (port));
}
static __inline__ unsigned int
-inb(port)
-short port;
+inb(short port)
{
unsigned char ret;
__asm__ __volatile__("inb %1,%0" :
@@ -301,8 +212,7 @@ short port;
}
static __inline__ unsigned int
-inw(port)
-short port;
+inw(short port)
{
unsigned short ret;
__asm__ __volatile__("inw %1,%0" :
@@ -312,8 +222,7 @@ short port;
}
static __inline__ unsigned int
-inl(port)
-short port;
+inl(short port)
{
unsigned int ret;
__asm__ __volatile__("inl %1,%0" :
@@ -325,32 +234,25 @@ short port;
#else /* GCCUSESGAS */
static __inline__ void
-outb(port, val)
- short port;
- char val;
+outb(short port, char val)
{
__asm__ __volatile__("out%B0 (%1)" : :"a" (val), "d" (port));
}
static __inline__ void
-outw(port, val)
- short port;
- short val;
+outw(short port, short val)
{
__asm__ __volatile__("out%W0 (%1)" : :"a" (val), "d" (port));
}
static __inline__ void
-outl(port, val)
- short port;
- unsigned int val;
+outl(short port, unsigned int val)
{
__asm__ __volatile__("out%L0 (%1)" : :"a" (val), "d" (port));
}
static __inline__ unsigned int
-inb(port)
- short port;
+inb(short port)
{
unsigned int ret;
__asm__ __volatile__("in%B0 (%1)" :
@@ -360,8 +262,7 @@ inb(port)
}
static __inline__ unsigned int
-inw(port)
- short port;
+inw(short port)
{
unsigned int ret;
__asm__ __volatile__("in%W0 (%1)" :
@@ -371,8 +272,7 @@ inw(port)
}
static __inline__ unsigned int
-inl(port)
- short port;
+inl(short port)
{
unsigned int ret;
__asm__ __volatile__("in%L0 (%1)" :
@@ -382,13 +282,12 @@ inl(port)
}
#endif /* GCCUSESGAS */
-#endif /* Lynx && __powerpc__ */
#endif /* arm32 */
#endif /* linux && __sparc__ */
#endif /* linux && __alpha__ */
#endif /* __FreeBSD__ && __alpha__ */
-#if defined(linux) || defined(__arm32__) || (defined(Lynx) && defined(__powerpc__))
+#if defined(linux) || defined(__arm32__)
#define intr_disable()
#define intr_enable()
@@ -396,13 +295,13 @@ inl(port)
#else
static __inline__ void
-intr_disable()
+intr_disable(void)
{
__asm__ __volatile__("cli");
}
static __inline__ void
-intr_enable()
+intr_enable(void)
{
__asm__ __volatile__("sti");
}
@@ -426,21 +325,12 @@ void outl(U16_t, U32_t);
#else /* not _MINIX and _ACK */
# if defined(__STDC__) && (__STDC__ == 1)
-# ifndef NCR
# define asm __asm
-# endif
# endif
# ifdef SVR4
# include <sys/types.h>
-# ifndef __USLC__
-# define __USLC__
-# endif
-# endif
-# ifndef __SCO__
-# include <sys/inline.h>
-# else
-# include "../common/scoasm.h"
# endif
+# include <sys/inline.h>
# define intr_disable() asm("cli")
# define intr_enable() asm("sti")
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c:1.4 xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c:1.5
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c:1.4 Sat Aug 20 00:27:22 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c Thu Jul 4 06:40:39 2024
@@ -151,7 +151,7 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
{
G80Ptr pNv;
EntityInfoPtr pEnt;
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
struct pci_device *pPci;
int err;
void *p;
@@ -184,14 +184,14 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
if(pEnt->location.type != BUS_PCI) goto fail;
pPci = xf86GetPciInfoForEntity(pEnt->index);
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
/* Need this to unmap */
pNv->pPci = pPci;
#endif
primary = xf86IsPrimaryPci(pPci);
/* The ROM size sometimes isn't read correctly, so fix it up here. */
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
if(pPci->rom_size == 0)
/* The BIOS is 64k */
pPci->rom_size = 64 * 1024;
@@ -304,7 +304,7 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
pScrn->memPhysBase = MEMBASE(pPci, 1);
pScrn->fbOffset = 0;
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
err = pci_device_map_range(pPci, pPci->regions[0].base_addr, G80_REG_SIZE,
PCI_DEV_MAP_FLAG_WRITABLE, &p);
if(err) {
@@ -336,7 +336,7 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
/* Determine the size of BAR1 */
/* Some configs have BAR1 < total RAM < 256 MB */
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
BAR1sizeKB = pPci->regions[1].size / 1024;
#else
BAR1sizeKB = 1UL << (pPci->size[1] - 10);
@@ -366,7 +366,7 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, " Mapped memory: %.1f MB\n",
pScrn->videoRam / 1024.0);
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
err = pci_device_map_range(pPci, pPci->regions[1].base_addr,
pScrn->videoRam * 1024,
PCI_DEV_MAP_FLAG_WRITABLE |
@@ -521,7 +521,7 @@ G80CloseScreen(CLOSE_SCREEN_ARGS_DECL)
if(xf86ServerIsExiting()) {
if(pNv->int10) xf86FreeInt10(pNv->int10);
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
pci_device_unmap_range(pNv->pPci, pNv->mem, pNv->videoRam * 1024);
pci_device_unmap_range(pNv->pPci, (void*)pNv->reg, G80_REG_SIZE);
#else
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h:1.4 xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h:1.5
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h:1.4 Sat Aug 20 00:27:22 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h Thu Jul 4 06:40:39 2024
@@ -42,7 +42,7 @@ typedef enum AccelMethod {
} AccelMethod;
typedef struct G80Rec {
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
struct pci_device *pPci;
#endif
volatile CARD32 * reg;
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h:1.4 xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h:1.5
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h:1.4 Thu Jul 26 21:29:16 2018
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h Thu Jul 4 06:40:39 2024
@@ -79,7 +79,7 @@ typedef struct {
CARD32 Architecture;
CARD32 CursorStart;
EntityInfoPtr pEnt;
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
struct pci_device *PciInfo;
#else
pciVideoPtr PciInfo;
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c:1.3 xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c:1.4
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c:1.3 Wed Sep 21 17:58:18 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c Thu Jul 4 06:40:39 2024
@@ -28,6 +28,7 @@
#include "g80_type.h"
#include "g80_dma.h"
+#include "g80_exa.h"
#include "g80_xaa.h"
static void
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.3 xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.4
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.3 Fri May 21 19:09:50 2021
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c Thu Jul 4 06:40:39 2024
@@ -315,7 +315,7 @@ static void nv10GetConfig (NVPtr pNv)
}
#endif
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
{
/* [AGP]: I don't know if this is correct */
struct pci_device *dev = pci_device_find_by_slot(0, 0, 0, 1);
@@ -374,7 +374,7 @@ NVCommonSetup(ScrnInfoPtr pScrn)
int FlatPanel = -1; /* really means the CRTC is slaved */
Bool Television = FALSE;
void *tmp;
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
int err;
#endif
@@ -406,7 +406,7 @@ NVCommonSetup(ScrnInfoPtr pScrn)
pVga->MMIOBase = (CARD8 *)pNv;
pVga->MMIOOffset = 0;
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
err = pci_device_map_range(pNv->PciInfo, pNv->IOAddress, 0x01000000,
PCI_DEV_MAP_FLAG_WRITABLE, &tmp);
if (err != 0) {
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c:1.3 xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c:1.4
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c:1.3 Thu Jul 26 21:29:16 2018
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c Thu Jul 4 06:40:39 2024
@@ -72,6 +72,7 @@ static const int NVCopyROP_PM[16] =
0xFA /* GXset */
};
+#ifdef HAVE_XAA_H
static const int NVPatternROP[16] =
{
0x00,
@@ -91,6 +92,7 @@ static const int NVPatternROP[16] =
0x5F,
0xFF
};
+#endif
void
NVDmaKickoff(NVPtr pNv)
@@ -305,7 +307,8 @@ crap:
NVResetGraphics(pScrn);
}
- void
+#ifdef HAVE_XAA_H
+static void
NVDMAKickoffCallback (ScrnInfoPtr pScrn)
{
NVPtr pNv = NVPTR(pScrn);
@@ -314,7 +317,6 @@ NVDMAKickoffCallback (ScrnInfoPtr pScrn)
pNv->DMAKickoffCallback = NULL;
}
-#ifdef HAVE_XAA_H
static void
NVSetupForScreenToScreenCopy(
ScrnInfoPtr pScrn,
Index: xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c:1.3 xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c:1.4
--- xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c:1.3 Mon Dec 31 13:02:41 2018
+++ xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c Thu Jul 4 06:40:39 2024
@@ -316,7 +316,7 @@ rivaProbeDDC(ScrnInfoPtr pScrn, int inde
Bool RivaI2CInit(ScrnInfoPtr pScrn)
{
- char *mod = "i2c";
+ const char *mod = "i2c";
if (xf86LoadSubModule(pScrn, mod)) {
@@ -385,7 +385,7 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags
/* Find the PCI info for this screen */
pRiva->PciInfo = xf86GetPciInfoForEntity(pRiva->pEnt->index);
-#if !XSERVER_LIBPCIACCESS
+#ifndef XSERVER_LIBPCIACCESS
pRiva->PciTag = pciTag(pRiva->PciInfo->bus, pRiva->PciInfo->device,
pRiva->PciInfo->func);
#endif
@@ -825,7 +825,7 @@ RivaMapMem(ScrnInfoPtr pScrn)
/*
* Map IO registers to virtual address space
*/
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
void *tmp;
pci_device_map_range(pRiva->PciInfo, pRiva->IOAddress, 0x1000000,
@@ -890,7 +890,7 @@ RivaUnmapMem(ScrnInfoPtr pScrn)
/*
* Unmap IO registers to virtual address space
*/
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
pci_device_unmap_range(pRiva->PciInfo, pRiva->IOBase, 0x1000000);
pci_device_unmap_range(pRiva->PciInfo, pRiva->FbBase, pRiva->FbMapSize);
#else
@@ -1210,11 +1210,15 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
case 16: refreshArea = RivaRefreshArea16; break;
case 32: refreshArea = RivaRefreshArea32; break;
}
-#if 0
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24
xf86DisableRandR();
#endif
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Driver rotation enabled, RandR disabled\n");
+#else
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Driver rotation enabled\n");
+#endif
}
ShadowFBInit(pScreen, refreshArea);
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.13 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.14
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.13 Sat Jul 30 17:03:51 2022
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c Thu Jul 4 06:40:39 2024
@@ -43,7 +43,7 @@ Bool G80GetScrnInfoRec(PciChipsets *c
/* Mandatory functions */
static const OptionInfoRec * NVAvailableOptions(int chipid, int busid);
static void NVIdentify(int flags);
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
static Bool NVPciProbe(DriverPtr, int entity, struct pci_device*, intptr_t data);
#else
static Bool NVProbe(DriverPtr drv, int flags);
@@ -76,7 +76,7 @@ static void NVRestore(ScrnInfoPtr pScrn)
static Bool NVModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
static Bool NVSetModeVBE(ScrnInfoPtr pScrn, DisplayModePtr pMode);
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
/* For now, just match any NVIDIA display device and sort through them in the
* probe routine */
@@ -109,7 +109,7 @@ _X_EXPORT DriverRec NV = {
NV_VERSION,
NV_DRIVER_NAME,
NVIdentify,
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
NULL,
#else
NVProbe,
@@ -118,7 +118,7 @@ _X_EXPORT DriverRec NV = {
NULL,
0,
NULL,
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
NVPciIdMatchList,
NVPciProbe,
#endif
@@ -712,7 +712,7 @@ nvSetup(pointer module, pointer opts, in
if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(&NV, module,
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
HaveDriverFuncs
#else
0
@@ -766,7 +766,7 @@ NVGetScrnInfoRec(PciChipsets *chips, int
pScrn->driverName = NV_DRIVER_NAME;
pScrn->name = NV_NAME;
-#if !XSERVER_LIBPCIACCESS
+#ifndef XSERVER_LIBPCIACCESS
pScrn->Probe = NVProbe;
#endif
pScrn->PreInit = NVPreInit;
@@ -785,14 +785,14 @@ NVGetScrnInfoRec(PciChipsets *chips, int
static CARD32
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
NVGetPCIXpressChip (struct pci_device *dev)
#else
NVGetPCIXpressChip (pciVideoPtr pVideo)
#endif
{
volatile CARD32 *regs;
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
uint32_t pciid, pcicmd;
void *tmp;
@@ -902,7 +902,7 @@ NVIsSupported(CARD32 id)
}
/* Mandatory */
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
static Bool
NVPciProbe(DriverPtr drv, int entity, struct pci_device *dev, intptr_t data)
{
@@ -1305,7 +1305,7 @@ nvProbeDDC(ScrnInfoPtr pScrn, int index)
Bool NVI2CInit(ScrnInfoPtr pScrn)
{
- char *mod = "i2c";
+ const char *mod = "i2c";
if (xf86LoadSubModule(pScrn, mod)) {
@@ -1400,7 +1400,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
/* Find the PCI info for this screen */
pNv->PciInfo = xf86GetPciInfoForEntity(pNv->pEnt->index);
-#if !XSERVER_LIBPCIACCESS
+#ifndef XSERVER_LIBPCIACCESS
pNv->PciTag = pciTag(pNv->PciInfo->bus, pNv->PciInfo->device,
pNv->PciInfo->func);
#endif
@@ -1553,7 +1553,11 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
xf86FreeInt10(pNv->pInt);
return FALSE;
}
+#ifdef __powerpc__ /* XXX probably MI */
+ vgaHWSetMmioFuncs(VGAHWPTR(pScrn), pNv->IOAddress, 0);
+#else
vgaHWSetStdFuncs(VGAHWPTR(pScrn));
+#endif
/* We use a programmable clock */
pScrn->progClock = TRUE;
@@ -2120,7 +2124,7 @@ NVMapMem(ScrnInfoPtr pScrn)
{
NVPtr pNv = NVPTR(pScrn);
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
void *tmp;
pci_device_map_range(pNv->PciInfo, pNv->FbAddress, pNv->FbMapSize,
@@ -2167,7 +2171,7 @@ NVUnmapMem(ScrnInfoPtr pScrn)
pNv = NVPTR(pScrn);
-#if XSERVER_LIBPCIACCESS
+#ifdef XSERVER_LIBPCIACCESS
pci_device_unmap_range(pNv->PciInfo, pNv->FbBase, pNv->FbMapSize);
#else
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pNv->FbBase, pNv->FbMapSize);
@@ -2657,11 +2661,15 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
case 32: refreshArea = NVRefreshArea32; break;
}
if(!pNv->RandRRotation) {
-#if 0
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24
xf86DisableRandR();
#endif
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Driver rotation enabled, RandR disabled\n");
+#else
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Driver rotation enabled\n");
+#endif
}
}
pNv->refreshArea = refreshArea;
Index: xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.c
diff -u xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.c:1.6 xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.c:1.7
--- xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.c:1.6 Mon Jun 19 09:06:01 2023
+++ xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.c Thu Jul 4 06:40:39 2024
@@ -1370,9 +1370,6 @@ SAVAGEDRIMoveBuffers(WindowPtr pParent,
#endif
}
-/* Definition in savage_accel.c */
-int SavageGetCopyROP(int rop);
-
static void
SAVAGEDRISetupForScreenToScreenCopy(
ScrnInfoPtr pScrn,
Index: xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c
diff -u xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c:1.5 xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c:1.6
--- xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c:1.5 Mon Jun 19 09:06:01 2023
+++ xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c Thu Jul 4 06:40:39 2024
@@ -1236,21 +1236,31 @@ static Bool SavagePreInit(ScrnInfoPtr pS
psav->shadowFB = TRUE;
psav->rotate = 1;
-#if 0
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24
xf86DisableRandR();
#endif
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"Rotating screen clockwise"
"- acceleration and RandR disabled\n");
+#else
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+ "Rotating screen clockwise"
+ "- acceleration disabled\n");
+#endif
} else if(!xf86NameCmp(s, "CCW")) {
psav->shadowFB = TRUE;
psav->rotate = -1;
-#if 0
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24
xf86DisableRandR();
#endif
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"Rotating screen counter clockwise"
" - acceleration and RandR disabled\n");
+#else
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+ "Rotating screen counter clockwise"
+ " - acceleration disabled\n");
+#endif
} else {
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "\"%s\" is not a valid"
@@ -2155,15 +2165,14 @@ static Bool SavagePreInit(ScrnInfoPtr pS
}
if( !psav->NoAccel ) {
- const char *modName = NULL;
-
if (psav->useEXA) {
- modName = "exa";
- XF86ModReqInfo req;
+ const char *modName = "exa";
+
+ XF86ModReqInfo req = {
+ .majorversion = 2,
+ .minorversion = 0
+ };
int errmaj, errmin;
- memset(&req, 0, sizeof(req));
- req.majorversion = 2;
- req.minorversion = 0;
if( !LoadSubModule(pScrn->module, modName,
NULL, NULL, NULL, &req, &errmaj, &errmin) ) {
@@ -2174,7 +2183,8 @@ static Bool SavagePreInit(ScrnInfoPtr pS
return FALSE;
}
} else {
- modName = "xaa";
+ const char *modName = "xaa";
+
if( !xf86LoadSubModule(pScrn, modName) ) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Falling back to shadowfb\n");
@@ -3670,8 +3680,6 @@ static Bool SavageModeInit(ScrnInfoPtr p
SavageRegPtr new = &psav->ModeReg;
vgaRegPtr vganew = &hwp->ModeReg;
int vgaCRIndex, vgaCRReg, vgaIOBase;
- int refresh;
- unsigned int newmode=0, newrefresh=0;
vgaIOBase = hwp->IOBase;
vgaCRIndex = vgaIOBase + 4;
@@ -3700,7 +3708,8 @@ static Bool SavageModeInit(ScrnInfoPtr p
#endif
if (psav->IsSecondary) {
- refresh = SavageGetRefresh(mode);
+ int refresh = SavageGetRefresh(mode);
+ unsigned int newmode=0, newrefresh=0;
SavageMatchBiosMode(pScrn,mode->HDisplay,mode->VDisplay,refresh,
&newmode,&newrefresh);
@@ -3720,6 +3729,7 @@ static Bool SavageModeInit(ScrnInfoPtr p
}
+#if 0
if (pScrn->bitsPerPixel == 8)
psav->HorizScaleFactor = 1;
else if (pScrn->bitsPerPixel == 16)
@@ -3738,6 +3748,9 @@ static Bool SavageModeInit(ScrnInfoPtr p
mode->CrtcHSkew *= 2;
mode->CrtcHAdjusted = TRUE;
}
+#else
+ psav->HorizScaleFactor = 1;
+#endif
if (!vgaHWInit(pScrn, mode))
return FALSE;
@@ -4303,15 +4316,15 @@ void SavageLoadPaletteSavage4(ScrnInfoPt
LOCO *colors, VisualPtr pVisual)
{
SavagePtr psav = SAVPTR(pScrn);
- int i, index;
+ int index;
int updateKey = -1;
VerticalRetraceWait();
- for (i=0; i<numColors; i++) {
- if (!(inStatus1() & 0x08))
+ for (int n = 0; n < numColors; n++) {
+ if (!(inStatus1() & 0x08))
VerticalRetraceWait();
- index = indices[i];
+ index = indices[n];
VGAOUT8(0x3c8, index);
VGAOUT8(0x3c9, colors[index].red);
VGAOUT8(0x3c9, colors[index].green);
Index: xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h
diff -u xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h:1.7 xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h:1.8
--- xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h:1.7 Mon Jun 19 09:06:01 2023
+++ xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h Thu Jul 4 06:40:39 2024
@@ -598,6 +598,7 @@ void SavageHideCursor(ScrnInfoPtr);
Bool SavageInitAccel(ScreenPtr);
void SavageInitialize2DEngine(ScrnInfoPtr);
+int SavageGetCopyROP(int rop);
void SavageSetGBD(ScrnInfoPtr);
void SavageAccelSync(ScrnInfoPtr);
/*int SavageHelpSolidROP(ScrnInfoPtr pScrn, int *fg, int pm, int *rop);*/
Index: xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c
diff -u xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c:1.2 xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c:1.3
--- xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c:1.2 Thu Mar 20 01:04:22 2014
+++ xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c Thu Jul 4 06:40:39 2024
@@ -69,9 +69,6 @@ SavageDownloadFromScreen(PixmapPtr pSrc,
#define GXset 0xFF
#endif
-/* Definition moved to savage_accel.c */
-int SavageGetCopyROP(int rop);
-
static int SavageGetSolidROP(int rop) {
int ALUSolidROP[16] =
@@ -567,7 +564,7 @@ SavageUploadToScreen(PixmapPtr pDst, int
Bool
SavageDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst, int dst_pitch)
{
- unsigned char *src = (unsigned char *) (unsigned long) exaGetPixmapFirstPixel(pSrc);
+ unsigned char *src = pSrc->devPrivate.ptr;
int src_pitch = exaGetPixmapPitch(pSrc);
int bpp = pSrc->drawable.bitsPerPixel;
Index: xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h
diff -u xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h:1.9 xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h:1.10
--- xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h:1.9 Tue May 30 15:55:25 2017
+++ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h Thu Jul 4 06:40:39 2024
@@ -400,7 +400,7 @@ Bool SMI_MapMem(ScrnInfoPtr pScrn);
void SMI_UnmapMem(ScrnInfoPtr pScrn);
void SMI_AdjustFrame(ADJUST_FRAME_ARGS_DECL);
Bool SMI_SwitchMode(SWITCH_MODE_ARGS_DECL);
-void SMI_LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies,
+void SMI_LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
LOCO *colors, VisualPtr pVisual);
xf86MonPtr SMI_ddc1(ScrnInfoPtr pScrn);
void SMI_PrintRegs(ScrnInfoPtr pScrn);
Index: xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c
diff -u xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.9 xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.10
--- xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.9 Sun Mar 5 01:42:54 2017
+++ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c Thu Jul 4 06:40:39 2024
@@ -110,7 +110,7 @@ int gSMIEntityIndex = -1;
/*
* This contains the functions needed by the server after loading the
* driver module. It must be supplied, and gets added the driver list by
- * the Module Setup funtion in the dynamic case. In the static case a
+ * the Module Setup function in the dynamic case. In the static case a
* reference to this is compiled in, and this requires that the name of
* this DriverRec be an upper-case version of the driver name.
*/
@@ -950,7 +950,7 @@ SMI_EnterVT(VT_FUNC_ARGS_DECL)
"Done writing mode. Register dump:\n");
SMI_PrintRegs(pScrn);
- /* Reset the grapics engine */
+ /* Reset the graphics engine */
if (!pSmi->NoAccel)
SMI_EngineReset(pScrn);
@@ -1661,7 +1661,7 @@ SMI_ScreenInit(SCREEN_INIT_ARGS_DECL)
/*
* The next step is to setup the screen's visuals, and initialise the
- * framebuffer code. In cases where the framebuffer's default choises for
+ * framebuffer code. In cases where the framebuffer's default choices for
* things like visual layouts and bits per RGB are OK, this may be as simple
* as calling the framebuffer's ScreenInit() function. If not, the visuals
* will need to be setup before calling a fb ScreenInit() function and fixed
@@ -1933,7 +1933,7 @@ SMI_SwitchMode(SWITCH_MODE_ARGS_DECL)
}
void
-SMI_LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies,
+SMI_LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
LOCO *colors, VisualPtr pVisual)
{
xf86CrtcConfigPtr crtcConf = XF86_CRTC_CONFIG_PTR(pScrn);
@@ -1948,7 +1948,7 @@ SMI_LoadPalette(ScrnInfoPtr pScrn, int n
SMICrtcPrivatePtr crtcPriv = SMICRTC(crtcConf->crtc[crtc_idx]);
for(i=0; i<numColors; i++){
- int idx = indicies[i];
+ int idx = indices[i];
if(idx<32){
for(j=0; j<8; j++){
@@ -1968,7 +1968,7 @@ SMI_LoadPalette(ScrnInfoPtr pScrn, int n
SMICrtcPrivatePtr crtcPriv = SMICRTC(crtcConf->crtc[crtc_idx]);
for(i = 0; i < numColors; i++) {
- int idx = indicies[i];
+ int idx = indices[i];
crtcPriv->lut_r[idx] = colors[idx].red << 8;
crtcPriv->lut_g[idx] = colors[idx].green << 8;
Index: xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c
diff -u xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c:1.2 xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c:1.3
--- xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c:1.2 Mon Aug 1 22:17:27 2022
+++ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c Thu Jul 4 06:40:39 2024
@@ -53,7 +53,7 @@ SMI_OutputModeValid(xf86OutputPtr output
/* FIXME May also need to test for IS_MSOC(pSmi) here.
* Only accept modes matching the panel size because the panel cannot
- * be centered neither shrinked/expanded due to hardware bugs.
+ * be centered neither shrunk/expanded due to hardware bugs.
* Note that as long as plane tr/br and plane window x/y are set to 0
* and the mode height matches the panel height, it will work and
* set the mode, but at offset 0, and properly program the crt.
Index: xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.am
diff -u xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.am:1.2 xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.am:1.3
--- xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.am:1.2 Thu Oct 22 20:47:23 2020
+++ xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.am Thu Jul 4 06:40:40 2024
@@ -27,7 +27,7 @@
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS) \
+AM_CFLAGS = $(BASE_CFLAGS) $(XORG_CFLAGS) $(PCIACCESS_CFLAGS) \
-DXORG_7X \
-DIN_RING3 \
-DPCIACCESS \
@@ -41,7 +41,6 @@ vboxvideo_drv_ladir = @moduledir@/driver
vboxvideo_drv_la_SOURCES = \
edid.c \
getmode.c \
- helpers.c \
HGSMIBase.c \
HGSMIBase.h \
HGSMIBuffers.c \
Index: xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.in
diff -u xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.in:1.2 xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.in:1.3
--- xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.in:1.2 Thu Oct 22 20:47:23 2020
+++ xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.in Thu Jul 4 06:40:40 2024
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -156,10 +156,9 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(vboxvideo_drv_ladir)"
LTLIBRARIES = $(vboxvideo_drv_la_LTLIBRARIES)
vboxvideo_drv_la_LIBADD =
-am_vboxvideo_drv_la_OBJECTS = edid.lo getmode.lo helpers.lo \
- HGSMIBase.lo HGSMIBuffers.lo HGSMICommon.lo hgsmimemalloc.lo \
- Modesetting.lo pointer.lo setmode.lo vboxvideo.lo VBVABase.lo \
- vbva.lo
+am_vboxvideo_drv_la_OBJECTS = edid.lo getmode.lo HGSMIBase.lo \
+ HGSMIBuffers.lo HGSMICommon.lo hgsmimemalloc.lo Modesetting.lo \
+ pointer.lo setmode.lo vboxvideo.lo VBVABase.lo vbva.lo
vboxvideo_drv_la_OBJECTS = $(am_vboxvideo_drv_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -183,7 +182,14 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/HGSMIBase.Plo \
+ ./$(DEPDIR)/HGSMIBuffers.Plo ./$(DEPDIR)/HGSMICommon.Plo \
+ ./$(DEPDIR)/Modesetting.Plo ./$(DEPDIR)/VBVABase.Plo \
+ ./$(DEPDIR)/edid.Plo ./$(DEPDIR)/getmode.Plo \
+ ./$(DEPDIR)/hgsmimemalloc.Plo ./$(DEPDIR)/pointer.Plo \
+ ./$(DEPDIR)/setmode.Plo ./$(DEPDIR)/vboxvideo.Plo \
+ ./$(DEPDIR)/vbva.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -227,8 +233,6 @@ am__define_uniq_tagged_files = \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -248,8 +252,9 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
CWARNFLAGS = @CWARNFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -264,8 +269,10 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
+ETAGS = @ETAGS@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+FILECMD = @FILECMD@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
@@ -377,7 +384,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS) \
+AM_CFLAGS = $(BASE_CFLAGS) $(XORG_CFLAGS) $(PCIACCESS_CFLAGS) \
-DXORG_7X \
-DIN_RING3 \
-DPCIACCESS \
@@ -390,7 +397,6 @@ vboxvideo_drv_ladir = @moduledir@/driver
vboxvideo_drv_la_SOURCES = \
edid.c \
getmode.c \
- helpers.c \
HGSMIBase.c \
HGSMIBase.h \
HGSMIBuffers.c \
@@ -437,8 +443,8 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -494,19 +500,24 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HGSMIBase.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HGSMIBuffers.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HGSMICommon.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Modesetting.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VBVABase.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edid.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getmode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helpers.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hgsmimemalloc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setmode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vboxvideo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vbva.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HGSMIBase.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HGSMIBuffers.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HGSMICommon.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Modesetting.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VBVABase.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edid.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getmode.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hgsmimemalloc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointer.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setmode.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vboxvideo.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vbva.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -586,8 +597,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -660,7 +673,18 @@ clean-am: clean-generic clean-libtool \
clean-vboxvideo_drv_laLTLIBRARIES mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/HGSMIBase.Plo
+ -rm -f ./$(DEPDIR)/HGSMIBuffers.Plo
+ -rm -f ./$(DEPDIR)/HGSMICommon.Plo
+ -rm -f ./$(DEPDIR)/Modesetting.Plo
+ -rm -f ./$(DEPDIR)/VBVABase.Plo
+ -rm -f ./$(DEPDIR)/edid.Plo
+ -rm -f ./$(DEPDIR)/getmode.Plo
+ -rm -f ./$(DEPDIR)/hgsmimemalloc.Plo
+ -rm -f ./$(DEPDIR)/pointer.Plo
+ -rm -f ./$(DEPDIR)/setmode.Plo
+ -rm -f ./$(DEPDIR)/vboxvideo.Plo
+ -rm -f ./$(DEPDIR)/vbva.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -706,7 +730,18 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/HGSMIBase.Plo
+ -rm -f ./$(DEPDIR)/HGSMIBuffers.Plo
+ -rm -f ./$(DEPDIR)/HGSMICommon.Plo
+ -rm -f ./$(DEPDIR)/Modesetting.Plo
+ -rm -f ./$(DEPDIR)/VBVABase.Plo
+ -rm -f ./$(DEPDIR)/edid.Plo
+ -rm -f ./$(DEPDIR)/getmode.Plo
+ -rm -f ./$(DEPDIR)/hgsmimemalloc.Plo
+ -rm -f ./$(DEPDIR)/pointer.Plo
+ -rm -f ./$(DEPDIR)/setmode.Plo
+ -rm -f ./$(DEPDIR)/vboxvideo.Plo
+ -rm -f ./$(DEPDIR)/vbva.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -727,15 +762,15 @@ uninstall-am: uninstall-vboxvideo_drv_la
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-vboxvideo_drv_laLTLIBRARIES cscopelist-am \
- ctags ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+ clean-generic clean-libtool clean-vboxvideo_drv_laLTLIBRARIES \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
install-vboxvideo_drv_laLTLIBRARIES installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
Index: xsrc/external/mit/xf86-video-vboxvideo/dist/src/VBoxVideoIPRT.h
diff -u xsrc/external/mit/xf86-video-vboxvideo/dist/src/VBoxVideoIPRT.h:1.2 xsrc/external/mit/xf86-video-vboxvideo/dist/src/VBoxVideoIPRT.h:1.3
--- xsrc/external/mit/xf86-video-vboxvideo/dist/src/VBoxVideoIPRT.h:1.2 Thu Jan 31 20:46:43 2019
+++ xsrc/external/mit/xf86-video-vboxvideo/dist/src/VBoxVideoIPRT.h Thu Jul 4 06:40:40 2024
@@ -1,6 +1,6 @@
-/* $Id: VBoxVideoIPRT.h,v 1.2 2019/01/31 20:46:43 christos Exp $ */
+/* $Id: VBoxVideoIPRT.h,v 1.3 2024/07/04 06:40:40 mrg Exp $ */
/*
- * Copyright (C) 2017 Oracle Corporation
+ * Copyright (C) 2017, 2024, Oracle and/or its affiliates.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -30,11 +30,15 @@
# include "VBoxVideoErr.h"
#ifndef __cplusplus
+#if __STDC_VERSION__ >= 199901L
+#include <stdbool.h>
+#else
typedef enum
{
false = 0,
true
} bool;
+#endif
# define RT_C_DECLS_BEGIN
# define RT_C_DECLS_END
#else
@@ -69,13 +73,34 @@ RT_C_DECLS_END
# include <string.h>
#endif /* !(defined(IN_XF86_MODULE) && !defined(NO_ANSIC)) */
+#ifndef __has_feature
+# define __has_feature(x) 0
+#endif
+#if __has_feature(cxx_static_assert) || __has_feature(c_static_assert)
+# define RTASSERT_HAVE_STATIC_ASSERT
+#elif defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__)
+# define RTASSERT_HAVE_STATIC_ASSERT
+#elif !defined(__cplusplus) && (__STDC_VERSION__ >= 201112L)
+# define RTASSERT_HAVE_STATIC_ASSERT
+#endif
+
+#if !defined(__cplusplus) || !defined(RTASSERT_HAVE_STATIC_ASSERT)
RT_C_DECLS_BEGIN
extern int RTASSERTVAR[1];
RT_C_DECLS_END
+#endif
-#define AssertCompile(expr) \
+#ifdef RTASSERT_HAVE_STATIC_ASSERT
+# ifdef __cplusplus
+# define AssertCompile(expr) static_assert(!!(expr), #expr)
+# else
+# define AssertCompile(expr) _Static_assert(!!(expr), #expr)
+# endif
+#else
+# define AssertCompile(expr) \
extern int RTASSERTVAR[1] __attribute__((__unused__)), \
RTASSERTVAR[(expr) ? 1 : 0] __attribute__((__unused__))
+#endif
#define AssertCompileSize(type, size) \
AssertCompile(sizeof(type) == (size))
#define AssertPtrNullReturnVoid(a) do { } while(0)
@@ -141,7 +166,7 @@ RT_C_DECLS_END
#define unlikely _X_UNLIKELY
/**
- * A point in a two dimentional coordinate system.
+ * A point in a two dimensional coordinate system.
*/
typedef struct RTPOINT
{
Index: xsrc/external/mit/xf86-video-vboxvideo/dist/src/edid.c
diff -u xsrc/external/mit/xf86-video-vboxvideo/dist/src/edid.c:1.2 xsrc/external/mit/xf86-video-vboxvideo/dist/src/edid.c:1.3
--- xsrc/external/mit/xf86-video-vboxvideo/dist/src/edid.c:1.2 Thu Oct 22 20:47:23 2020
+++ xsrc/external/mit/xf86-video-vboxvideo/dist/src/edid.c Thu Jul 4 06:40:40 2024
@@ -1,4 +1,4 @@
-/* $Id: edid.c,v 1.2 2020/10/22 20:47:23 thorpej Exp $ */
+/* $Id: edid.c,v 1.3 2024/07/04 06:40:40 mrg Exp $ */
/** @file
*
* Linux Additions X11 graphics driver, EDID construction
@@ -36,6 +36,10 @@
* Michael Thayer <michael.tha...@oracle.com>
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "misc.h"
#include "xf86DDC.h"
#include "xf86Crtc.h"
Index: xsrc/external/mit/xf86-video-vboxvideo/dist/src/pointer.c
diff -u xsrc/external/mit/xf86-video-vboxvideo/dist/src/pointer.c:1.2 xsrc/external/mit/xf86-video-vboxvideo/dist/src/pointer.c:1.3
--- xsrc/external/mit/xf86-video-vboxvideo/dist/src/pointer.c:1.2 Thu Oct 22 20:47:23 2020
+++ xsrc/external/mit/xf86-video-vboxvideo/dist/src/pointer.c Thu Jul 4 06:40:40 2024
@@ -1,4 +1,4 @@
-/* $Id: pointer.c,v 1.2 2020/10/22 20:47:23 thorpej Exp $ */
+/* $Id: pointer.c,v 1.3 2024/07/04 06:40:40 mrg Exp $ */
/** @file
* VirtualBox X11 Additions graphics driver utility functions
*/
@@ -25,6 +25,10 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifndef PCIACCESS
# include "xf86Pci.h"
# include <Pci.h>
Index: xsrc/external/mit/xf86-video-vboxvideo/include/config.h
diff -u xsrc/external/mit/xf86-video-vboxvideo/include/config.h:1.1 xsrc/external/mit/xf86-video-vboxvideo/include/config.h:1.2
--- xsrc/external/mit/xf86-video-vboxvideo/include/config.h:1.1 Thu Jan 10 00:06:27 2019
+++ xsrc/external/mit/xf86-video-vboxvideo/include/config.h Thu Jul 4 06:40:40 2024
@@ -52,7 +52,7 @@
#define PACKAGE_NAME "xf86-video-vboxvideo"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xf86-video-vboxvideo 1.0.0"
+#define PACKAGE_STRING "xf86-video-vboxvideo 1.0.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xf86-video-vboxvideo"
@@ -61,7 +61,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.0"
+#define PACKAGE_VERSION "1.0.1"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 1
@@ -70,10 +70,10 @@
#define PACKAGE_VERSION_MINOR 0
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 0
+#define PACKAGE_VERSION_PATCHLEVEL 1
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.0.0"
+#define VERSION "1.0.1"
