.cvsignore | 19 +++++++++++++++++++
autogen.sh | 12 ++++++++++++
man/.cvsignore | 2 ++
man/Makefile.am | 2 +-
man/vga.man | 8 ++++----
src/.cvsignore | 6 ++++++
6 files changed, 44 insertions(+), 5 deletions(-)
New commits:
commit ab8f09a1fa93300e9634989a153b7d219ba767d6
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Fri Apr 7 21:48:45 2006 +0000
Unlibcwrap. Bump server version requirement. Bump to 4.1.0.
diff --git a/configure.ac b/configure.ac
index ed253c3..39e2a3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-vga],
- 4.0.0.5,
+ 4.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vga)
@@ -53,7 +53,7 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderprot
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto
$REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/generic.c b/src/generic.c
index a294f6c..4be7c39 100644
--- a/src/generic.c
+++ b/src/generic.c
@@ -40,9 +40,10 @@ #ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#include <string.h>
+
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "compiler.h"
#include "vgaHW.h"
#include "xf86PciInfo.h"
@@ -67,9 +68,9 @@ #undef VGA
/* A few things all drivers should have */
#define VGA_NAME "VGA"
#define VGA_DRIVER_NAME "vga"
-#define VGA_VERSION_NAME "4.0"
+#define VGA_VERSION_NAME "4.1"
#define VGA_VERSION_MAJOR 4
-#define VGA_VERSION_MINOR 0
+#define VGA_VERSION_MINOR 1
#define VGA_PATCHLEVEL 0
#define VGA_VERSION_CURRENT ((VGA_VERSION_MAJOR << 24) | \
(VGA_VERSION_MINOR << 16) | VGA_PATCHLEVEL)
commit a44c7ccb8af0d970cdc204393fb4701541375862
Author: Luc Verhaegen <[EMAIL PROTECTED]>
Date: Thu Mar 9 00:08:19 2006 +0000
VGA driver cleanups preparing for the removal of non-programmable dotclock
infrastructure.
- Stop using non-programmable dotclock infrastructure. This is worked
around quite easily here, by limiting the clockRange to the two VGA
standard clocks, with CLOCK_TOLERANCE. This happily removed the
dependence on the nasty xf86GetClocks as well.
- Set the CS bits directly, don't rely on DisplayModePtr->ClockIndex.
- Add DisplayModePtr->Crtc* checking. Functional changes? None. 320x200 is
still the only mode possible; banked memory constraints still aren't
handled properly.
diff --git a/ChangeLog b/ChangeLog
index e6c8681..dd887ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-03-09 Luc Verhaegen <[EMAIL PROTECTED]>
+
+ * src/generic.c: (GenericPreInit), (GenericSetMode),
+ (GenericValidMode):
+
+ - Stop using non-programmable dotclock infrastructure. This is worked
+ around quite easily here, by limiting the clockRange to the two VGA
+ standard clocks, with CLOCK_TOLERANCE. This happily removed
+ the dependence on the nasty xf86GetClocks as well.
+ - Set the CS bits directly, don't rely on DisplayModePtr->ClockIndex.
+ - Add DisplayModePtr->Crtc* checking.
+
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/src/generic.c b/src/generic.c
index ff58e46..a294f6c 100644
--- a/src/generic.c
+++ b/src/generic.c
@@ -74,6 +74,9 @@ #define VGA_PATCHLEVEL 0
#define VGA_VERSION_CURRENT ((VGA_VERSION_MAJOR << 24) | \
(VGA_VERSION_MINOR << 16) | VGA_PATCHLEVEL)
+#ifndef CLOCK_TOLERANCE
+#define CLOCK_TOLERANCE 2000 /* Clock matching tolerance (2MHz) */
+#endif
/* Forward definitions */
static const OptionInfoRec *GenericAvailableOptions(int chipid, int busid);
@@ -108,14 +111,12 @@ _X_EXPORT DriverRec VGA =
typedef enum
{
OPTION_SHADOW_FB,
- OPTION_VGA_CLOCKS,
OPTION_KGA_UNIVERSAL
} GenericOpts;
static const OptionInfoRec GenericOptions[] =
{
{ OPTION_SHADOW_FB, "ShadowFB", OPTV_BOOLEAN, {0}, FALSE },
- { OPTION_VGA_CLOCKS, "VGAClocks", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_KGA_UNIVERSAL, "KGAUniversal", OPTV_BOOLEAN, {0}, FALSE },
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
@@ -389,34 +390,6 @@ #endif
return (int)CHIP_VGA_GENERIC;
}
-static Bool
-GenericClockSelect(ScrnInfoPtr pScreenInfo, int ClockNumber)
-{
-# ifndef PC98_EGC
- vgaHWPtr pvgaHW = VGAHWPTR(pScreenInfo);
- static CARD8 save_misc;
-
- switch (ClockNumber)
- {
- case CLK_REG_SAVE:
- save_misc = inb(pvgaHW->PIOOffset + VGA_MISC_OUT_R);
- break;
-
- case CLK_REG_RESTORE:
- outb(pvgaHW->PIOOffset + VGA_MISC_OUT_W, save_misc);
- break;
-
- default:
- outb(pvgaHW->PIOOffset + VGA_MISC_OUT_W,
- (save_misc & 0xF3) | ((ClockNumber << 2) & 0x0C));
- break;
- }
-# endif
-
- return TRUE;
-}
-
-
/*
* This structure is used to wrap the screen's CloseScreen vector.
*/
@@ -450,27 +423,12 @@ GenericFreeRec(ScrnInfoPtr pScreenInfo)
pScreenInfo->driverPrivate = NULL;
}
-
-static void
-GenericProtect(ScrnInfoPtr pScreenInfo, Bool On)
-{
- vgaHWProtect(pScreenInfo, On);
-}
-
-
static Bool
GenericSaveScreen(ScreenPtr pScreen, int mode)
{
return vgaHWSaveScreen(pScreen, mode);
}
-static void
-GenericBlankScreen(ScrnInfoPtr pScreenInfo, Bool Unblank)
-{
- vgaHWBlankScreen(pScreenInfo, Unblank);
-}
-
-
/* The default mode */
static DisplayModeRec GenericDefaultMode =
{
@@ -502,10 +460,9 @@ static Bool
GenericPreInit(ScrnInfoPtr pScreenInfo, int flags)
{
static rgb defaultWeight = {0, 0, 0};
- static ClockRange GenericClockRange =
- {NULL, 0, 80000, 0, FALSE, TRUE, 1, 1, 0};
+ static ClockRange GenericClockRange;
MessageType From;
- int i, videoRam, Rounding, nModes = 0;
+ int videoRam, Rounding, nModes = 0;
const char *Module = NULL;
const char *Sym = NULL;
vgaHWPtr pvgaHW;
@@ -650,43 +607,18 @@ GenericPreInit(ScrnInfoPtr pScreenInfo,
xf86ProcessOptions(pScreenInfo->scrnIndex, pScreenInfo->options,
pGenericPriv->Options);
-#ifndef __NOT_YET__
- if (pScreenInfo->depth == 8)
- {
- pScreenInfo->numClocks = 1;
- pScreenInfo->clock[0] = 25175;
- goto SetDefaultMode;
- }
-#endif
+ /* Set the clockRange */
+ memset(&GenericClockRange, 0, sizeof(ClockRange));
+ /* We only allow 2 Clocks and some tolerance.
+ * I do assume that CLOCK_TOLERANCE is always higher than 1573. */
+ GenericClockRange.minClock = 25175 - CLOCK_TOLERANCE - 1;
+ GenericClockRange.maxClock = 28322 + CLOCK_TOLERANCE + 1;
+ GenericClockRange.interlaceAllowed = FALSE;
+ GenericClockRange.doubleScanAllowed = TRUE;
+ GenericClockRange.ClockMulFactor = 1;
+ GenericClockRange.ClockDivFactor = 1;
- /*
- * Determine clocks. Limit them to the first four because that's all that
- * can be addressed.
- */
- if ((pScreenInfo->numClocks = pEnt->device->numclocks))
- {
- if (pScreenInfo->numClocks > 4)
- pScreenInfo->numClocks = 4;
- for (i = 0; i < pScreenInfo->numClocks; i++)
- pScreenInfo->clock[i] = pEnt->device->clock[i];
- From = X_CONFIG;
- }
- else
- if (xf86ReturnOptValBool(pGenericPriv->Options, OPTION_VGA_CLOCKS, FALSE))
- {
- pScreenInfo->numClocks = 2;
- pScreenInfo->clock[0] = 25175;
- pScreenInfo->clock[1] = 28322;
- }
- else
- {
- xf86GetClocks(pScreenInfo, 4,
- GenericClockSelect, GenericProtect, GenericBlankScreen,
- pvgaHW->PIOOffset + pvgaHW->IOBase + VGA_IN_STAT_1_OFFSET,
- 0x08, 1, 28322);
- From = X_PROBED;
- }
- xf86ShowClocks(pScreenInfo, From);
+ pScreenInfo->progClock = TRUE; /* lie */
/* Set the virtual X rounding (in bits) */
if (pScreenInfo->depth == 8)
@@ -715,9 +647,6 @@ #endif
if (!nModes || !pScreenInfo->modes)
{
-#ifndef __NOT_YET__
- SetDefaultMode:
-#endif
/* Set a default mode, overridding any virtual settings */
pScreenInfo->virtualX = pScreenInfo->displayWidth = 320;
pScreenInfo->virtualY = 200;
@@ -828,6 +757,22 @@ GenericSetMode(ScrnInfoPtr pScreenInfo,
if (!vgaHWInit(pScreenInfo, pMode))
return FALSE;
+
+ /* Set the clock here ourselves */
+ pvgaHW->ModeReg.MiscOutReg &= ~0x0C;
+ if (pMode->Clock > 26748) /* halfway between 25175kHz and 28322kHz */
+ pvgaHW->ModeReg.MiscOutReg |= 0x04; /* use 28322kHz */
+
+ /* TODO: when blanking helpers (limited blanking -> overscan) are
+ * implemented. Use them here. -- libv */
+
+ /*
+ * KGA is a dream. Yes, the problem does exist, but it doesn't exist only
+ * for blanking, it also exists for sync. And there is no definite solution
+ * for this problem. All there is, is to stop pretending that any device is
+ * VGA compatible. Translation: VGA is not suited as the ultimate fallback.
+ * -- libv.
+ */
if (pGenericPriv->KGAUniversal)
{
#define KGA_FLAGS (KGA_FIX_OVERSCAN | KGA_BE_TOT_DEC)
@@ -1571,13 +1516,58 @@ GenericFreeScreen(int scrnIndex, int fla
GenericFreeRec(xf86Screens[scrnIndex]);
}
-
static ModeStatus
GenericValidMode(int scrnIndex, DisplayModePtr pMode, Bool Verbose, int flags)
{
+ /* Clocks are already limited correctly by clockRange. */
+
if (pMode->Flags & V_INTERLACE)
return MODE_NO_INTERLACE;
+ /* Impose all CRTC restrictions here */
+ /* We could use better ModeStatus naming than BAD_H/VVALUE -- libv */
+
+ if (pMode->CrtcHTotal > 2080)
+ return MODE_BAD_HVALUE;
+
+ if (pMode->CrtcHDisplay > 2048)
+ return MODE_BAD_HVALUE;
+
+ /* TODO: blanking might be worked around in WriteMode, when helpers exist
*/
+ if (pMode->CrtcHBlankStart > 2048)
+ return MODE_BAD_HVALUE;
+
+ if ((pMode->CrtcHBlankEnd - pMode->CrtcHBlankStart) > 512)
+ return MODE_HBLANK_WIDE;
+
+ if (pMode->CrtcHSyncStart > 2040)
+ return MODE_BAD_HVALUE;
+
+ if ((pMode->CrtcHSyncEnd - pMode->CrtcHSyncStart) > 248)
+ return MODE_HSYNC_WIDE;
+
+ if (pMode->CrtcHSkew > 27)
+ return MODE_BAD_HVALUE;
+
+ if (pMode->CrtcVTotal > 1025)
+ return MODE_BAD_VVALUE;
+
+ if (pMode->CrtcVDisplay > 1024)
+ return MODE_BAD_VVALUE;
+
+ /* TODO: blanking might be worked around in WriteMode, when helpers exist
*/
+ if (pMode->CrtcVBlankStart > 1024)
+ return MODE_BAD_VVALUE;
+
+ if ((pMode->CrtcVBlankEnd - pMode->CrtcVBlankStart) > 256)
+ return MODE_VBLANK_WIDE;
+
+ if (pMode->CrtcVSyncStart > 1023)
+ return MODE_BAD_VVALUE;
+
+ if ((pMode->CrtcVSyncEnd - pMode->CrtcVSyncStart) > 15)
+ return MODE_VSYNC_WIDE;
+
return MODE_OK;
}
commit d0e3efd151bdbedf5b6dc1b1d04ac078327361db
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Wed Dec 21 02:30:04 2005 +0000
Update package version for X11R7 release.
diff --git a/ChangeLog b/ChangeLog
index 253fecf..e6c8681 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version for X11R7 release.
+
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index df77a69..ed253c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-vga],
- 4.0.0.4,
+ 4.0.0.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vga)
commit b9cca73e31025f0ffdaf8fa4991065403f95bf01
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Mon Dec 19 16:25:56 2005 +0000
Stub COPYING files
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..7f33cbf
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,12 @@
+This is a stub file. This package has not yet had its complete licensing
+information compiled. Please see the individual source files for details on
+your rights to use and modify this software.
+
+Please submit updated COPYING files to the Xorg bugzilla:
+
+https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All licensing questions regarding this software should be directed at the
+Xorg mailing list:
+
+http://lists.freedesktop.org/mailman/listinfo/xorg
commit 4053cca49cf634bedd085afd1490005acc8628ee
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Thu Dec 15 00:24:21 2005 +0000
Update package version number for final X11R7 release candidate.
diff --git a/ChangeLog b/ChangeLog
index f1bd720..253fecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for final X11R7 release candidate.
+
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
* man/Makefile.am:
diff --git a/configure.ac b/configure.ac
index bc07809..df77a69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-vga],
- 4.0.0.3,
+ 4.0.0.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vga)
commit ebf6cdbabd87e8a9e38dcf01a68dab34f1ddc7e3
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Tue Dec 6 22:48:40 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
diff --git a/ChangeLog b/ChangeLog
index e56beeb..f1bd720 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * man/Makefile.am:
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/man/Makefile.am b/man/Makefile.am
index 27106a2..bf7ec17 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -27,9 +27,9 @@ #
drivermandir = $(DRIVER_MAN_DIR)
-driverman_SOURCES = @[EMAIL PROTECTED]
+driverman_PRE = @[EMAIL PROTECTED]
-driverman_DATA = $(driverman_SOURCES:[EMAIL PROTECTED]@)
+driverman_DATA = $(driverman_PRE:[EMAIL PROTECTED]@)
EXTRA_DIST = @[EMAIL PROTECTED]
commit f175155bc699c49f68cc210cf3aa67b0422232c9
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Sat Dec 3 05:49:37 2005 +0000
Update package version number for X11R7 RC3 release.
diff --git a/ChangeLog b/ChangeLog
index 749c638..e56beeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for X11R7 RC3 release.
+
2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 0113933..bc07809 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-vga],
- 4.0.0.2,
+ 4.0.0.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vga)
commit 2f8ff2c0152d5e70b3ddf76d5dbdda00ab8ba42c
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Fri Dec 2 02:16:11 2005 +0000
Remove extraneous AC_MSG_RESULT.
diff --git a/ChangeLog b/ChangeLog
index 1cc1dfb..749c638 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Remove extraneous AC_MSG_RESULT.
+
2005-11-29 Adam Jackson <[EMAIL PROTECTED]>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 5424d64..0113933 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,6 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xex
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
-AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
commit eff44d08a473505be9cd7b7c476150119fb7fe7c
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Tue Nov 29 23:30:06 2005 +0000
Only build dlloader modules by default.
diff --git a/ChangeLog b/ChangeLog
index be8ef2c..1cc1dfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-29 Adam Jackson <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ Only build dlloader modules by default.
+
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 369c42b..5424d64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
# Checks for programs.
+AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
commit edcc9cfbde82edd7271a30d9f54a4c9afaa3ed31
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date: Mon Nov 28 22:04:15 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
diff --git a/man/Makefile.am b/man/Makefile.am
index a16ec06..27106a2 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -25,7 +25,7 @@ # other dealings in this Software withou
# from the copyright holders.
#
-drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX)
+drivermandir = $(DRIVER_MAN_DIR)
driverman_SOURCES = @[EMAIL PROTECTED]
commit ea43f587c908ef39876df5273806cfb40d76468a
Author: Eric Anholt <[EMAIL PROTECTED]>
Date: Mon Nov 21 10:49:22 2005 +0000
Add .cvsignores for drivers.
diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..fb1befd
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,19 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
diff --git a/man/.cvsignore b/man/.cvsignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/man/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.cvsignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
commit 38d17d63b8bd9e044898b0ead2102e4911084612
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Wed Nov 9 21:15:22 2005 +0000
Update package version number for X11R7 RC2 release.
diff --git a/ChangeLog b/ChangeLog
index e4d905b..be8ef2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for X11R7 RC2 release.
+
2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 5475b71..369c42b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-vga],
- 4.0.0.1,
+ 4.0.0.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vga)
commit e598a23978598c2fbeca053e4d227da45029ae72
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Tue Nov 1 15:08:57 2005 +0000
Update pkgcheck depedencies to work with separate build roots.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..e4d905b
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,4 @@
+2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update pkgcheck dependencies to work with separate build roots.
diff --git a/configure.ac b/configure.ac
index 4b76523..5475b71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,8 +45,15 @@ AC_ARG_WITH(xorg-module-dir,
[Default xorg module directory
[[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
+
+# Checks for extensions
+XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto])
+PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
commit a7a025f98f83891f9c73d0f0bf6f6f14e29bedee
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Wed Oct 19 02:48:06 2005 +0000
Update package version number for RC1 release.
diff --git a/configure.ac b/configure.ac
index 90fd73c..4b76523 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-vga],
- 4.0.0,
+ 4.0.0.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vga)
commit 98508100355875f892e5f75c0ad3b6003763eb2c
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date: Tue Oct 18 00:01:55 2005 +0000
Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
substitutions to work better with BSD make
diff --git a/man/Makefile.am b/man/Makefile.am
index eb3fe06..a16ec06 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -29,7 +29,7 @@ drivermandir = $(mandir)/man$(DRIVER_MAN
driverman_SOURCES = @[EMAIL PROTECTED]
-driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
+driverman_DATA = $(driverman_SOURCES:[EMAIL PROTECTED]@)
EXTRA_DIST = @[EMAIL PROTECTED]
commit 4647a7eba57743a82f69496e7ebe1a5185b1d93d
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Mon Oct 17 22:57:38 2005 +0000
More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
of indirectly
diff --git a/man/Makefile.am b/man/Makefile.am
index 0eabf46..eb3fe06 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,7 +31,7 @@ driverman_SOURCES = @[EMAIL PROTECTED]
driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
-EXTRA_DIST = $(driverman_SOURCES)
+EXTRA_DIST = @[EMAIL PROTECTED]
CLEANFILES = $(driverman_DATA)
commit a7d816d10c5118d88777a0c03af45f397af33bac
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date: Mon Oct 17 00:09:08 2005 +0000
Use sed & cpp to substitute variables in driver man pages
diff --git a/configure.ac b/configure.ac
index 0f97c25..90fd73c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,10 @@ AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
+DRIVER_NAME=vga
+AC_SUBST([DRIVER_NAME])
+
+XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([
diff --git a/man/Makefile.am b/man/Makefile.am
index d293d17..0eabf46 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,22 +1,59 @@
-# Copyright 2005 Adam Jackson.
+# $Id$
#
-# 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
-# on the rights to use, copy, modify, merge, publish, distribute, sub
-# license, 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 (including the next
-# paragraph) 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
-# ADAM JACKSON 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.
-
-dist_man_MANS = \
- vga.4
+# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation.
+#
+# 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 NONINFRINGEMENT.
+# IN NO EVENT SHALL THE OPEN GROUP 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 the copyright holders shall
+# not be used in advertising or otherwise to promote the sale, use or
+# other dealings in this Software without prior written authorization
+# from the copyright holders.
+#
+
+drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX)
+
+driverman_SOURCES = @[EMAIL PROTECTED]
+
+driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
+
+EXTRA_DIST = $(driverman_SOURCES)
+
+CLEANFILES = $(driverman_DATA)
+
+SED = sed
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+ XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xservername__|Xorg|g' \
+ -e 's|__xconfigfile__|xorg.conf|g' \
+ -e 's|__projectroot__|$(prefix)|g' \
+ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+ -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+ -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+
+.man.$(DRIVER_MAN_SUFFIX):
+ sed $(MAN_SUBSTS) < $< > $@
commit cbfc05826bafab21225e87d3742dca11a350b4e2
Author: Daniel Stone <[EMAIL PROTECTED]>
Date: Thu Aug 18 09:03:55 2005 +0000
Update autogen.sh to one that does objdir != srcdir.
diff --git a/autogen.sh b/autogen.sh
index e81f989..904cd67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,4 +10,3 @@ autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
$srcdir/configure --enable-maintainer-mode "$@"
-
commit 086e2b6b1c3000aba13a07cb7ebfe71ebf4d7943
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Fri Jul 29 21:22:46 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
diff --git a/configure.ac b/configure.ac
index ba63eaa..0f97c25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,8 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-vga],
- 0.1.0,
- [EMAIL PROTECTED],
+ 4.0.0,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vga)
AC_CONFIG_SRCDIR([Makefile.am])
@@ -57,6 +57,8 @@ AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
+XORG_RELEASE_VERSION
+
AC_OUTPUT([
Makefile
src/Makefile
commit f12e5d9884e155fb85ddcb3743db5862351492d4
Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]>
Date: Tue Jul 26 23:52:21 2005 +0000
Build system for vga
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..7052905
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,22 @@
+# Copyright 2005 Adam Jackson.
+#
+# 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
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, 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 (including the next
+# paragraph) 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
+# ADAM JACKSON 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.
+
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = src man
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..e81f989
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
+
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..ba63eaa
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,64 @@
+# Copyright 2005 Adam Jackson.
+#
+# 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
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, 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 (including the next
+# paragraph) 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
+# ADAM JACKSON 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.
+#
+# Process this file with autoconf to produce a configure script
+
+AC_PREREQ(2.57)
+AC_INIT([xf86-video-vga],
+ 0.1.0,
+ [EMAIL PROTECTED],
+ xf86-video-vga)
+
+AC_CONFIG_SRCDIR([Makefile.am])
+AM_CONFIG_HEADER([config.h])
+AC_CONFIG_AUX_DIR(.)
+
+AM_INIT_AUTOMAKE([dist-bzip2])
+
+AM_MAINTAINER_MODE
+
+# Checks for programs.
+AC_PROG_LIBTOOL
+AC_PROG_CC
+
+AH_TOP([#include "xorg-server.h"])
+
+AC_ARG_WITH(xorg-module-dir,
+ AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ [Default xorg module directory
[[default=$libdir/xorg/modules]]]),
+ [moduledir="$withval"],
+ [moduledir="$libdir/xorg/modules"])
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(XORG, [xorg-server xproto])
+sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_HEADER_STDC
+
+AC_SUBST([XORG_CFLAGS])
+AC_SUBST([moduledir])
+
+AC_OUTPUT([
+ Makefile
+ src/Makefile
+ man/Makefile
+])
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..d293d17
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,22 @@
+# Copyright 2005 Adam Jackson.
+#
+# 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
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, 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 (including the next
+# paragraph) 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
+# ADAM JACKSON 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.
+
+dist_man_MANS = \
+ vga.4
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..d3d0ce1
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,32 @@
+# Copyright 2005 Adam Jackson.
+#
+# 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
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, 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 (including the next
+# paragraph) 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
+# ADAM JACKSON 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.
+
+# this is obnoxious:
+# -module lets us name the module exactly how we want
+# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
+# _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@
+vga_drv_la_LTLIBRARIES = vga_drv.la
+vga_drv_la_LDFLAGS = -module -avoid-version
+vga_drv_ladir = @moduledir@/drivers
+
+vga_drv_la_SOURCES = \
+ generic.c
commit 20687f8b578e989f5a62373fc7e4d2545436df32
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Mon Jul 11 02:30:07 2005 +0000
Prep for modular builds by adding guarded #include "config.h" everywhere.
diff --git a/src/generic.c b/src/generic.c
index 628e718..ff58e46 100644
--- a/src/generic.c
+++ b/src/generic.c
@@ -36,6 +36,10 @@
* Marc Aurele La France <[EMAIL PROTECTED]>
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86_ansic.h"
commit 38dac1c4fcacf74b20eccb84b932f229fdd8e915
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Sat Jun 25 21:17:00 2005 +0000
Bug #3626: _X_EXPORT tags for video and input drivers.
diff --git a/src/generic.c b/src/generic.c
index ae7920f..628e718 100644
--- a/src/generic.c
+++ b/src/generic.c
@@ -87,10 +87,10 @@ #ifdef SPECIAL_FB_BYTE_ACCESS
static Bool GenericMapMem(ScrnInfoPtr scrp);
#endif
-static int GenericValidMode(int, DisplayModePtr, Bool, int);
+static ModeStatus GenericValidMode(int, DisplayModePtr, Bool, int);
/* The root of all evil... */
-DriverRec VGA =
+_X_EXPORT DriverRec VGA =
{
VGA_VERSION_CURRENT,
VGA_DRIVER_NAME,
@@ -178,7 +178,7 @@ static XF86ModuleVersionInfo GenericVers
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
VGA_VERSION_MAJOR, VGA_VERSION_MINOR, VGA_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -190,7 +190,11 @@ static XF86ModuleVersionInfo GenericVers
* This data is accessed by the loader. The name must be the module name
* followed by "ModuleData".
*/
-XF86ModuleData vgaModuleData = { &GenericVersionRec, GenericSetup, NULL };
+_X_EXPORT XF86ModuleData vgaModuleData = {
+ &GenericVersionRec,
+ GenericSetup,
+ NULL
+};
static pointer
GenericSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
@@ -1564,7 +1568,7 @@ GenericFreeScreen(int scrnIndex, int fla
}
-static int
+static ModeStatus
GenericValidMode(int scrnIndex, DisplayModePtr pMode, Bool Verbose, int flags)
{
if (pMode->Flags & V_INTERLACE)
commit 358885f2fec6365f8e061fd5b547e95229bc45f5
Author: Eric Anholt <[EMAIL PROTECTED]>
Date: Wed Jun 16 09:23:27 2004 +0000
DRI XFree86-4_3_99_12-merge import
diff --git a/man/vga.man b/man/vga.man
index 9eccf9e..5781c1b 100644
--- a/man/vga.man
+++ b/man/vga.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man,v 1.2
2001/01/27 18:20:56 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man,v 1.3
2001/12/17 20:52:34 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH VGA __drivermansuffix__ __vendorversion__
@@ -14,7 +14,7 @@ vga \- Generic VGA video driver
.fi
.SH DESCRIPTION
.B vga
-is an __xservername__ driver for generic VGA video cards. It can drive most
+is an XFree86 driver for generic VGA video cards. It can drive most
VGA-compatible video cards, but only makes use of the basic standard
VGA core that is common to these cards. The driver supports depths 1, 4
and 8. All relevant visual types are supported at each depth.
@@ -28,7 +28,7 @@ The
driver supports most VGA-compatible video cards. There are some known
exceptions, and those should be listed here.
.SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
+Please refer to XF86Config(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.PP
@@ -60,6 +60,6 @@ This option is recommended for performan
when using those depths in a multi-head configuration where one or more
of the other screens is operating at a different depth.
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1),
X(__miscmansuffix__)
.SH AUTHORS
Authors include: Marc La France, David Dawes, and Dirk Hohndel.
diff --git a/src/generic.c b/src/generic.c
index 7ae477e..ae7920f 100644
--- a/src/generic.c
+++ b/src/generic.c
@@ -87,7 +87,7 @@ #ifdef SPECIAL_FB_BYTE_ACCESS
static Bool GenericMapMem(ScrnInfoPtr scrp);
#endif
-static ModeStatus GenericValidMode(int, DisplayModePtr, Bool, int);
+static int GenericValidMode(int, DisplayModePtr, Bool, int);
/* The root of all evil... */
DriverRec VGA =
@@ -178,7 +178,7 @@ static XF86ModuleVersionInfo GenericVers
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XORG_VERSION_CURRENT,
+ XF86_VERSION_CURRENT,
VGA_VERSION_MAJOR, VGA_VERSION_MINOR, VGA_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -1564,7 +1564,7 @@ GenericFreeScreen(int scrnIndex, int fla
}
-static ModeStatus
+static int
GenericValidMode(int scrnIndex, DisplayModePtr pMode, Bool Verbose, int flags)
{
if (pMode->Flags & V_INTERLACE)
commit 23a8e1b91ca8b618f4a55d028499c7bd88c81424
Author: Egbert Eich <[EMAIL PROTECTED]>
Date: Fri Apr 23 19:53:24 2004 +0000
Merging XORG-CURRENT into trunk
diff --git a/man/vga.man b/man/vga.man
index 5781c1b..9eccf9e 100644
--- a/man/vga.man
+++ b/man/vga.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man,v 1.3
2001/12/17 20:52:34 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man,v 1.2
2001/01/27 18:20:56 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH VGA __drivermansuffix__ __vendorversion__
@@ -14,7 +14,7 @@ vga \- Generic VGA video driver
.fi
.SH DESCRIPTION
.B vga
-is an XFree86 driver for generic VGA video cards. It can drive most
+is an __xservername__ driver for generic VGA video cards. It can drive most
VGA-compatible video cards, but only makes use of the basic standard
VGA core that is common to these cards. The driver supports depths 1, 4
and 8. All relevant visual types are supported at each depth.
@@ -28,7 +28,7 @@ The
driver supports most VGA-compatible video cards. There are some known
exceptions, and those should be listed here.
.SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.PP
@@ -60,6 +60,6 @@ This option is recommended for performan
when using those depths in a multi-head configuration where one or more
of the other screens is operating at a different depth.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1),
X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Marc La France, David Dawes, and Dirk Hohndel.
diff --git a/src/generic.c b/src/generic.c
index 2829049..7ae477e 100644
--- a/src/generic.c
+++ b/src/generic.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.65
2003/10/30 17:37:15 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.64
2003/08/23 16:09:23 dawes Exp $ */
/*
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
*
@@ -178,7 +178,7 @@ static XF86ModuleVersionInfo GenericVers
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
VGA_VERSION_MAJOR, VGA_VERSION_MINOR, VGA_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
commit 3322eede2037b9684e5db0be1ebc11d6a1cca3f8
Author: Egbert Eich <[EMAIL PROTECTED]>
Date: Sun Mar 14 08:33:41 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
diff --git a/man/vga.man b/man/vga.man
index 1d4e87f..5781c1b 100644
--- a/man/vga.man
+++ b/man/vga.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man,v 1.2
2001/01/27 18:20:56 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man,v 1.3
2001/12/17 20:52:34 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH VGA __drivermansuffix__ __vendorversion__
diff --git a/src/generic.c b/src/generic.c
index ac20129..2829049 100644
--- a/src/generic.c
+++ b/src/generic.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.64
2003/08/23 16:09:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.65
2003/10/30 17:37:15 tsi Exp $ */
/*
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
*
commit fc95f2e8064be20ff2a65cb1fa88dfead08a616d
Author: Egbert Eich <[EMAIL PROTECTED]>
Date: Wed Mar 3 12:12:28 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
diff --git a/man/vga.man b/man/vga.man
index 5781c1b..1d4e87f 100644
--- a/man/vga.man
+++ b/man/vga.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man,v 1.3
2001/12/17 20:52:34 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man,v 1.2
2001/01/27 18:20:56 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH VGA __drivermansuffix__ __vendorversion__
diff --git a/src/generic.c b/src/generic.c
index 2829049..ac20129 100644
--- a/src/generic.c
+++ b/src/generic.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.65
2003/10/30 17:37:15 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.64
2003/08/23 16:09:23 dawes Exp $ */
/*
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
*
commit 88f1f75e595d8d9567cb7cea037449d35db900c4
Author: Egbert Eich <[EMAIL PROTECTED]>
Date: Thu Feb 26 13:35:56 2004 +0000
readding XFree86's cvs IDs
diff --git a/man/vga.man b/man/vga.man
index fe0c5cf..5781c1b 100644
--- a/man/vga.man
+++ b/man/vga.man
@@ -1,4 +1,4 @@
-.\" $XFree86$
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man,v 1.3
2001/12/17 20:52:34 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH VGA __drivermansuffix__ __vendorversion__
diff --git a/src/generic.c b/src/generic.c
index 7a4e89f..2829049 100644
--- a/src/generic.c
+++ b/src/generic.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.65
2003/10/30 17:37:15 tsi Exp $ */
/*
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
*
commit b21ec4f9640e1dd4a43449d4db41bf2ea56a7aee
Author: Egbert Eich <[EMAIL PROTECTED]>
Date: Thu Feb 26 09:23:28 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
diff --git a/man/vga.man b/man/vga.man
index 5781c1b..fe0c5cf 100644
--- a/man/vga.man
+++ b/man/vga.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man,v 1.3
2001/12/17 20:52:34 dawes Exp $
+.\" $XFree86$
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH VGA __drivermansuffix__ __vendorversion__
diff --git a/src/generic.c b/src/generic.c
index 2829049..7a4e89f 100644
--- a/src/generic.c
+++ b/src/generic.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.65
2003/10/30 17:37:15 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
*
commit 5d1956bde7ae8ae0d54a4ff649465fbd3f1bc01d
Author: Kaleb Keithley <[EMAIL PROTECTED]>
Date: Tue Nov 25 19:28:43 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
diff --git a/src/generic.c b/src/generic.c
index fa9acd0..2829049 100644
--- a/src/generic.c
+++ b/src/generic.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.62
2002/12/03 01:58:58 dickey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.65
2003/10/30 17:37:15 tsi Exp $ */
/*
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
*
@@ -72,22 +72,22 @@ #define VGA_VERSION_CURRENT ((VGA_VERSIO
/* Forward definitions */
-static const OptionInfoRec * GenericAvailableOptions(int chipid, int
busid);
-static void GenericIdentify(int);
-static Bool GenericProbe(DriverPtr, int);
-static Bool GenericPreInit(ScrnInfoPtr, int);
-static Bool GenericScreenInit(int, ScreenPtr, int, char **);
-static Bool GenericSwitchMode(int, DisplayModePtr, int);
-static void GenericAdjustFrame(int, int, int, int);
-static Bool GenericEnterVT(int, int);
-static void GenericLeaveVT(int, int);
-static void GenericFreeScreen(int, int);
-static int VGAFindIsaDevice(GDevPtr dev);
+static const OptionInfoRec *GenericAvailableOptions(int chipid, int busid);
+static void GenericIdentify(int);
+static Bool GenericProbe(DriverPtr, int);
+static Bool GenericPreInit(ScrnInfoPtr, int);
+static Bool GenericScreenInit(int, ScreenPtr, int, char **);
+static Bool GenericSwitchMode(int, DisplayModePtr, int);
+static void GenericAdjustFrame(int, int, int, int);
+static Bool GenericEnterVT(int, int);
+static void GenericLeaveVT(int, int);
+static void GenericFreeScreen(int, int);
+static int VGAFindIsaDevice(GDevPtr dev);
#ifdef SPECIAL_FB_BYTE_ACCESS
-static Bool GenericMapMem(ScrnInfoPtr scrp);
+static Bool GenericMapMem(ScrnInfoPtr scrp);
#endif
-static int GenericValidMode(int, DisplayModePtr, Bool, int);
+static ModeStatus GenericValidMode(int, DisplayModePtr, Bool, int);
/* The root of all evil... */
DriverRec VGA =
@@ -110,10 +110,10 @@ typedef enum
static const OptionInfoRec GenericOptions[] =
{
- { OPTION_SHADOW_FB, "ShadowFB", OPTV_BOOLEAN, {0}, FALSE },
- { OPTION_VGA_CLOCKS, "VGAClocks", OPTV_BOOLEAN, {0}, FALSE },
- { OPTION_KGA_UNIVERSAL, "KGAUniversal", OPTV_BOOLEAN, {0}, FALSE },
- { -1, NULL, OPTV_NONE, {0}, FALSE }
+ { OPTION_SHADOW_FB, "ShadowFB", OPTV_BOOLEAN, {0}, FALSE },
+ { OPTION_VGA_CLOCKS, "VGAClocks", OPTV_BOOLEAN, {0}, FALSE },
+ { OPTION_KGA_UNIVERSAL, "KGAUniversal", OPTV_BOOLEAN, {0}, FALSE },
+ { -1, NULL, OPTV_NONE, {0}, FALSE }
};
static const char *vgahwSymbols[] =
@@ -137,12 +137,14 @@ static const char *vgahwSymbols[] =
NULL
};
+#ifdef XFree86LOADER
static const char *miscfbSymbols[] =
{
"xf1bppScreenInit",
"xf4bppScreenInit",
NULL
};
+#endif
static const char *fbSymbols[] =
{
@@ -524,7 +526,6 @@ GenericPreInit(ScrnInfoPtr pScreenInfo,
xf86FreeInt10(pInt);
}
-
{
static resRange unusedmem[] = { {ResShrMemBlock, 0xB0000, 0xB7FFF},
{ResShrMemBlock, 0xB8000, 0xBFFFF},
@@ -544,7 +545,13 @@ GenericPreInit(ScrnInfoPtr pScreenInfo,
{
case 1: Module = "xf1bpp"; Sym = "xf1bppScreenInit"; break;
case 4: Module = "xf4bpp"; Sym = "xf4bppScreenInit"; break;
- default: Module = "fb"; break;
+ case 8: Module = "fb"; break;
+
+ default:
+ xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
+ "Given depth (%d) is not supported by this driver.\n",
+ pScreenInfo->depth);
+ return FALSE;
}
xf86PrintDepthBpp(pScreenInfo);
@@ -1557,7 +1564,7 @@ GenericFreeScreen(int scrnIndex, int fla
}
-static int
+static ModeStatus
GenericValidMode(int scrnIndex, DisplayModePtr pMode, Bool Verbose, int flags)
{
if (pMode->Flags & V_INTERLACE)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
